Merge remote-tracking branch 'origin/master'

epochblue · Apr 16, 2012 · a5f1204 · a5f1204
2 parents 78e0ff8 + c6ec630
commit a5f1204
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.bashrc b/.bashrc
@@ -9,8 +9,10 @@
 set -o vi
 
 # history
+PROMPT_COMMAND='history -a; history -n'
 HISTCONTROL=ignoredups
-HISTSIZE=500
+HISTIGNORE='ls:bg:fg:history'
+HISTSIZE=1000
 shopt -s histappend
 shopt -s cmdhist
 

diff --git a/.vimrc b/.vimrc
@@ -65,16 +65,19 @@ endif
 " Remap the leader key
 let mapleader = ","
 
+" Don't lose the 'reverse search direction' command
+nnoremap <Leader>, ,
+
 " edit and source the vimrc file
 " (via Derek Wyatt)
 nmap <silent> <Leader>ev :e $MYVIMRC<CR>
 nmap <silent> <Leader>sv :so $MYVIMRC<CR>
 
 " Faster tab-switching
-nmap <silent> <Leader>T :tabnew<CR>
+nmap <silent> <Leader>t :tabnew<CR>
 nmap <silent> <Leader>q :tabc<CR>
-nmap <silent> <Leader>, :tabp<CR>
-nmap <silent> <Leader>. :tabn<CR>
+nmap <silent> <Leader>< :tabp<CR>
+nmap <silent> <Leader>> :tabn<CR>
 
 " Saner window management
 map <c-h> <c-w>h    " move left