X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vim%2Fvimrc;h=86c1e706e8263965107374ae908d8795fbd682eb;hb=refs%2Fheads%2Fmaster;hp=8646ceee4775c3b55f1a4bc5659828a15cd9dc38;hpb=1687cff3df6efb37392dd87445f31784ffd6a92a;p=config%2Fdotfiles.git

diff --git a/vim/vimrc b/vim/vimrc
index 8646cee..84813d9 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -920,11 +920,10 @@ if has('eval')
     endif
 
 " Settings for securemodelines.
-    " Only allow items I need (also includes spl which is not enabled by
-    " default).
+    " Only allow items I need
     if v:version >= 700 " need lists
         let g:secure_modelines_allowed_items = ['ft', 'spl', 'fdm',
-                                              \ 'sw', 'sts', 'noet']
+                                              \ 'ts', 'sw', 'sts', 'noet']
     endif
 
 " Settings for gnupg.
@@ -946,6 +945,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).
@@ -1072,8 +1081,9 @@ 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()
+" Go always uses tabs for indentation; use BufRead so modelines can overwrite
+" settings like 'tabstop'
+        autocmd BufRead,StdinReadPost *.go call <SID>UseTabs()
 
 " FTDETECT AUTO COMMANDS