" 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.
endif
augroup StatusLine
autocmd!
+ augroup File
+ autocmd!
augroup END
endif
call Prep_Var("b:iainstatus", "'Fih'")
call Prep_Var("g:iainextracolumnsnumber", "''")
call Prep_Var("g:iainextracolumnslist", "''")
- call Prep_Var("b:iaincul", 0)
+ call Prep_Var("b:iainalt", 0)
if has("signs")
call Prep_Var("g:marksigns", 0)
call Prep_Var("g:firstsign", 100)
" 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 ""
call Mapping("<", ":call Resize_Columns('-')<CR>:<CR>")
" Clear search pattern with \/.
call Mapping("/", ":let @/=\"\"<CR>:<CR>")
+" Toggle alternate buffer name with \#.
+call Mapping("#", ":call Cycle_Alt()<CR>:<CR>")
" Set graphical window title.
if has("win32") || has("win64")
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')
+ return 0
+ endif
+
+ if version < "602"
+ return 0
+ endif
+
+ if &tenc =~? '^u\(tf\|cs\)'
+ return 1
+ endif
+
+ if ! strlen(&tenc) && &enc =~? '^u\(tf\|cs\)'
+ return 1
+ endif
+
+ return 0
+endfun "}}}2
+
" Helper for status line.
" Show space, underscore or dollar sign depending on list mode.
fun! Show_List() "{{{2
if w:iainlist == 0
" No list.
return " "
- elseif <SID>Has_Unicode()
+ elseif Has_Unicode()
if w:iainlist == 1
" Just tabs.
return "»"
endif
endfun "}}}2
+" Helper for status line.
+" Show v when virtualedit mode is block, insert or onemore.
+" Show V when virtualedit mode is all.
+fun! Show_VirtualEdit() "{{{2
+ if ! has("virtualedit")
+ return ""
+ endif
+
+ if &ve == "all"
+ return "V"
+ elseif &ve != ''
+ return "v"
+ else
+ return ""
+ endif
+endfun "}}}2
+
+" Helper for status line.
+" Show U when persistent undo is on.
+" Show u when persistent undo is off but an undofile exists.
+fun! Show_Undo() "{{{2
+ if ! exists("&undofile")
+ return ""
+ endif
+
+ if &undofile
+ return "U"
+ elseif filereadable(undofile(expand("%")))
+ return "u"
+ else
+ return ""
+ endif
+endfun "}}}2
+
+" Helper for status line.
+" Show alternate buffer number and name.
+fun! Show_Alt() "{{{2
+ let l:alt = bufnr("#")
+ if l:alt < 0 || l:alt == bufnr("") || ! b:iainalt
+ return ""
+ endif
+
+ return " " . l:alt . ": " . expand("#:t")
+endfun "}}}2
+
+" Helper for status line.
+" Show scrollbind or cursorbind.
+fun! Show_Bind() "{{{2
+ if has("cursorbind")
+ if &cursorbind
+ if Has_Unicode()
+ return "⇄"
+ else
+ return ">"
+ endif
+ elseif &scrollbind
+ if Has_Unicode()
+ return "⇅"
+ else
+ return "^"
+ endif
+ endif
+ endif
+ return ""
+endfun "}}}2
+
" Show the status line.
fun! Show_StatusLine() "{{{2
if ! has("statusline")
return
endif
call Iain_Vars()
- let l:sl1='%2n\:\ %<%1*%f%0*\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ '
- let l:sl3='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%0*\ \|\ %P'
+ 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%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.
let l:sign = ""
let l:i = 0
while strlen(l:signs)
- let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=-][^ ]\+')
+ let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+')
- let l:name = substitute(l:sign, '[:.=-].*', "", "")
+ let l:name = substitute(l:sign, '[:.=>-].*', "", "")
let l:var = tolower(l:name)
let l:sign = substitute(l:sign, '^[A-Za-z]\+', "", "")
let l:ascii = matchstr(l:sign, '^:.')
- let l:mark = substitute(l:sign, '^\(:.\)*[.=-]', "", "")
+ let l:mark = substitute(l:sign, '^\(:.\)*[.=>-]', "", "")
if strlen(l:ascii)
let l:ascii = substitute(l:ascii, '^:', "", "")
else
endif
let l:ascii = substitute(l:ascii, '"', '\\"', "")
+ if l:ascii == "o"
+ let l:line = "."
+ else
+ let l:line = "'" . l:ascii
+ endif
+
call <SID>Prep_Sign(l:var)
- exe "let " . l:var . " = <SID>Place_Sign(" . l:i . ", line(\"'" . l:ascii . "\"), b:sign" . l:var . ", \"Mark" . l:name . "\")"
+ exe "let " . l:var . " = <SID>Place_Sign(" . l:i . ", line(\"" . l:line . "\"), b:sign" . l:var . ", \"Mark" . l:name . "\")"
let l:i = l:i + 1
let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "")
" Signs with Type '=' will be highlighted with the MarkSign group.
" Signs with Type '-' will be highlighted with the MarkLine group.
" Signs with Type '.' will be highlighted with the MarkDot group.
+ " Signs with Type '>' will be highlighted with the MarkArrow group.
" Define the Mark where Symbol is not also the mark name, eg "']".
- if <SID>Has_Unicode()
- let g:iainsigns = "Dash:'=’ Dot:..• Quote:\"=” Caret:^.ʌ"
+ let g:iainsigns = "Less=< Greater=> Left=( Right=) SquareLeft=[ SquareRight=] BraceLeft={ BraceRight=} a-a b-b c-c d-d e-e f-f A-A B-B C-C D-D E-E F-F"
+ if Has_Unicode()
+ let g:iainsigns = g:iainsigns . " Quote:\"=” Dash:'=’ Caret:^.ʌ Dot:..•"
+ if version < "704"
+ let g:iainsigns = g:iainsigns ." Cursor:o>▶"
+ endif
else
- let g:iainsigns = "Dash=' Dot:..* Quote=\" Caret.^"
+ let g:iainsigns = g:iainsigns . " Quote=\" Dash=' Caret.^ Dot:..*"
+ if version < "704"
+ let g:iainsigns = g:iainsigns ." Cursor>o"
+ endif
endif
- let g:iainsigns = g:iainsigns . " Less=< Greater=> Left=( Right=) SquareLeft=[ SquareRight=] BraceLeft={ BraceRight=} a-a b-b c-c d-d e-e f-f A-A B-B C-C D-D E-E F-F"
endif
if g:marksigns
let l:signs = g:iainsigns
let l:sign = ""
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:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+')
+
+ 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="
+ elseif l:type == ">"
+ let l:hl = "texthl=MarkArrow 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
endfun "}}}2
-" Do we have Unicode?
-fun! <SID>Has_Unicode() "{{{2
- if ! has('multi_byte')
- return 0
- endif
-
- if version < "602"
- return 0
- endif
-
- if &tenc =~? '^u\(tf\|cs\)'
- return 1
- endif
-
- if ! strlen(&tenc) && &enc =~? '^u\(tf\|cs\)'
- return 1
- endif
-
- return 0
-endfun "}}}2
-
" Change list mode.
fun! Cycle_List() "{{{2
" Pretty UTF-8 listchars.
- if <SID>Has_Unicode()
+ if Has_Unicode()
let basic='tab:»·,trail:…,extends:«,precedes:»'
let eol='eol:¶'
if version >= "700"
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.
endif
endfun "}}}2
+" Toggle showing alternate buffer information.
+fun! Cycle_Alt() "{{{2
+ call Iain_Vars()
+ let b:iainalt = ! b:iainalt
+ 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.
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
return l:s
endfun "}}}2
-" Toggle highlighting cursor line when focus changes.
-fun! <SID>ToggleCursorLine() "{{{2
- call Iain_Vars()
+" Handle searching in a BufExplorer window.
+fun! <SID>BufExplorer_Search(n) "{{{2
+ if a:n == 0
+ let l:re = '^ *\d %'
+ else
+ let l:re = "^ *" . a:n
+ endif
- if b:iainstatus =~# "f" && b:iainstatus =~# "H" && b:iainstatus =~# "I"
- " Focus lost while held in insert mode.
- let b:iaincul = getbufvar("", "&cursorline")
- setlocal cursorline
- elseif ! b:iaincul
- setlocal nocursorline
+ " Find matching line.
+ let l:line = search(l:re, 'w')
+ if ! l:line
+ return
+ endif
+
+ if a:n == 0
+ return
endif
+
+ " Peek ahead to the next matching line.
+ let l:next = search(l:re, 'w')
+
+ " Select the buffer if the match is unambiguous.
+ if l:next == l:line
+ exe "normal \<CR>"
+ return
+ endif
+
+ " Go back.
+ call cursor(l:line, 0)
+endfun! "}}}2
+
+" Entering a BufExplorer window.
+fun! <SID>BufExplorer_Map() "{{{2
+ for l:n in [ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ]
+ exec "nnoremap <buffer> <silent>" . l:n . " :call <SID>BufExplorer_Search(" . l:n . ")<CR>"
+ endfor
endfun "}}}2
if has("windows")
au StatusLine InsertEnter * call Highlight_StatusLine("I")
au StatusLine InsertLeave * call Highlight_StatusLine("i")
- if has("syntax")
- au Display FocusGained,FocusLost * call <SID>ToggleCursorLine()
- endif
-
if has("signs")
+ au Signs CursorHoldI * call <SID>Highlight_Signs()
au Signs InsertEnter * call <SID>Highlight_Signs()
au Signs InsertLeave * call <SID>Highlight_Signs()
endif
+
+ au Mode BufEnter \[BufExplorer\] call <SID>BufExplorer_Map()
endif
" Limit the size of the popup menu when completing.
" Transparency.
if has("gui_macvim")
se transparency=15
-endif
+endif
" Yet more GUI options. Add tabs.
if has("gui")
" BufExplorer.
let g:bufExplorerShowRelativePath=1
let g:bufExplorerSplitOutPathName=0
+
+" NERDcommenter.
+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.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if version >= "703" "{{{1
+version 7.3
+
+" Toggle persistent undo with \u.
+call Mapping("u", ":call <SID>Cycle_Undo()<CR>:<CR>")
+" 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("%")))
+ setlocal undofile
+ endif
+endfun "}}}2
+
+" Toggle persistent undo for this buffer.
+fun! <SID>Cycle_Undo() "{{{2
+ if has("persistent_undo")
+ let &undofile = ! &undofile
+ endif
+endfun "}}}2
+
+" Remove the persistent undo file for this buffer.
+fun! <SID>Clear_Undo() "{{{2
+ if ! has("persistent_undo")
+ return
+ endif
+
+ setlocal noundofile
+
+ let l:f = expand("%")
+ if l:f == ""
+ return
+ endif
+
+ let l:u = undofile(l:f)
+ if l:u == ""
+ return
+ endif
+
+ if ! filereadable(l:u) || ! filewritable(l:u)
+ return
+ endif
+
+ call delete(l:u)
+endfun "}}}2
+
+" Toggle ColorColumn at cursor position.
+fun! <SID>Cycle_ColorColumn() "{{{2
+ if ! has("syntax")
+ return
+ endif
+
+ let l:cc = &colorcolumn
+ let l:column = col(".")
+ let l:re = ",*\\<" . l:column . "\\>"
+ if l:cc =~# l:re
+ let l:cc = substitute(l:cc, l:re, "", "g")
+ else
+ let l:cc = l:cc . "," . l:column
+ endif
+ let &colorcolumn = substitute(l:cc, "^,*", "", "")
+endfun "}}}2
+
+if has("syntax")
+ " Enable showing ColorColumn at cursor position with \CC.
+ call Mapping("CC", ":call <SID>Cycle_ColorColumn()<CR>:<CR>")
+ " Remove last shown ColorColumn with \Cc.
+ call Mapping("Cc", ":let &colorcolumn=substitute(&colorcolumn, \",*[0-9]*$\", \"\", \"\")<CR>:<CR>")
+ " Remove all ColorColumns with \Cx.
+ call Mapping("Cx", ":se colorcolumn=<CR>:<CR>")
+endif
+
+" Use persistent undo if available.
+if has("autocmd")
+ if has("persistent_undo")
+ au File BufReadPost * call <SID>Check_Undo()
+ endif
+
+ if has("cursorbind")
+ 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
+"
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Handle options only available in Vim 7.4 and above.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if version >= "704" "{{{1
+version 7.4
+
+if has("syntax")
+ se cursorline
+endif
+
endif "}}}1
" Resize after startup.
git://git.iain.cx/iain / profile.git / blobdiff