vimrc: Move some settings from ftdetect to vimrc.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 8b44898443ff757d432f04f9ae57400d4dc23023..8486d56cc565314edefecdb4b382dd7d7f69075c 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -3,13 +3,13 @@
 
 " EDITOR SETTINGS
 
-" Make sure Vim (and not Vi) settings are enabled.
+" Make sure Vim (and not Vi) settings are used.
 set nocompatible
 
-" Load my scripts from ~/.vim (my scripts), ~/.vim/plugins (plugins) and
-" ~/.vim/runtime (checkout of Vim runtime files).
+" Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim
+" runtime files).
 set runtimepath-=~/.vim
-set runtimepath^=~/.vim,~/.vim/plugins,~/.vim/runtime
+set runtimepath^=~/.vim,~/.vim/runtime
 
 " Disable modelines as they may cause security problems. Instead use
 " securemodelines (Vim script #1876).
@@ -32,8 +32,9 @@ if has('autocmd')
     filetype plugin indent on
 endif
 
-" Use UTF-8 file encoding for all files.
-set fileencodings=utf-8
+" Use UTF-8 file encoding for all files. Automatically recognize latin1 in
+" existing files.
+set fileencodings=utf-8,latin1
 
 " Wrap text after 78 characters.
 set textwidth=78
@@ -83,8 +84,9 @@ endif
 set ignorecase
 set smartcase
 
-" Activate spell checking, use English as default.
-if v:version >= 700
+" Activate spell checking, use English as default. Don't use spell checking
+" when diffing.
+if v:version >= 700 && !&diff
     set spell
     set spelllang=en_us
 endif
@@ -173,9 +175,11 @@ else
 endif
 
 " Make sure xa0 (alt + space) is automatically changed to a normal whitespace
-" if pressed accidentally while in insert mode (happens on Mac sometimes).
-if has('mac')
-    imap <Char-0xa0> <Space>
+" if pressed accidentally while in insert mode (happens on Mac when alt
+" doesn't send escape). filereadable() is necessary for Leopard were 'mac' is
+" no longer set on the console.
+if has('mac') || filereadable('/Users/.localized')
+    inoremap <Char-0xa0> <Space>
 endif
 
 " Disable Apple style movements in MacVim.
@@ -197,6 +201,11 @@ if has('syntax')
     else
         match Todo /\%>78v./
     endif
+
+" Highlight TODO, FIXME, CHANGED and XXX in all documents.
+    if v:version >= 701 && has('patch40')
+        call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)')
+    endif
 endif
 
 
@@ -219,6 +228,39 @@ if has('autocmd')
     augroup vimrc
         autocmd!
 
+" Go to last position of opened files. Taken from :help last-position-jump.
+        autocmd BufReadPost *
+            \ if line("'\"") > 1 && line("'\"") <= line("$") |
+            \     execute "normal! g'\"" |
+            \ endif
+
+" Disable spell checking for files which don't need it.
+        autocmd FileType deb setlocal nospell
+        autocmd FileType diff setlocal nospell
+        autocmd FileType tar setlocal nospell
+
+" Fix to allow Vim edit crontab files as crontab doesn't work with
+" backupcopy=auto.
+        autocmd FileType crontab setlocal backupcopy=yes
+
+" Don't use the modeline as the diff created by `git commit -v` may contain
+" one which could change the filetype or other settings of the commit window.
+        autocmd FileType gitcommit setlocal nomodeline |
+                                 \ let g:secure_modelines_allowed_items = []
+
+" Allow folding.
+        autocmd FileType perl let perl_fold = 1 |
+                            \ let perl_fold_blocks = 1
+
+" Use the same comment string as for Vim files.
+        autocmd FileType vimperator setlocal commentstring=\"%s
+
+" Recognize .md as markdown files.
+        autocmd BufRead,BufNewFile *.md set filetype=mkd
+
+" Recognize .test as Tcl files.
+        autocmd BufRead,BufNewFile *.test set filetype=tcl
+
 " Use diff filetype for mercurial patches in patch queue.
         autocmd BufReadPost */.hg/patches/* set filetype=diff