lib/config/gpg-agent-update-tty: Change gpg-connect-agent command line

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 470a8007fe54115fb94e4006a4d2e7b2a59abc32..f59293420e8c60039afd64bc21176a647a3920aa 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -343,7 +343,9 @@ function! SetupEncoding(encoding)
 
    call RestorePosition()
    let b:encoding_set = 1
-   execute "edit ++enc=" . a:encoding
+   if len(expand('%'))
+      execute "edit ++enc=" . a:encoding
+   endif
 endfunction
 
 
@@ -590,11 +592,12 @@ function! SetExecutableBit(x)
    endif
    checktime
    let fname = expand("%:p")
+   let fx = executable(fname)
    execute "au FileChangedShell " . fname . " :echo"
-   if a:x
-      silent !chmod a+x %
-   else
-      silent !chmod a-x %
+   if a:x && !fx
+      !chmod a+x %
+   elseif !a:x && fx
+      !chmod a-x %
    endif
    if v:shell_error
       echoerr 'Error running chmod: ' . v:shell_error
@@ -604,6 +607,7 @@ function! SetExecutableBit(x)
 endfunction
 command! Xbit if executable(expand("%:p")) | call SetExecutableBit(0) | else | call SetExecutableBit(1) | endif
 
+
 " ----------
 " From http://slobin.pp.ru/vim/_vimrc.html