X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=49ccdfe41a784401b41b709f8a116455cecf710e;hb=58369e3fc1dcd091fbf35408951c8e40008f39c4;hp=8b394d0689aed7e53c3b49680a03683eaf551858;hpb=cb310f8c9c3ace582f4ed56128e733fc6b1d0998;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 8b394d0..49ccdfe 100644
--- a/vimrc
+++ b/vimrc
@@ -62,6 +62,8 @@ if filewritable('~/.tmp') == 2 || filewritable('~/tmp') == 2
 endif
 " But store them in ~/.tmp or ~/tmp (already set by default) if available.
 set directory^=~/.tmp
+" Never use /tmp which gets cleaned on reboot.
+set directory-=/tmp
 
 " Disable modelines as they may cause security problems. Instead use
 " securemodelines (Vim script #1876).
@@ -164,7 +166,8 @@ endif
 " existing files.
 set fileencodings=utf-8,latin1
 
-" Always use unix line-endings for new files.
+" Always use unix line-endings for new files. DOS line endings in existing
+" files are recognized.
 set fileformats=unix,dos
 
 " Wrap text after 78 characters.
@@ -263,7 +266,7 @@ set number
 if exists('+numberwidth')
     set numberwidth=1
 endif
-" Display the ruler with current line/file position. If 'statusline' is used
+" Display the ruler with current line/file position. If 'statusline' is used,
 " then this only affects <C-G>.
 set ruler
 " Display partial commands in the status line.
@@ -622,9 +625,11 @@ if has('eval')
     nnoremap <silent> <Leader>t :call <SID>UseTabs()<CR>
 endif
 " Enable "verbatim" mode. Used to view files with long lines or without syntax
-" coloring.
-nnoremap <silent> <Leader>v :set nolist nowrap nospell synmaxcol=0<CR>
+" coloring. 'list' is not changed, see next mapping.
+nnoremap <silent> <Leader>v :setlocal nowrap nospell synmaxcol=0<CR>
                           \ :2match<CR>
+" Toggle 'list'.
+nnoremap <silent> <Leader>l :set invlist<CR>
 
 " Make last active window the only window. Similar to <C-W> o.
 nnoremap <C-W>O <C-W>p<C-W>o
@@ -822,7 +827,7 @@ if has('syntax')
 " Highlight some important keywords in all documents.
             let l:todos = ['TODO', 'XXX', 'FIXME', 'NOTE',
                          \ 'CHANGED', 'REMOVED', 'DELETED']
-            " Compatibility fix for Vim 6.4 which can't handle for in function
+            " Compatibility fix for Vim 6.4 which can't parse for in functions
             " (without function it's ignored).
             execute '  for l:x in l:todos'
                   \ '|     call matchadd("Todo", l:x)'
@@ -859,32 +864,32 @@ if has('syntax')
 
     " C
     let g:c_no_if0_fold = 1 " fix weird double fold in #if0 in recent versions
-    " Haskell.
+    " Haskell
     let g:hs_highlight_delimiters = 1
     let g:hs_highlight_boolean = 1
     let g:hs_highlight_types = 1
     let g:hs_highlight_more_types = 1
-    " Java.
+    " Java
     let g:java_highlight_java_lang_ids = 1 " color java.lang.* identifiers
-    " Perl.
+    " Perl
     let g:perl_fold = 1
     let g:perl_fold_blocks = 1
     let g:perl_nofold_packages = 1
     let g:perl_include_pod = 1 " syntax coloring for PODs
-    " PHP.
+    " PHP
     let g:php_folding = 3    " fold functions
     let g:php_short_tags = 0 " no short tags (<? .. ?>), not always usable
     let g:php_sql_query = 1  " highlight SQL queries in strings
-    " Python.
+    " Python
     let g:python_highlight_all = 1
-    " Shell.
+    " Shell
     let g:sh_noisk = 1        " don't add . to 'iskeyword'
     let g:sh_is_posix = 1     " POSIX shell (e.g. dash) is compatible enough
     let g:sh_fold_enabled = 7 " functions (1), heredoc (2) and if/do/for (4)
-    " Vim.
+    " Vim
     let g:vimsyn_embed = 0      " don't highlight embedded languages
     let g:vimsyn_folding = 'af' " folding for autogroups (a) and functions (f)
-    " XML.
+    " XML
     let g:xml_syntax_folding = 1
 endif
 
@@ -959,7 +964,7 @@ endif
 " AUTO COMMANDS
 
 " Use a custom auto group to prevent problems when the vimrc files is sourced
-" twice.
+" multiple times.
 if has('autocmd')
     augroup vimrc
 
@@ -1042,8 +1047,7 @@ if has('autocmd')
         autocmd FileType gitcommit let g:secure_modelines_allowed_items = [] |
                                  \ setlocal textwidth=72
 " Fix 'include' setting for shell files to recognize '.' and 'source'
-" commands. Use &l:include instead of setlocal which requires excessive
-" escaping of \.
+" commands.
         autocmd FileType sh let &l:include = '^\s*\(\.\|source\)\s\+'
 " Use the same comment string as for Vim files in Vimperator files.
         autocmd FileType vimperator setlocal commentstring=\"%s