diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-05-20 11:56:37 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-05-20 11:56:37 -0300 |
| commit | c2258daf2beb025e599ffaa1cbaf122506953abc (patch) | |
| tree | 6e0add2b19a5f4e5802dc6437f4528cd66c7b9f0 | |
| parent | c52749a15486d05f477fcbf5ef27528be15869cb (diff) | |
| download | keyringer-c2258daf2beb025e599ffaa1cbaf122506953abc.tar.gz keyringer-c2258daf2beb025e599ffaa1cbaf122506953abc.tar.bz2 | |
Use a custom .vimrc so VIM command line is not messed with quotes (#50)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | lib/keyringer/editors/vim | 5 | ||||
| -rwxr-xr-x | lib/keyringer/functions | 2 |
4 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2014-05-20 - Silvio Rhatto <rhatto@riseup.net> + + Use a custom .vimrc so VIM command line is not messed with quotes (#50) + 2014-05-16 - 0.3.4 - Silvio Rhatto <rhatto@riseup.net> Workaround for open/edit action returning instantaneously (#49) @@ -26,6 +26,8 @@ install_lib: $(INSTALL) -D --mode=0755 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions $(INSTALL) -D --mode=0755 -d lib/keyringer/actions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions $(INSTALL) -D --mode=0755 lib/keyringer/actions/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions + $(INSTALL) -D --mode=0755 -d lib/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions + $(INSTALL) -D --mode=0755 lib/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions install_bin: $(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer diff --git a/lib/keyringer/editors/vim b/lib/keyringer/editors/vim new file mode 100644 index 0000000..0f877df --- /dev/null +++ b/lib/keyringer/editors/vim @@ -0,0 +1,5 @@ +" Use sane defaults for VIM to avoid data leakage +" See https://keyringer.pw/trac/ticket/50 +set nowritebackup +set nobackup +set viminfo="NONE" diff --git a/lib/keyringer/functions b/lib/keyringer/functions index 50d01db..fdd8439 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -287,7 +287,7 @@ function keyringer_set_env { # Avoid viminfo, see https://keyringer.pw/trac/ticket/50 if $EDITOR --help | grep -q -e "^VIM"; then if ! echo $EDITOR | grep -q -- "-i NONE"; then - EDITOR="$EDITOR -i NONE '+set nowritebackup' '+set nobackup'" + EDITOR="$EDITOR -S `dirname $LIB`/editors/vim" fi fi |