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

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index ea2fa7960123b855f27c048fcbc08b7bfcbfc522..f59293420e8c60039afd64bc21176a647a3920aa 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -343,11 +343,13 @@ 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
 
 
-" http://lwn.net/Articles/226514/
+" From http://lwn.net/Articles/226514/
 
 augroup gpg
 " Remove ALL autocommands for the current group.
@@ -581,6 +583,31 @@ END_OF_PYTHON
 endif
 
 
+" From Tip 212:
+" http://vim.wikia.com/wiki/Setting_file_attributes_without_reloading_a_buffer
+
+function! SetExecutableBit(x)
+   if !executable('chmod')
+      return
+   endif
+   checktime
+   let fname = expand("%:p")
+   let fx = executable(fname)
+   execute "au FileChangedShell " . fname . " :echo"
+   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
+   endif
+   checktime
+   execute "au! FileChangedShell " . fname
+endfunction
+command! Xbit if executable(expand("%:p")) | call SetExecutableBit(0) | else | call SetExecutableBit(1) | endif
+
+
 " ----------
 " From http://slobin.pp.ru/vim/_vimrc.html
 
@@ -622,7 +649,8 @@ endif
 
 
 " Called automagically after every buffer read, enables fileencoding
-" setting from modeline (see Tip #911: http://vim.wikia.com/wiki/VimTip911)
+" setting from modeline (see Tip #911:
+" http://vim.wikia.com/wiki/How_to_make_fileencoding_work_in_the_modeline)
 function! AutoEncoding()
   if &modified && &fileencoding != ""
     call SetupEncoding(&fileencoding)