X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.vimrc;h=32995bd72e17296251937c8f05bdfefd6c91dc5e;hb=178e2f8295f04cdb781e0652b26dc3cd569bd54f;hp=cb7de4244c0823fd3676e204829743b71bac09a1;hpb=600a615f7d480897c92d6c7de6de955dfd21d0d1;p=cmccabe-etc

diff --git a/.vimrc b/.vimrc
index cb7de42..32995bd 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,17 +1,17 @@
 
-"                Colin's vimrc                 
+"                Colin's vimrc
 "
 "            ||   www                %%%
 "     vwv    ||   )_(,;;;,        ,;,\_/ www
 "     )_(    ||   \|/ \_/         )_(\|  (_)
-"     \|   \ || /\\|/  |/         \| \|// | 
+"     \|   \ || /\\|/  |/         \| \|// |
 " "___\|//V\\||//_\V/_\|//_______\\|//V/\\|/__
 
-"*************** navigation *************** 
+"*************** navigation ***************
 set history=500
 set tags=./tags;../../../../
 
-"*************** search stuff *************** 
+"*************** search stuff ***************
 set incsearch
 set hlsearch
 set showmatch
@@ -19,7 +19,7 @@ set nowrapscan
 set ignorecase
 set smartcase
 
-"*************** formatting *************** 
+"*************** formatting ***************
 :filetype plugin on
 :filetype indent on
 set linebreak
@@ -28,26 +28,36 @@ set ruler
 syntax on
 highlight Comment ctermfg=darkcyan
 highlight Constant ctermfg=red
+highlight Search cterm=reverse
+highlight Error ctermfg=white ctermbg=1
 set t_Co=256
+set sw=4
+set ts=4
 set et
 
-"*************** bell *************** 
+"*************** bell ***************
 set vb t_vb="."
 set visualbell
-                                                                                
-"*************** movement stuff *************** 
+
+"*************** movement stuff ***************
 set splitbelow
 set splitright
 imap <BS> <ESC>
 set pastetoggle=<F2>
 
-"*************** gui stuff *************** 
-set guifont=fixed
+"*************** gui stuff ***************
+"set guifont=fixed
 set guioptions-=T
 set laststatus=2
 "noremap  <PageUp>
 
-"*************** colin's auto-commenter *************** 
+"*************** comand-mode stuff ***************
+" This abbreviation makes it easier to type :e <filename>.
+" When you type '%%' in command mode, it will be expanded to the directory name
+" of the file you're currently editing.
+cabbr <expr> %% expand('%:p:h')
+
+"*************** colin's auto-commenter ***************
 map ,/ :s/^/\/\//<CR>:nohlsearch<CR>
 map ,,/ :s/^\/\///<CR>:nohlsearch<CR>
 map ,# :s/^/#/<CR>:nohlsearch<CR>
@@ -64,10 +74,9 @@ map \B :ConqueTermVSplit /bin/bash<CR>
 "command Bash execute ":ConqueTerm bash"
 
 "*************** grep plugin ***************
-:let Grep_Default_Filelist = '*.c *.cpp *.cc *.rb *.h *.t *.py *.rst *.go'
+:let Grep_Default_Filelist = '*.c *.cpp *.cc *.hpp *.rb *.h *.t *.py *.rst *.go *.java *.S'
 :let Grep_Skip_Files = 'core.* *.svn *~ *.swp *.swo *.bak cscope.out cscope.files'
 
 "*************** pre-filled registers ******************
-let @s="Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>"
 let @w="Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>"
-let @x="Signed-off-by: Colin Patrick McCabe <cmccabe@acceptas.com>"
+let @s="Signed-off-by: Colin Patrick McCabe <cmccabe@cloudera.com>"