X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=75283da711ca796f02b4ee243951c7b70afb1dee;hb=892d099baa74f7399d60c78378f2e401dd14e05e;hp=4699746ad9a4414a58c5abbabe5fae326d1f28f9;hpb=71c29cbaee974b6ab7c9a89b4771043f19fb957f;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 4699746..75283da 100644
--- a/vimrc
+++ b/vimrc
@@ -25,6 +25,10 @@ endif
 " Make sure Vim (and not Vi) settings are used.
 set nocompatible
 
+" Use UTF-8 for all internal data (buffers, registers, etc.). This doesn't
+" affect reading files in different encodings, see 'fileencodings' for that.
+set encoding=utf-8
+
 " Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim
 " runtime files) if available.
 set runtimepath-=~/.vim
@@ -50,6 +54,11 @@ set history=1000
 " Increase number of possible undos.
 set undolevels=1000
 
+if has('viminfo')
+    " Remember marks (including the last cursor position) for more files.
+    set viminfo^='1000
+endif
+
 " Use strong encryption if possible, also used for swap/undo files.
 if exists('+cryptmethod')
     set cryptmethod=blowfish
@@ -193,6 +202,10 @@ endif
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
 
+" noremap is used to make sure the right side is executed as is and can't be
+" modified by a plugin or other settings. Except for <Nop> which isn't
+" affected by mappings.
+
 " Easy way to exit insert mode.
 inoremap jj <Esc>
 inoremap jk <Esc>
@@ -218,7 +231,7 @@ cmap <Down>  <Nop>
 cmap <Right> <Nop>
 cmap <Left>  <Nop>
 
-" Use Ctrl-P/Ctrl-N as replacement for <Up>/<Down> in command mode. Thanks to
+" Use <C-P>/<C-N> as replacement for <Up>/<Down> in command mode. Thanks to
 " abstrakt and grayw in #vim on Freenode (2010-04-12 21:20 CEST).
 cnoremap <C-P> <Up>
 cnoremap <C-N> <Down>
@@ -241,16 +254,16 @@ nnoremap <silent> gb :bnext<CR>
 nnoremap <silent> gB :bprev<CR>
 
 " Fast access to buffers.
-nnoremap <silent> <Leader>1 :1b<CR>
-nnoremap <silent> <Leader>2 :2b<CR>
-nnoremap <silent> <Leader>3 :3b<CR>
-nnoremap <silent> <Leader>4 :4b<CR>
-nnoremap <silent> <Leader>5 :5b<CR>
-nnoremap <silent> <Leader>6 :6b<CR>
-nnoremap <silent> <Leader>7 :7b<CR>
-nnoremap <silent> <Leader>8 :8b<CR>
-nnoremap <silent> <Leader>9 :9b<CR>
-nnoremap <silent> <Leader>0 :10b<CR>
+nnoremap <silent> <Leader>1 :1buffer<CR>
+nnoremap <silent> <Leader>2 :2buffer<CR>
+nnoremap <silent> <Leader>3 :3buffer<CR>
+nnoremap <silent> <Leader>4 :4buffer<CR>
+nnoremap <silent> <Leader>5 :5buffer<CR>
+nnoremap <silent> <Leader>6 :6buffer<CR>
+nnoremap <silent> <Leader>7 :7buffer<CR>
+nnoremap <silent> <Leader>8 :8buffer<CR>
+nnoremap <silent> <Leader>9 :9buffer<CR>
+nnoremap <silent> <Leader>0 :10buffer<CR>
 
 " Make last active window the only window. Similar to <C-W> o.
 nnoremap <C-W>O <C-W>p<C-W>o
@@ -273,10 +286,10 @@ nnoremap <silent> <Leader>; :call setline(line('.'), getline('.') . ';')<CR>
 " and all nerds involved (godlygeek, strull in #vim on Freenode).
 if has('eval')
     function! s:VSetSearch()
-        let temp = @@
+        let l:temp = @@
         normal! gvy
         let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g')
-        let @@ = temp
+        let @@ = l:temp
     endfunction
     vnoremap * :<C-U>call <SID>VSetSearch()<CR>//<CR>
     vnoremap # :<C-U>call <SID>VSetSearch()<CR>??<CR>
@@ -311,24 +324,11 @@ else
         \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'qa' : 'Qa')
 endif
 
-" Make sure xa0 (alt + space) is automatically changed to a normal whitespace
-" 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.
-if has('gui_macvim')
-    let g:macvim_skip_cmd_opt_movement = 1
-endif
-
 " In case 'hlsearch' is used disable it with <C-L>. Thanks to frogonwheels and
 " vimgor (bot) in #vim on Freenode (2010-03-30 05:58 CEST).
 noremap <silent> <C-L> :nohlsearch<CR><C-L>
 
-" Ctrl-U in insert mode deletes a lot, break undo sequence before deleting the
+" <C-U> in insert mode deletes a lot, break undo sequence before deleting the
 " line so the change can be undone. Thanks to the vimrc_example.vim file in
 " Vim's source.
 inoremap <C-U> <C-G>u<C-U>
@@ -404,6 +404,15 @@ if has('syntax')
         set synmaxcol=500
     endif
 
+" Use (limited) syntax based omni completion if no other omni completion is
+" available. Taken from :help ft-syntax-omni.
+    if has('autocmd') && exists('+omnifunc')
+        autocmd FileType *
+            \ if &omnifunc == '' |
+            \     setlocal omnifunc=syntaxcomplete#Complete |
+            \ endif
+    endif
+
 " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
 " disabled when necessary with :2match (in Vim >= 700).
@@ -415,16 +424,16 @@ if has('syntax')
 
     if exists('*matchadd')
 " Highlight some important keywords in all documents.
-        for x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED']
-            call matchadd('Todo', x)
+        for s:x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED']
+            call matchadd('Todo', s:x)
         endfor
 
 " Highlight unicode whitespace which is no normal whitespace (0x20).
-        for x in ['00a0', '1680', '180e', '2000', '2001', '2002', '2003',
+        for s:x in ['00a0', '1680', '180e', '2000', '2001', '2002', '2003',
                 \ '2004', '2005', '2006', '2007', '2008', '2009', '200a',
                 \ '200b', '200c', '200d', '202f', '205f', '2060', '3000',
                 \ 'feff']
-            call matchadd('Error', '\%u' . x)
+            call matchadd('Error', '\%u' . s:x)
         endfor
     endif
 
@@ -440,6 +449,10 @@ if has('syntax')
     let g:perl_fold_blocks = 1
     let g:perl_nofold_packages = 1
     let g:perl_include_pod = 1 " syntax coloring for PODs
+    " Vim, enable folding for autogroups (a) and functions (f).
+    let g:vimsyn_folding = "af"
+    " XML.
+    let g:xml_syntax_folding = 1
 endif
 
 
@@ -455,7 +468,7 @@ if has('eval')
 
 " Settings for the NERD commenter.
     " Don't create any mappings I don't want to use.
-    let NERDCreateDefaultMappings = 0
+    let g:NERDCreateDefaultMappings = 0
     " Map toggle comment.
     map <Leader><Leader> <Plug>NERDCommenterToggle