X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=9e94ae1024a033b6a072d45cd2112d132ed67d93;hp=4cc55d48e4642630d65a90773c511daf0c640602;hb=e6b7d067305c80c6177a29ce106ac847d2e641cb;hpb=cc26e7919284779febb332c3f96b24575403e21d

diff --git a/.vimrc b/.vimrc
index 4cc55d4..9e94ae1 100755
--- a/.vimrc
+++ b/.vimrc
@@ -66,9 +66,9 @@ fun! Cycle_StatusLine()
   call Iain_Vars()
   let b:iainhex = ! b:iainhex
   if b:iainhex
-    set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%Y%M%R]\ %=0\x%02B\ (%3.6c,%-4.6l)\ 0\x%04.6O\ \|\ %4.6L\ %P
+    set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %=0\x%02B\ (%3.6c,%-4.6l)\ 0\x%04.6O\ \|\ %4.6L\ %P
   else
-    set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%Y%M%R]\ %=%b\ (%3.6c,%-4.6l)\ %4.6o\ \|\ %4.6L\ %P
+    set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %=%b\ (%3.6c,%-4.6l)\ %4.6o\ \|\ %4.6L\ %P
   endif
 endfun
 
@@ -86,6 +86,10 @@ map = yyp:s/./=/g<RETURN>:let @/=''<RETURN>:<RETURN>
 command! W :w
 se tags=~/.ctags
 
+" Make * and # work the way you expect in visual mode.
+vnoremap * y/\V<C-R>=substitute(escape(@@,"/\\"),"\n","\\\\n","ge")<CR><CR>
+vnoremap # y?\V<C-R>=substitute(escape(@@,"?\\"),"\n","\\\\n","ge")<CR><CR>
+
 fun! Invert_Case()
   let &ic = ! &ic
 endfun
@@ -98,6 +102,10 @@ fun! Show_Tabstop()
   return &ts
 endfun
 
+fun! Show_Paste()
+  if &paste | return "p" | else | return "" | endif
+endfun
+
 " Clear Q as we will use it for commands.
 map Q <Nop>
 
@@ -114,6 +122,9 @@ map Q4 :se ts=4<CR>:<CR>
 " Change to ts=8 with Q8.
 map Q8 :se ts=8<CR>:<CR>
 
+" Vim 7 has tabs.  Default "next tab" mapping is gt.  Add "previous tab" as gb.
+map gb :tabPrev<CR>
+
 call Cycle_StatusLine()
 
 au VimLeave * if exists("andyoldcols") | let &columns=andyoldcols | endif
@@ -130,11 +141,6 @@ au BufLeave * if &ft == "c" || &ft == "cpp" | call CMode_unmap() | endif
 au BufEnter * if &ft == "perl" | call PerlMode_map() | endif
 au BufLeave * if &ft == "perl" | call PerlMode_unmap() | endif
 
-" ... For PHP files:
-
-au BufEnter * if &ft == "php" | call PHPMode_map() | endif
-au BufLeave * if &ft == "php" | call PHPMode_unmap() | endif
-
 " ... For makefiles:
 
 au BufEnter * if &ft == "make" | call MakeMode_map() | endif
@@ -163,16 +169,6 @@ fun! PerlMode_unmap()
   set foldmethod=manual
 endfun
 
-fun! PHPMode_map()
-  set nocindent
-  set autoindent
-endfun
-
-fun! PHPMode_unmap()
-  set noautoindent
-  set cindent
-endfun
-
 " ... For makefiles:
 
 fun! MakeMode_map()