Removed folding

[stack/conf/vim.git] / vimrc

diff --git a/vimrc b/vimrc
index 28d68f4..a49c5a1 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -71,16 +71,6 @@ set expandtab " space instead of tabs
 set smarttab "Use the "shiftwidth" setting for inserting <TAB>s instead of the "tabstop" setting, when at the beginning of a line.
 set nowrap " do not wrap lines  
   
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Folding
-"    Enable folding, but by default make it act like folding is off, because folding is annoying in anything but a few rare cases
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-set foldenable " Turn on folding
-set foldmethod=indent " Make folding indent sensitive
-set foldlevel=100 " Don't autofold anything (but I can still fold manually)
-set foldopen-=search " don't open folds when you search into them
-set foldopen-=undo " don't open folds when you undo stuff
-
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Mouse Settings
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -187,6 +177,7 @@ if has ("autocmd")
 
     autocmd FileType c,cpp,slang set cindent
     autocmd FileType c,cpp,slang set textwidth=79
+    autocmd FileType c,cpp,slang set tags=./tags,/usr/src/linux/tags,~/.vim/tags/usr/include/tags 
 
     autocmd BufEnter * :syntax sync fromstart " ensure every file does syntax highlighting (full)
     autocmd BufNewFile *.sh call append(0, "#!/bin/bash")
@@ -232,11 +223,11 @@ let vam_install_path = expand('$HOME') . '/.vim/addons'
 exec 'set runtimepath+='.vam_install_path.'/vim-addon-manager'
 " Enable addons with vim-addon-manager using file type recognition
 let ft_addons = {
-    \ 'always': ['desert', 'surround', 'checksyntax', 'quickfixsigns', 'LargeFile', 'snipmate', 'snipmate-snippets', 'The_NERD_tree', 'SuperTab%1643'],
+    \ 'always': ['desert', 'gnupg', 'surround', 'checksyntax', 'quickfixsigns', 'LargeFile', 'snipmate', 'snipmate-snippets', 'The_NERD_tree', 'SuperTab%1643', 'fugitive'],
     \ 'r': [ 'Screen_vim__gnu_screentmux', 'Vim-R-plugin' ],
     \ '^\%(c\|cpp\|javascript\|python\|php\|html\|xml\|r\|sh\|css\|java\|make\|xslt\|vim\)$': [ 'Tagbar', 'checksyntax', 'TagHighlight'],
     \ '^\%(c\|cpp\|h\)$': [ 'clang_complete' ],
-    \ 'python': ['pythoncomplete', 'python_pydoc'],
+    \ 'python': [ 'python_pydoc'],
     \ 'php': ['phpcomplete', 'PDV_-_phpDocumentor_for_Vim'],
     \ 'gpg': ['gnupg'],
     \ }
@@ -256,3 +247,20 @@ endif
 let g:clang_complete_copen = 1
 let g:clang_complete_auto = 1
 let g:clang_user_options='|| exit 0'
+
+if has("cscope")
+    set csto=0
+    set cst
+    set nocsverb
+    " add any database in current directory
+    if filereadable("cscope.out")
+        cs add cscope.out
+    " else add database pointed to by environment
+    elseif $CSCOPE_DB != ""
+        cs add $CSCOPE_DB
+    endif
+    if filereadable("/usr/linux/cscope.out")
+        cs add /usr/linux/cscope.out
+    endif
+    set csverb
+endif