" EDITOR SETTINGS
" Save 'runtimepath' in case it was changed by the system's configuration
-" files.
+" files. Also save 'diff' as set all& resets it; but somehow later (after
+" sourcing the vimrc - for example in a VimEnter autocmd) it gets
+" automagically restored to the correct value.
if has('eval')
let s:save_runtimepath = &runtimepath
+ let s:save_diff = &diff
endif
" Reset all options (except 'term', 'lines' and 'columns'). This makes sure a
" system wide configuration file doesn't change default values.
" And restore it after all other options were reset.
if has('eval')
let &runtimepath = s:save_runtimepath
+ let &diff = s:save_diff
unlet s:save_runtimepath
+ unlet s:save_diff
endif
" Make sure Vim (and not Vi) settings are used.
set nocompatible
" Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim
-" runtime files).
+" runtime files) if available.
set runtimepath-=~/.vim
set runtimepath^=~/.vim,~/.vim/runtime
set ignorecase
set smartcase
-" Activate spell checking, use English as default. Don't use spell checking
-" when diffing.
-if exists('+spell') && has('syntax') && !&diff
- set spell
+" Activate spell checking, use English as default.
+if exists('+spell') && has('syntax')
+ " But not when diffing as spell checking is distracting in this case.
+ if !&diff
+ set spell
+ endif
set spelllang=en_us
endif
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>
" Write before suspending, thanks to deryni in #vim on Freenode (2011-05-09
" 20:02 CEST). To suspend without saving either unmap this or use :stop<CR>.
-nnoremap <C-Z> :update<CR>:stop<CR>
+nnoremap <silent> <C-Z> :update<CR>:stop<CR>
" 2<C-G> gives more verbose information, use it by default. Thanks to NCS_One
" in #vim on Freenode (2011-08-15 00:17 CEST).
nnoremap <silent> gB :bprev<CR>
" Fast access to buffers.
-nnoremap <Leader>1 :1b<CR>
-nnoremap <Leader>2 :2b<CR>
-nnoremap <Leader>3 :3b<CR>
-nnoremap <Leader>4 :4b<CR>
-nnoremap <Leader>5 :5b<CR>
-nnoremap <Leader>6 :6b<CR>
-nnoremap <Leader>7 :7b<CR>
-nnoremap <Leader>8 :8b<CR>
-nnoremap <Leader>9 :9b<CR>
-nnoremap <Leader>0 :10b<CR>
+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>
" Make last active window the only window. Similar to <C-W> o.
nnoremap <C-W>O <C-W>p<C-W>o
" Maps to change spell language between English and German and disable spell
" checking.
if exists('+spell')
- noremap <Leader>sn :set nospell<CR>
- noremap <Leader>se :set spell spelllang=en_us<CR>
- noremap <Leader>sd :set spell spelllang=de_de<CR>
+ noremap <silent> <Leader>sn :set nospell<CR>
+ noremap <silent> <Leader>se :set spell spelllang=en_us<CR>
+ noremap <silent> <Leader>sd :set spell spelllang=de_de<CR>
endif
" Add semicolon to the end of the line. Thanks to
" vimgor (bot) in #vim on Freenode (2010-03-30 05:58 CEST).
noremap <silent> <C-L> :nohlsearch<CR><C-L>
+" <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>
+" Same for <C-@> (insert previously inserted text and leave insert mode).
+inoremap <C-@> <C-G>u<C-@>
+" And for <C-A> (insert previously inserted text).
+inoremap <C-A> <C-G>u<C-A>
+" And for <C-W> (delete word before cursor).
+inoremap <C-W> <C-G>u<C-W>
+
+if has('eval')
+" New text-objects ii and ai to work on text with the same indentation. Thanks
+" to http://vim.wikia.com/index.php?title=Indent_text_object&oldid=27126
+" (visited on 2011-11-19).
+ onoremap <silent> ai :<C-U>call <SID>IndTxtObj(0)<CR>
+ onoremap <silent> ii :<C-U>call <SID>IndTxtObj(1)<CR>
+ vnoremap <silent> ai :<C-U>call <SID>IndTxtObj(0)<CR><Esc>gv
+ vnoremap <silent> ii :<C-U>call <SID>IndTxtObj(1)<CR><Esc>gv
+
+ function! s:IndTxtObj(inner)
+ let curline = line(".")
+ let lastline = line("$")
+ let i = indent(line(".")) - &shiftwidth * (v:count1 - 1)
+ let i = i < 0 ? 0 : i
+ if getline(".") !~ "^\\s*$"
+ let p = line(".") - 1
+ let nextblank = getline(p) =~ "^\\s*$"
+ while p > 0
+ \ && ((i == 0 && !nextblank)
+ \ || (i > 0 && ((indent(p) >= i
+ \ && !(nextblank && a:inner))
+ \ || (nextblank && !a:inner))))
+ -
+ let p = line(".") - 1
+ let nextblank = getline(p) =~ "^\\s*$"
+ endwhile
+ normal! 0V
+ call cursor(curline, 0)
+ let p = line(".") + 1
+ let nextblank = getline(p) =~ "^\\s*$"
+ while p <= lastline
+ \ && ((i == 0 && !nextblank)
+ \ || (i > 0 && ((indent(p) >= i
+ \ && !(nextblank && a:inner))
+ \ || (nextblank && !a:inner))))
+ +
+ let p = line(".") + 1
+ let nextblank = getline(p) =~ "^\\s*$"
+ endwhile
+ normal! $
+ endif
+ endfunction
+endif
+
" ABBREVIATIONS
autocmd InsertLeave * set nopaste
endif
-" Save changes when running :mak[e] before 'makeprg' is called.
+" Write file when running :mak[e] before 'makeprg' is called.
autocmd QuickFixCmdPre * write
" AFTER/FTPLUGIN AUTO COMMANDS
endif
-" CUSTOM FUNCTIONS
+" CUSTOM FUNCTIONS AND COMMANDS
if has('eval')
- " New text-objects ii and ai to work on text with the same indentation.
- " Thanks to
- " http://vim.wikia.com/index.php?title=Indent_text_object&oldid=27126
- " (visited on 2011-11-19).
- onoremap <silent>ai :<C-U>call <SID>IndTxtObj(0)<CR>
- onoremap <silent>ii :<C-U>call <SID>IndTxtObj(1)<CR>
- vnoremap <silent>ai :<C-U>call <SID>IndTxtObj(0)<CR><Esc>gv
- vnoremap <silent>ii :<C-U>call <SID>IndTxtObj(1)<CR><Esc>gv
-
- function! s:IndTxtObj(inner)
- let curline = line(".")
- let lastline = line("$")
- let i = indent(line(".")) - &shiftwidth * (v:count1 - 1)
- let i = i < 0 ? 0 : i
- if getline(".") !~ "^\\s*$"
- let p = line(".") - 1
- let nextblank = getline(p) =~ "^\\s*$"
- while p > 0
- \ && ((i == 0 && !nextblank)
- \ || (i > 0 && ((indent(p) >= i
- \ && !(nextblank && a:inner))
- \ || (nextblank && !a:inner))))
- -
- let p = line(".") - 1
- let nextblank = getline(p) =~ "^\\s*$"
- endwhile
- normal! 0V
- call cursor(curline, 0)
- let p = line(".") + 1
- let nextblank = getline(p) =~ "^\\s*$"
- while p <= lastline
- \ && ((i == 0 && !nextblank)
- \ || (i > 0 && ((indent(p) >= i
- \ && !(nextblank && a:inner))
- \ || (nextblank && !a:inner))))
- +
- let p = line(".") + 1
- let nextblank = getline(p) =~ "^\\s*$"
- endwhile
- normal! $
- endif
- endfunction
-
+" Convenient command to see the difference between the current buffer and the
+" file it was loaded from, thus the changes you made. Thanks to the
+" vimrc_example.vim file in Vim's source. Modified to use the same filetype
+" for the diffed file than the filetype for the original file.
+ if !exists(":DiffOrig")
+ command DiffOrig
+ \ let s:diff_orig_filetype = &filetype
+ \ | vertical new
+ \ | let &filetype = s:diff_orig_filetype
+ \ | unlet s:diff_orig_filetype
+ \ | set buftype=nofile
+ \ | read ++edit #
+ \ | 0d_
+ \ | diffthis
+ \ | wincmd p
+ \ | diffthis
+ endif
endif
ruderich.org/simon / config / dotfiles.git / blobdiff