X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=2bb1cafde603b8b967a338ac3750fd65241f4bc5;hb=64a563e47e29c1f21bc03b8088e994da26afce04;hp=c39fa3c3b720e427d2fa7e8de76207d46174d019;hpb=ed1acb5a70f089e5d4cdaff93ae5978b34cfc723;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index c39fa3c..2bb1caf 100644
--- a/vimrc
+++ b/vimrc
@@ -26,7 +26,7 @@ endif
 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
 
@@ -218,7 +218,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>
@@ -328,6 +328,61 @@ endif
 " 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
 
@@ -450,7 +505,7 @@ if has('autocmd')
             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
@@ -493,49 +548,24 @@ if has('autocmd')
 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