From 24d37da439aa2f6ff09e5fec9c5bf1d699dd4b69 Mon Sep 17 00:00:00 2001 From: Iain Patterson Date: Tue, 3 Aug 2010 15:50:05 +0100 Subject: [PATCH] Cursor binding. Show scrollbind or cursorbind in the statusline. If cursorbind (introduced in Vim 7.3) is on show a horizontal arrow indicator. If scrollbind is on (and cursorbind isn't) show a vertical indicator. This necessitates moving Has_Unicode() to the Vim 5 section and hence removing the script prefix. Set cursorbind automatically where supported if diff mode is on. --- .vimrc | 75 ++++++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/.vimrc b/.vimrc index d28d4e5..03862f6 100644 --- a/.vimrc +++ b/.vimrc @@ -614,6 +614,27 @@ endif "}}}1 if version >= "504" "{{{1 version 5.4 +" 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 @@ -621,7 +642,7 @@ fun! Show_List() "{{{2 if w:iainlist == 0 " No list. return " " - elseif Has_Unicode() + elseif Has_Unicode() if w:iainlist == 1 " Just tabs. return "»" @@ -709,13 +730,34 @@ fun! Show_Alt() "{{{2 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()}%{Show_VirtualEdit()}%{Show_Undo()}%Y%M%R]%{Show_Alt()}\ ' + 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:hexformat='%b' if b:iainhex @@ -864,7 +906,7 @@ fun! Cycle_Signs(resize) "{{{2 " Signs with Type '-' will be highlighted with the MarkLine group. " Signs with Type '.' will be highlighted with the MarkDot group. " Define the Mark where Symbol is not also the mark name, eg "']". - if Has_Unicode() + if Has_Unicode() let g:iainsigns = "Dash:'=’ Dot:..• Quote:\"=” Caret:^.ʌ" else let g:iainsigns = "Dash=' Dot:..* Quote=\" Caret.^" @@ -917,31 +959,10 @@ fun! Cycle_Signs(resize) "{{{2 endif endfun "}}}2 -" 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 - " Change list mode. fun! Cycle_List() "{{{2 " Pretty UTF-8 listchars. - if Has_Unicode() + if Has_Unicode() let basic='tab:»·,trail:…,extends:«,precedes:»' let eol='eol:¶' if version >= "700" @@ -1301,6 +1322,10 @@ if has("autocmd") if has("persistent_undo") au File BufReadPost * call Check_Undo() endif + + if has("cursorbind") + au Display WinEnter * if &diff | se cursorbind | endif + endif endif endif "}}}1 -- 2.7.4