" Multi-version vimrc compatible with version 4 and above. vim:set fdm=marker:
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Note that "if <condition> | call Something() | endif" syntax is unsupported
-" in Vim 4 so we write all our functions out the long way. It does work in
+" Note that "if <condition> | call Something() | endif" syntax is unsupported
+" in Vim 4 so we write all our functions out the long way. It does work in
" autocommand definitions, however.
" Vim 4 complains if version isn't set in the configuration file.
version 4.0
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Handle options safe to use in version 4. Vim 4 parses but ignores the
-" "if version" syntax used later in this file so we don't use it. No attempt
+" Handle options safe to use in version 4. Vim 4 parses but ignores the
+" "if version" syntax used later in this file so we don't use it. No attempt
" is made to make this configuration compatible with Vim 3.
" Some of these settings should strictly be wrapped inside "if has()" blocks
" but that would cause them not to be ignored by Vim 4.
" Don't timeout waiting to interpet, eg, <ESC>OA as an escape code.
se ttimeoutlen=100
+" Remember undo list for closed (but not wiped) buffers.
+se hidden
+
" Use ^B to search backward when completing.
inoremap <C-b> <C-p>
" Use ^L to show matching completions but don't select one.
inoremap <C-l> <C-n><C-p>
" Swap jump keys.
-noremap ' `
-noremap ` '
+nnoremap ' `
+nnoremap ` '
+
+" Select previous widnow.
+nnoremap <C-w>^ <C-w>p
+nnoremap <C-w><C-^> <C-w>p
"}}}1
" Find stuff.
" Set extra columns depending on window status.
fun! Extra_Columns(extra, var, ...) "{{{2
" Vim 6 doesn't have winnr("$"). Determine which windows are open
- " ourselves by using :windo to incremement a counter. As Vim 5
+ " ourselves by using :windo to incremement a counter. As Vim 5
" doesn't have :windo we require Vim 6 for this.
if v:version < "600"
return ""
if version >= "504" "{{{1
version 5.4
+" Reuse windows when using sbuffer.
+se switchbuf=useopen
+
+" Allow persistent variable saving for localvimrc.
+se viminfo+=!
+
" Do we have Unicode?
fun! Has_Unicode() "{{{2
if ! has('multi_byte')
if &ve == "all"
return "V"
- elseif &ve
+ elseif &ve != ''
return "v"
else
return ""
endif
call Iain_Vars()
let l:sl1='%2n\:\ %<%1*%f%0*\ [%{Show_List()}%{Show_Bind()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%{Show_VirtualEdit()}%{Show_Undo()}%Y%M%R]%{Show_Alt()}\ '
- let l:sl3='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%0*\ \|\ %P'
+ let l:sl3='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%V%0*\ \|\ %P'
let l:hexformat='%b'
if b:iainhex
let l:hexformat='0\x%02B'
if version >= "600" "{{{1
version 6.0
-if has("gui_win32")
+if has("win32") || has("win64")
se encoding=utf-8
endif
" Less intrusive syntax highlighting.
if has("syntax")
- syn enable
+ " The :syntax enable command tries to source the syntax.vim runtime script.
+ " Parsing this .vimrc will fail if for some reason the runtime doesn't
+ " exist, as could be the case if the binary was installed with no support
+ " files. GNU On Windows is one example of an incomplete installation.
+ try
+ syn enable
+ catch
+ endtry
endif
" Set colours.
while strlen(l:signs)
let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=-][^ ]\+')
- let l:sign = substitute(l:sign, ':.', "", "")
- let l:sign = substitute(l:sign, '=', " texthl=MarkSign text=", "")
- let l:sign = substitute(l:sign, '\.', " texthl=MarkDot text=", "")
- let l:sign = substitute(l:sign, '-', " texthl=MarkLine linehl=MarkLine text=", "")
+ let l:name = substitute(l:sign, '[:.=-].*', "", "")
+ let l:sign = substitute(l:sign, '^[A-Za-z]\+', "", "")
+ let l:ascii = matchstr(l:sign, '^:.')
+ let l:mark = substitute(l:sign, '^\(:.\)*[.=-]', "", "")
+ if strlen(l:ascii)
+ let l:ascii = substitute(l:ascii, '^:', "", "")
+ let l:ascii = matchstr(l:ascii, '^.')
+ else
+ let l:ascii = l:mark
+ endif
+ let l:ascii = substitute(l:ascii, '"', '\\"', "")
+ let l:type = substitute(l:sign, '^:.', "", "")
+ let l:type = matchstr(l:type, '^.')
+
+ let l:hl = ""
+ if l:type == "="
+ let l:hl = "texthl=MarkSign text="
+ elseif l:type == "."
+ let l:hl = "texthl=MarkDot text="
+ elseif l:type == "-"
+ let l:hl = "texthl=MarkLine text="
+ endif
- exe "sign define Mark" . l:sign
+ exe "sign define Mark" . l:name . " " . l:hl . l:mark
let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "")
endwhile
endif
call Resize_Columns(Extra_Columns("list", "iainlist", " == 2"), 1)
+ call Extra_Whitespace_Match()
endfun "}}}2
" Cycle between hex and decimal display of toolbar stuff.
call Show_StatusLine()
endfun "{{{2
+" To be overridden later if applicable.
+fun! Extra_Whitespace_Match() "{{{2
+ " NOP.
+endfun "}}}2
+
" Swap hex/decimal statusline with \x.
call Mapping("x", ":call Cycle_HexStatusLine()<CR>:<CR>")
" Change statusline verbosity with \v.
endif
endif "}}}1
+" move.
+nmap <A-u> <Plug>MoveLineHalfPageUp
+nmap <A-d> <Plug>MoveLineHalfPageDown
+vmap <A-u> <Plug>MoveBlockHalfPageUp
+vmap <A-d> <Plug>MoveBlockHalfPageDown
+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Handle options only available in Vim 7 and above.
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Transparency.
if has("gui_macvim")
se transparency=15
-endif
+endif
" Yet more GUI options. Add tabs.
if has("gui")
let g:NERDSpaceDelims=1
endif "}}}1
+" localvimrc.
+let g:localvimrc_persistent=1
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Handle options only available in Vim 7.2 and above.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if version >= "702" "{{{1
+if has("autocmd")
+ " http://vim.wikia.com/wiki/Highlight_unwanted_spaces
+ augroup WhitespaceMatch
+ autocmd!
+ au Display BufWinEnter * call Extra_Whitespace_Match()
+ au Display Syntax * call Extra_Whitespace_Match()
+ au Display BufWinLeave * call clearmatches()
+ augroup END
+
+ fun! Extra_Whitespace_Match() "{{{2
+ " \s\+ <whitespace>
+ " $ <before end of line>
+ " \@<! <unless preceded by>
+ " \%# <cursor position, ie when typing>
+ let l:pattern = '\s\+\%#\@<!$'
+ " Don't match single space in first column of diff.
+ if &ft =~# '^diff$\|git'
+ " \@! <unless also matching>
+ " \(^\s$\) <a single whitespace>
+ let l:pattern = '\(^\s$\)\@!' . l:pattern
+ endif
+
+ let l:hl = 'ctermfg=red guifg=red'
+ if ! &list
+ " Underline if we aren't using listchars.
+ let l:hl = l:hl . ' cterm=underline gui=underline'
+ endif
+ highlight clear ExtraWhitespace
+ exe "highlight ExtraWhitespace " . l:hl
+ if exists('w:whitespace_match_number')
+ try
+ call matchdelete(w:whitespace_match_number)
+ catch
+ endtry
+ call matchadd('ExtraWhitespace', l:pattern, 10, w:whitespace_match_number)
+ else
+ let w:whitespace_match_number = matchadd('ExtraWhitespace', l:pattern)
+ endif
+ endfun "}}}2
+
+ call Extra_Whitespace_Match()
+endif
+
+endif "}}}1
+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Handle options only available in Vim 7.3 and above.
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Remove persistent undo file with \U.
call Mapping("U", ":call <SID>Clear_Undo()<CR>:<CR>")
+" Toggle gundo window with \g.
+call Mapping("g", ":call gundo#GundoToggle()<CR>:<CR>")
+
" Use a persistent undo file if it exists.
fun! <SID>Check_Undo() "{{{2
if filereadable(undofile(expand("%")))
au Display WinEnter * if &diff | se cursorbind | endif
endif
endif
+
+" Mapping to reload the gundo window.
+if has("autocmd")
+ au Mode BufEnter * if &ft == "gundo" | try | nnoremap <silent> <buffer> <unique> r :call gundo#GundoToggle()<CR>:call gundo#GundoToggle()<CR> | catch | endtry | endif
+endif
+
endif "}}}1
" Resize after startup.
git://git.iain.cx/iain / profile.git / blobdiff