X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=0df4fd6e2189294310d928e6910cba4d963d6370;hb=ce25aec84e8327aa1ddc8de833d3a9a68ea89583;hp=fecbf915c2e426b7bda41f85ec424e4ea34e1e45;hpb=2d27d63624244a91c9f3088ec34e27003ed20195;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index fecbf91..0df4fd6 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,20 @@
 " Vim main configuration file.
 
+" Copyright (C) 2011-2012  Simon Ruderich
+"
+" This file is free software: you can redistribute it and/or modify
+" it under the terms of the GNU General Public License as published by
+" the Free Software Foundation, either version 3 of the License, or
+" (at your option) any later version.
+"
+" This file is distributed in the hope that it will be useful,
+" but WITHOUT ANY WARRANTY; without even the implied warranty of
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+" GNU General Public License for more details.
+"
+" You should have received a copy of the GNU General Public License
+" along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
 
 " EDITOR SETTINGS
 
@@ -54,6 +69,11 @@ set history=1000
 " Increase number of possible undos.
 set undolevels=1000
 
+if has('viminfo')
+    " Remember marks (including the last cursor position) for more files.
+    set viminfo^='1000
+endif
+
 " Use strong encryption if possible, also used for swap/undo files.
 if exists('+cryptmethod')
     set cryptmethod=blowfish
@@ -197,6 +217,10 @@ endif
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
 
+" noremap is used to make sure the right side is executed as is and can't be
+" modified by a plugin or other settings. Except for <Nop> which isn't
+" affected by mappings.
+
 " Easy way to exit insert mode.
 inoremap jj <Esc>
 inoremap jk <Esc>
@@ -395,6 +419,15 @@ if has('syntax')
         set synmaxcol=500
     endif
 
+" Use (limited) syntax based omni completion if no other omni completion is
+" available. Taken from :help ft-syntax-omni.
+    if has('autocmd') && exists('+omnifunc')
+        autocmd FileType *
+            \ if &omnifunc == '' |
+            \     setlocal omnifunc=syntaxcomplete#Complete |
+            \ endif
+    endif
+
 " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
 " disabled when necessary with :2match (in Vim >= 700).
@@ -422,15 +455,21 @@ if has('syntax')
 " Settings for specific filetypes.
 
     " Haskell.
+    let g:hs_highlight_delimiters = 1
     let g:hs_highlight_boolean = 1
     let g:hs_highlight_types = 1
     let g:hs_highlight_more_types = 1
-
     " Perl.
     let g:perl_fold = 1
     let g:perl_fold_blocks = 1
     let g:perl_nofold_packages = 1
     let g:perl_include_pod = 1 " syntax coloring for PODs
+    " Python.
+    let g:python_highlight_all = 1
+    " Vim, enable folding for autogroups (a) and functions (f).
+    let g:vimsyn_folding = "af"
+    " XML.
+    let g:xml_syntax_folding = 1
 endif