X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=0df4fd6e2189294310d928e6910cba4d963d6370;hb=ce25aec84e8327aa1ddc8de833d3a9a68ea89583;hp=2bb1cafde603b8b967a338ac3750fd65241f4bc5;hpb=64a563e47e29c1f21bc03b8088e994da26afce04;p=config%2Fdotfiles.git
diff --git a/vimrc b/vimrc
index 2bb1caf..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 .
+
" EDITOR SETTINGS
@@ -25,6 +40,10 @@ endif
" Make sure Vim (and not Vi) settings are used.
set nocompatible
+" Use UTF-8 for all internal data (buffers, registers, etc.). This doesn't
+" affect reading files in different encodings, see 'fileencodings' for that.
+set encoding=utf-8
+
" Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim
" runtime files) if available.
set runtimepath-=~/.vim
@@ -50,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
@@ -193,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 which isn't
+" affected by mappings.
+
" Easy way to exit insert mode.
inoremap jj
inoremap jk
@@ -241,16 +269,16 @@ nnoremap gb :bnext
nnoremap gB :bprev
" Fast access to buffers.
-nnoremap 1 :1b
-nnoremap 2 :2b
-nnoremap 3 :3b
-nnoremap 4 :4b
-nnoremap 5 :5b
-nnoremap 6 :6b
-nnoremap 7 :7b
-nnoremap 8 :8b
-nnoremap 9 :9b
-nnoremap 0 :10b
+nnoremap 1 :1buffer
+nnoremap 2 :2buffer
+nnoremap 3 :3buffer
+nnoremap 4 :4buffer
+nnoremap 5 :5buffer
+nnoremap 6 :6buffer
+nnoremap 7 :7buffer
+nnoremap 8 :8buffer
+nnoremap 9 :9buffer
+nnoremap 0 :10buffer
" Make last active window the only window. Similar to o.
nnoremap O po
@@ -273,10 +301,10 @@ nnoremap ; :call setline(line('.'), getline('.') . ';')
" and all nerds involved (godlygeek, strull in #vim on Freenode).
if has('eval')
function! s:VSetSearch()
- let temp = @@
+ let l:temp = @@
normal! gvy
let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g')
- let @@ = temp
+ let @@ = l:temp
endfunction
vnoremap * :call VSetSearch()//
vnoremap # :call VSetSearch()??
@@ -311,19 +339,6 @@ else
\ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'qa' : 'Qa')
endif
-" Make sure xa0 (alt + space) is automatically changed to a normal whitespace
-" if pressed accidentally while in insert mode (happens on Mac when alt
-" doesn't send escape). filereadable() is necessary for Leopard were 'mac' is
-" no longer set on the console.
-if has('mac') || filereadable('/Users/.localized')
- inoremap
-endif
-
-" Disable Apple style movements in MacVim.
-if has('gui_macvim')
- let g:macvim_skip_cmd_opt_movement = 1
-endif
-
" In case 'hlsearch' is used disable it with . Thanks to frogonwheels and
" vimgor (bot) in #vim on Freenode (2010-03-30 05:58 CEST).
noremap :nohlsearch
@@ -404,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
" from the Vim mailing list. It can easily be
" disabled when necessary with :2match (in Vim >= 700).
@@ -415,31 +439,37 @@ if has('syntax')
if exists('*matchadd')
" Highlight some important keywords in all documents.
- for x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED']
- call matchadd('Todo', x)
+ for s:x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED']
+ call matchadd('Todo', s:x)
endfor
" Highlight unicode whitespace which is no normal whitespace (0x20).
- for x in ['00a0', '1680', '180e', '2000', '2001', '2002', '2003',
+ for s:x in ['00a0', '1680', '180e', '2000', '2001', '2002', '2003',
\ '2004', '2005', '2006', '2007', '2008', '2009', '200a',
\ '200b', '200c', '200d', '202f', '205f', '2060', '3000',
\ 'feff']
- call matchadd('Error', '\%u' . x)
+ call matchadd('Error', '\%u' . s:x)
endfor
endif
" 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
@@ -455,7 +485,7 @@ if has('eval')
" Settings for the NERD commenter.
" Don't create any mappings I don't want to use.
- let NERDCreateDefaultMappings = 0
+ let g:NERDCreateDefaultMappings = 0
" Map toggle comment.
map NERDCommenterToggle