vim/vimrc: indenting structure initializers

[smckown/dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 39154607ea1c619e8eff78be1aaee957495df47d..c6fce6b6a371314ecfbf44676eb4579c006c8bfb 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -70,6 +70,9 @@ set list
 " Set default indent policy.  smarttab, roundshift enabled by sensible
 set softtabstop=2 shiftwidth=2 expandtab
 
+" cinoptions for code formatting
+set cinoptions=t0,us,U1,k2s,j1,J1
+
 " File type specific settings.
 if has("autocmd")
   autocmd filetype make setlocal sts=0 sw=8 noexpandtab tw=80 fo-=t fo+=j
@@ -77,9 +80,10 @@ if has("autocmd")
   autocmd filetype python setlocal sts=4 sw=4 tw=79 fo-=t fo+=j
   autocmd filetype html,xml setlocal listchars-=tab:>. tw=80 fo-=t fo+=j
   autocmd filetype markdown,mkd,md setlocal tw=80 fo-=t fo+=j
-  autocmd filetype c,cpp,java setlocal tw=80 fo-=t fo+=j
-  autocmd filetype nesc setlocal syntax=c.doxygen tw=80 fo-=t fo+=j
+  autocmd filetype c,cpp,java setlocal tw=80 fo+=jt
+  autocmd filetype nesc setlocal syntax=c.doxygen tw=80 fo+=jt
   autocmd filetype text setlocal tw=80 fo+=jt
+  autocmd filetype tex setlocal tw=80 fo+=jt
 
   autocmd BufReadPre README*,TODO*,INSTALL* setlocal tw=80 fo+=t
 
@@ -351,6 +355,7 @@ nnoremap co( :RainbowParenthesesToggle<CR>
 
 " mkbuild tools
 nnoremap <silent> <leader>e :call mkbuild#DmenuOpen('e')<CR>
+nnoremap <silent> <leader>x :call mkbuild#SelectXrefs()<CR>
 
 " Turn on doxygen syntax highlighting for C, C++, C# and IDL files.
 let g:load_doxygen_syntax=1
@@ -399,6 +404,9 @@ endfunction
 
 " Insert date and time in insert mode.  Have to use the native <Leader>, not
 " its re-mapped version <space>
-imap <leader>d <C-R>=strftime("%Y%m%d")<CR>
-imap <leader>D <C-R>=strftime("%Y-%m-%d")<CR>
-imap <leader>t <C-R>=strftime("%H:%M:%S")<CR>
+"nmap <leader>dd "=strftime('%Y%m%d')<CR>p
+"imap <leader>dd <C-R>=strftime('%Y%m%d')<CR>
+"nmap <leader>dD "=strftime('%Y-%m-%d')<CR>p
+"imap <leader>dD <C-R>=strftime('%Y-%m-%d')<CR>
+"nmap <leader>dt "=strftime('%H:%M:%S')<CR>p
+"imap <leader>dt <C-R>=strftime('%H:%M:%S')<CR>