X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=vim%2Fvimrc;h=86c1e706e8263965107374ae908d8795fbd682eb;hp=84768422aa07d5ad0f2492b782d26e5ae8c6d5f9;hb=0dd903507ae3f0fea3d284418ddad55132070ffb;hpb=ff40bda110142568d1ad67928882a23bf1ce0a80

diff --git a/vim/vimrc b/vim/vimrc
index 8476842..86c1e70 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -136,9 +136,13 @@ if has('viminfo')
     set viminfo^='1000
 endif
 
-" Use strong encryption if possible, also used for swap/undo files.
+" Use strong(er) encryption if possible, also used for swap/undo files.
 if exists('+cryptmethod')
-    set cryptmethod=blowfish
+    if s:HasVersionAndPatch(704, 399)
+        set cryptmethod=blowfish2
+    else
+        set cryptmethod=blowfish
+    endif
 endif
 
 " Clear all vimrc-related autocmds. Has to be done here as the vimrc augroup
@@ -942,6 +946,16 @@ if has('eval')
     " Only highlight the current placeholder.
     let g:xptemplate_highlight = 'current'
 
+" Fzf settings
+
+    " Use FZF if available
+    if executable('fzf')
+        nmap <C-P> :FZF<CR>
+
+        " Disable CtrlP
+        let g:ctrlp_map = ''
+    endif
+
 " CtrlP settings.
     " Don't manage the working directory (the default setting is too slow for
     " me).
@@ -1068,21 +1082,21 @@ if has('autocmd')
         autocmd FileType vimperator setlocal commentstring=\"%s
 " Use TeX compiler for (La)TeX files.
         autocmd FileType tex compiler tex
+" Go always uses tabs for indentation.
+        autocmd FileType go call <SID>UseTabs()
 
 " FTDETECT AUTO COMMANDS
 
 " Recognize .test as Tcl files.
         autocmd BufRead,BufNewFile *.test set filetype=tcl
+" /etc/network/interfaces
+        autocmd BufRead,BufNewFile /etc/network/interfaces set filetype=interfaces
 
 " OTHER AUTO COMMANDS
 
 " Disable spell checking, displaying of list characters and long lines when
 " viewing documentation.
         autocmd BufReadPost /usr/share/doc/* setlocal nospell nolist | 2match
-
-" Use diff filetype for mercurial patches in patch queue.
-        autocmd BufReadPost */.hg/patches/* set filetype=diff
-
     augroup END
 endif