Update vimrc

git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@657 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede

1 files changed, 79 insertions, 13 deletions

diff --git a/vimrc b/vimrc
index 995da5d..52905c6 100644
--- a/vimrc
+++ b/vimrc
@@ -10,39 +10,105 @@ set ai
 :nmap <F11> :set invlist<return>
 :imap <F11> <C-O>:set invlist<return>
 :set clipboard^=autoselectml guioptions+=A
-let g:Imap_UsePlaceHolders = 0
+let g:Imap_UsePlaceHolders = 1
 let g:Imap_FreezeImap = 1
 ":set fileencodings=ucs-bom,utf-8,default,latin1
 :hi MatchParen ctermbg=black
+colorscheme peachpuff
+
 map <F3> :n<return>
 map <F2> :N<return>
 map <F5> :wn<return>
 map <F4> :wN<return>
 map fd ggV/^-- <CR><up>gq
-nnoremap <silent> <C-left> :tabprev<return>
-nnoremap <silent> <C-right> :tabnext<return>
-inoremap <silent> <C-left> <C-O>:tabprev<return>
-inoremap <silent> <C-right> <C-O>:tabnext<return>
-" nnoremap <space><space> :tabnew<return>
-nnoremap <silent> <space><left> :tabprev<return>
-nnoremap <silent> <space><right> :tabnext<return>
-" nnoremap <silent> <C-M> :make<return>
-nnoremap <silent> <C-B> :!make<return>
-colorscheme peachpuff
+
+nnoremap <silent> <C-M> :make<return>
+" nnoremap <silent> <C-B> :!make<return>
+
+" Set up the left-right actions just right:
+" -----------------------------------------
+"nnoremap <silent> <C-left> :tabprev<return>
+"nnoremap <silent> <C-right> :tabnext<return>
+"inoremap <silent> <C-left> <C-O>:tabprev<return>
+"inoremap <silent> <C-right> <C-O>:tabnext<return>
+"" nnoremap <space><space> :tabnew<return>
+"nnoremap <silent> <space><left> :tabprev<return>
+"nnoremap <silent> <space><right> :tabnext<return>
+
+nnoremap <silent> <S-left> :bprevious<return>
+nnoremap <silent> <S-right> :bnext<return>
+inoremap <silent> <S-left> <C-O>:bprevious<return>
+inoremap <silent> <S-right> <C-O>:bnext<return>
+
+nnoremap <silent> <C-left> :bprevious<return>
+nnoremap <silent> <C-right> :bnext<return>
+inoremap <silent> <C-left> <C-O>:bprevious<return>
+inoremap <silent> <C-right> <C-O>:bnext<return>
+
+nnoremap <silent> <Esc>[1;2D :bprevious<return>
+nnoremap <silent> <Esc>[1;2C :bnext<return>
+inoremap <silent> <Esc>[1;2D <C-O>:bprevious<return>
+inoremap <silent> <Esc>[1;2C <C-O>:bnext<return>
+
+nnoremap <silent> <Esc>[D :bprevious<return>
+nnoremap <silent> <Esc>[C :bnext<return>
+inoremap <silent> <Esc>[D <C-O>:bprevious<return>
+inoremap <silent> <Esc>[C <C-O>:bnext<return>
+
+" nnoremap <space><space> :bnew<return>
+nnoremap <silent> <space><left> :bprevious<return>
+nnoremap <silent> <space><right> :bnext<return>
+
+if &term =~ '^screen'
+    " tmux will send xterm-style keys when xterm-keys is on
+    execute "set <xUp>=\e[1;*A"
+    execute "set <xDown>=\e[1;*B"
+    execute "set <xRight>=\e[1;*C"
+    execute "set <xLeft>=\e[1;*D"
+endif
+
+
+
+" wild/tab behavior
+" =================
 set wildmode=longest,list:longest,list:full
-" set number
+
+" spelling stuff
+" ==============
 set spellfile=~/.vim.spell.en.add
 :nmap <F8> :set invspell<return>
 :imap <F8> <C-O>:set invspell<return>
+
+" Detect indent stuff
+" ===================
+" wants the detectindent addon.
 function WeaselDoIdent()
   if exists(":DetectIndent")
     DetectIndent
   endif
 endfunction
 :autocmd BufReadPost * exec WeaselDoIdent()
-"
+
+" Searching and highlighting
+" ==========================
 "hi Search cterm=NONE ctermfg=white ctermbg=darkgreen
 hi Search cterm=NONE ctermfg=yellow ctermbg=19
 set hlsearch
 "This disabled search highlighting after a search
 nnoremap <CR> :noh<CR><CR>
+
+" misc settings
+" =============
+" Raise the number of maximum tabs
+set tabpagemax=50
+" Do not close buffers we don't see
+set hidden
+
+
+" set grepprg=grep\ -nH\ $*
+" filetype indent on
+" let g:tex_flavor='latex'
+" "let g:Tex_PromptedEnvironments='eqnarray*,eqnarray,equation,equation*,\[,$$,align,align*'
+" let g:Tex_PromptedEnvironments='frame,itemize'
+" "call IMAP('FRAME', '\\begin{frame}{<++>}\<cr>  <++>\<cr>\\end{frame}', 'tex')
+" let g:Tex_Env_frame = "\\begin{frame}{<++>}\<CR><++>\<CR>\\end{frame}"