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)
let l:normalcolour = "darkblue"
let l:editingcolour = "darkmagenta"
+ let l:replacecolour = "purple"
let l:warningcolour = "darkred"
let l:readonlycolour = "red"
+ if b:iainstatus =~# "I"
+ if v:insertmode == "r"
+ let l:editingcolour = l:replacecolour
+ endif
+ endif
+
" Default colour.
let l:colour = l:normalcolour
" Maybe override depending on status.
return 17
elseif a:colour == "darkmagenta"
return 33
+ elseif a:colour == "purple"
+ return 35
elseif a:colour == "darkred"
return 32
elseif a:colour == "red"
return 17
elseif a:colour == "darkmagenta"
return 90
+ elseif a:colour == "purple"
+ return 57
elseif a:colour == "darkred"
return 88
elseif a:colour == "red"
return 196
endif
else
+ " Colours which cterm*g doesn't recognise.
+ if a:colour == "purple"
+ return "magenta"
+ endif
return a:colour
endif
endfun "}}}2
" Reuse windows when using sbuffer.
se switchbuf=useopen
+" Vim 5 requires a 'n setting for viminfo.
+if ! &viminfo
+ se viminfo='100
+endif
+
" Allow persistent variable saving for localvimrc.
se viminfo+=!
endfun "}}}2
" Helper for status line.
+" Show file encoding
+func! Show_Encoding() "{{{2
+ let l:enc = &fenc
+ if l:enc == ""
+ let l:enc = &enc
+ if l:enc == ""
+ return ""
+ endif
+ let l:enc = '(' . l:enc . ')'
+ endif
+
+ if has("multi_byte")
+ if &bomb
+ if Has_Unicode()
+ let l:enc = l:enc . "☻"
+ else
+ let l:enc = l:enc . "@"
+ endif
+ endif
+ endif
+
+ return l:enc . ","
+endfun "}}}2
+
+" Helper for status line.
" Show space, underscore or dollar sign depending on list mode.
fun! Show_List() "{{{2
call Iain_Vars()
if w:iainlist == 0
" No list.
- return " "
+ return ""
elseif Has_Unicode()
if w:iainlist == 1
" Just tabs.
return ""
endfun "}}}2
+" Helper for status line.
+" Show marker if searchforward is unset.
+fun! Show_SearchForward() "{{{2
+ if version >= "702"
+ if ! v:searchforward
+ if Has_Unicode()
+ return "∆"
+ else
+ return "^"
+ endif
+ endif
+ endif
+ return ""
+endfun "}}}2
+
+" Helper for status line.
+" Show marks set in cursor line.
+fun! Show_Marks() "{{{2
+ if ! exists("g:iainsigns")
+ return ""
+ endif
+
+ let l:marks = ""
+
+ let l:signs = g:iainsigns
+ let l:sign = ""
+ let l:cursorline = line(".")
+ while strlen(l:signs)
+ let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+')
+ 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, '^:', "", "")
+ else
+ let l:ascii = l:mark
+ endif
+ let l:ascii = substitute(l:ascii, '"', '\\"', "")
+
+ if l:ascii == "o"
+ let l:line = "."
+ else
+ let l:line = "'" . l:ascii
+ endif
+
+ " Ignore cursor line which will always match.
+ if l:line != "."
+ if l:cursorline == line(l:line)
+ let l:marks = l:marks . l:mark
+ endif
+ endif
+
+ let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "")
+ endwhile
+
+ if l:marks == ""
+ return ""
+ else
+ return "M:" . l:marks . " "
+ endif
+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_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:sl1='%2n\:\ %<%1*%f%0*\ [%{Show_Encoding()}%{Show_List()}%{Show_Bind()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%{Show_VirtualEdit()}%{Show_Undo()}%Y%M%R%{Show_SearchForward()}]%{Show_Alt()}\ '
+ let l:sl3='%{Show_Marks()}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'
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 "']".
+ 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 = "Dash:'=’ Dot:..• Quote:\"=” Caret:^.ʌ"
+ 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
return l:s
endfun "}}}2
-" Toggle highlighting cursor line when focus changes.
-fun! <SID>ToggleCursorLine() "{{{2
- call Iain_Vars()
-
- if b:iainstatus =~# "H" && b:iainstatus =~# "I"
- " We are held in insert mode.
- if b:iainstatus =~# "f"
- " And focus was lost.
- let b:iaincul = getbufvar("", "&cursorline")
- setlocal cursorline
- elseif ! b:iaincul
- setlocal nocursorline
- endif
- endif
-endfun "}}}2
-
" Handle searching in a BufExplorer window.
fun! <SID>BufExplorer_Search(n) "{{{2
if a:n == 0
au StatusLine FocusGained * call Highlight_StatusLine("F")
au StatusLine FocusLost * call Highlight_StatusLine("f")
au StatusLine InsertEnter * call Highlight_StatusLine("I")
+ au StatusLine InsertChange * 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
" localvimrc.
let g:localvimrc_persistent=1
+" Gitv.
+let g:Gitv_OpenHorizontal='auto'
+let g:Gitv_WipeAllOnClose=1
+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Handle options only available in Vim 7.2 and above.
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
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.
if version >= "500" "{{{1
git://git.iain.cx/iain / profile.git / blobdiff