[packages/vim] Up to 9.1.0004

arekm arekm at pld-linux.org
Wed Jan 3 21:00:36 CET 2024


commit 574381bcf268a8c4db9ad0322299fb45181ffd38
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Jan 3 21:00:24 2024 +0100

    Up to 9.1.0004

 javascript.vim |  22 +--
 moria.vim      | 114 ++++++++-------
 vim.spec       |  10 +-
 zenburn.vim    | 454 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 4 files changed, 459 insertions(+), 141 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index a551ae5..b264059 100644
--- a/vim.spec
+++ b/vim.spec
@@ -31,7 +31,7 @@
 # wget ftp://ftp.vim.org/pub/editors/vim/patches/8.0/MD5SUMS -O - | tail -n1 | awk '{print $2}'
 # VCS Commits: https://github.com/vim/vim/commits/master
 
-%define		ver		9.1.0001
+%define		ver		9.1.0004
 %define		rel		1
 Summary:	Vi IMproved - a Vi clone
 Summary(de.UTF-8):	VIsual editor iMproved
@@ -52,25 +52,25 @@ License:	Charityware
 Group:		Applications/Editors/Vim
 #Source0:	ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
 Source0:	https://github.com/vim/vim/archive/v%{ver}.tar.gz
-# Source0-md5:	edb7652906cd7485b630f196e027cafd
+# Source0-md5:	9f41632dc9422fab0a2563ab8de3a01e
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	bc4d1e115ca506ad7751b9bd2b773a7f
 Source2:	http://skawina.eu.org/mikolaj/usr_doc_pl.zip
 # Source2-md5:	ff96284b1c913d55cf0877839b34d490
 Source15:	update-source.sh
 # syntax files
-# http://www.vim.org/scripts/script.php?script_id=1491 (0.7.5)
+# http://www.vim.org/scripts/script.php?script_id=1491 (0.7.7)
 Source20:	javascript.vim
 # http://www.vim.org/scripts/script.php?script_id=447 (20040206)
 Source22:	exim.vim
 # color schemes
-# http://www.vim.org/scripts/script.php?script_id=415 (1.15)
+# http://www.vim.org/scripts/script.php?script_id=415 (2.21)
 Source30:	zenburn.vim
 # http://www.vim.org/scripts/script.php?script_id=92 (1.0)
 Source31:	borland.vim
 # http://www.vim.org/scripts/script.php?script_id=368 (1.2.5)
 Source32:	oceandeep.vim
-# http://www.vim.org/scripts/script.php?script_id=1464 (2.6.3)
+# http://www.vim.org/scripts/script.php?script_id=1464 (2.6.5)
 Source33:	moria.vim
 Patch0:		%{name}-sysconfdir.patch
 
diff --git a/javascript.vim b/javascript.vim
index b08ed53..3ba7fca 100644
--- a/javascript.vim
+++ b/javascript.vim
@@ -1,16 +1,9 @@
 " Vim syntax file
 " Language:     JavaScript
 " Maintainer:   Yi Zhao (ZHAOYI) <zzlinux AT hotmail DOT com>
-" Last Change:  May 17, 2007
-" Version:      0.7.5
-" Changes:      1, Get the vimdiff problem fixed finally. 
-"                Matthew Gallant reported the problem and test the fix. ;)
-"               2, Follow the suggestioin from Ingo Karkat.
-"                The 'foldtext' and 'foldlevel' settings should only be 
-"                changed if the file being edited is pure JavaScript, 
-"                not if JavaScript syntax is embedded inside other syntaxes.
-"               3, Remove function FT_JavaScriptDoc(). 
-"                Since VIM do the better than me. 
+" Last Change:  June 4, 2009
+" Version:      0.7.7
+" Changes:      Add "undefined" as a type keyword
 "
 " TODO:
 "  - Add the HTML syntax inside the JSDoc
@@ -34,7 +27,6 @@ endif
 setlocal iskeyword+=$
 
 syntax sync fromstart
-syntax sync maxlines=200
 
 "" JavaScript comments
 syntax keyword javaScriptCommentTodo    TODO FIXME XXX TBD contained
@@ -66,7 +58,7 @@ syntax case match
 syntax match   javaScriptSpecial        "\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}\|\\."
 syntax region  javaScriptStringD        start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=javaScriptSpecial, at htmlPreproc
 syntax region  javaScriptStringS        start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=javaScriptSpecial, at htmlPreproc
-syntax region  javaScriptRegexpString   start=+/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gim]\{-,3}+ contains=javaScriptSpecial, at htmlPreproc oneline
+syntax region  javaScriptRegexpString   start=+/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gim]\{,3}+ contains=javaScriptSpecial, at htmlPreproc oneline
 syntax match   javaScriptNumber         /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax match   javaScriptFloat          /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 syntax match   javaScriptLabel          /\(?\s*\)\@<!\<\w\+\(\s*:\)\@=/
@@ -76,7 +68,7 @@ syntax keyword javaScriptPrototype      prototype
 
 "" Programm Keywords
 syntax keyword javaScriptSource         import export
-syntax keyword javaScriptType           const this var void yield
+syntax keyword javaScriptType           const this undefined var void yield 
 syntax keyword javaScriptOperator       delete new in instanceof let typeof
 syntax keyword javaScriptBoolean        true false
 syntax keyword javaScriptNull           null
@@ -155,7 +147,9 @@ syntax match   javaScriptParensErrB     contained ")"
 syntax match   javaScriptParensErrC     contained "}"
 
 if main_syntax == "javascript"
-  syntax sync ccomment javaScriptComment
+  syntax sync clear
+  syntax sync ccomment javaScriptComment minlines=200
+  syntax sync match javaScriptHighlight grouphere javaScriptBlock /{/
 endif
 
 "" Fold control
diff --git a/moria.vim b/moria.vim
index 6562cb7..a66bc22 100644
--- a/moria.vim
+++ b/moria.vim
@@ -36,30 +36,33 @@ let colors_name = "moria"
 
 if &background == "dark"
     if s:moria_style == "dark"
-        hi Normal ctermbg=Black ctermfg=LightGray guibg=#202020 guifg=#d0d0d0 gui=none
+        hi Normal ctermbg=0 ctermfg=7 guibg=#202020 guifg=#d0d0d0 gui=none
 
-        hi CursorColumn ctermbg=DarkGray ctermfg=White guibg=#404040 gui=none
-        hi CursorLine ctermbg=DarkGray ctermfg=White guibg=#404040 gui=none
+        hi ColorColumn ctermbg=8 ctermfg=15 guibg=#494949 gui=none
+        hi CursorColumn ctermbg=8 ctermfg=15 guibg=#404040 gui=none
+        hi CursorLine ctermbg=8 ctermfg=15 guibg=#404040 gui=none
     elseif s:moria_style == "black"
-        hi Normal ctermbg=Black ctermfg=LightGray guibg=#000000 guifg=#d0d0d0 gui=none
+        hi Normal ctermbg=0 ctermfg=7 guibg=#000000 guifg=#d0d0d0 gui=none
 
-        hi CursorColumn ctermbg=DarkGray ctermfg=White guibg=#3a3a3a gui=none
-        hi CursorLine ctermbg=DarkGray ctermfg=White guibg=#3a3a3a gui=none
+        hi ColorColumn ctermbg=8 ctermfg=15 guibg=#444444 gui=none
+        hi CursorColumn ctermbg=8 ctermfg=15 guibg=#3a3a3a gui=none
+        hi CursorLine ctermbg=8 ctermfg=15 guibg=#3a3a3a gui=none
     endif
     if s:moria_monochrome == 1
         hi FoldColumn ctermbg=bg guibg=bg guifg=#a0a0a0 gui=none
+        hi CursorLineNr guifg=#a0a0a0 gui=bold
         hi LineNr guifg=#a0a0a0 gui=none
         hi MoreMsg guibg=bg guifg=#b6b6b6 gui=bold
-        hi NonText ctermfg=DarkGray guibg=bg guifg=#a0a0a0 gui=bold
+        hi NonText ctermfg=8 guibg=bg guifg=#a0a0a0 gui=bold
         hi Pmenu guibg=#909090 guifg=#000000 gui=none
         hi PmenuSbar guibg=#707070 guifg=fg gui=none
         hi PmenuThumb guibg=#d0d0d0 guifg=bg gui=none
         hi SignColumn ctermbg=bg guibg=bg guifg=#a0a0a0 gui=none
-        hi StatusLine ctermbg=LightGray ctermfg=Black guibg=#4c4c4c guifg=fg gui=bold
-        hi StatusLineNC ctermbg=DarkGray ctermfg=Black guibg=#404040 guifg=fg gui=none
+        hi StatusLine ctermbg=7 ctermfg=0 guibg=#4c4c4c guifg=fg gui=bold
+        hi StatusLineNC ctermbg=8 ctermfg=0 guibg=#404040 guifg=fg gui=none
         hi TabLine guibg=#6e6e6e guifg=fg gui=underline
         hi TabLineFill guibg=#6e6e6e guifg=fg gui=underline
-        hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#404040 guifg=fg gui=none
+        hi VertSplit ctermbg=7 ctermfg=0 guibg=#404040 guifg=fg gui=none
         if s:moria_fontface == "mixed"
             hi Folded guibg=#4e4e4e guifg=#c0c0c0 gui=bold
         else
@@ -67,18 +70,19 @@ if &background == "dark"
         endif            
     else
         hi FoldColumn ctermbg=bg guibg=bg guifg=#8fa5d1 gui=none
+        hi CursorLineNr guifg=#8fa5d1 gui=bold
         hi LineNr guifg=#8fa5d1 gui=none
         hi MoreMsg guibg=bg guifg=#97abd5 gui=bold
-        hi NonText ctermfg=DarkGray guibg=bg guifg=#8fa5d1 gui=bold
+        hi NonText ctermfg=8 guibg=bg guifg=#8fa5d1 gui=bold
         hi Pmenu guibg=#6381be guifg=#000000 gui=none
         hi PmenuSbar guibg=#41609e guifg=fg gui=none
         hi PmenuThumb guibg=#bdcae3 guifg=bg gui=none
         hi SignColumn ctermbg=bg guibg=bg guifg=#8fa5d1 gui=none
-        hi StatusLine ctermbg=LightGray ctermfg=Black guibg=#334b7d guifg=fg gui=bold
-        hi StatusLineNC ctermbg=DarkGray ctermfg=Black guibg=#25365a guifg=fg gui=none
+        hi StatusLine ctermbg=7 ctermfg=0 guibg=#334b7d guifg=fg gui=bold
+        hi StatusLineNC ctermbg=8 ctermfg=0 guibg=#25365a guifg=fg gui=none
         hi TabLine guibg=#41609e guifg=fg gui=underline
         hi TabLineFill guibg=#41609e guifg=fg gui=underline
-        hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#25365a guifg=fg gui=none
+        hi VertSplit ctermbg=7 ctermfg=0 guibg=#25365a guifg=fg gui=none
         if s:moria_fontface == "mixed"
             hi Folded guibg=#4e4e4e guifg=#bdcae3 gui=bold
         else
@@ -105,13 +109,13 @@ if &background == "dark"
         hi SpellRare guisp=#ee2cee gui=undercurl
     endif
     hi TabLineSel guibg=bg guifg=fg gui=bold
-    hi Title ctermbg=Black ctermfg=White guifg=fg gui=bold
+    hi Title ctermbg=0 ctermfg=15 guifg=fg gui=bold
     if version >= 700
-        hi Visual ctermbg=LightGray ctermfg=Black guibg=#606060 gui=none
+        hi Visual ctermbg=7 ctermfg=0 guibg=#606060 gui=none
     else
-        hi Visual ctermbg=LightGray ctermfg=Black guibg=#606060 guifg=fg gui=none
+        hi Visual ctermbg=7 ctermfg=0 guibg=#606060 guifg=fg gui=none
     endif
-    hi VisualNOS ctermbg=DarkGray ctermfg=Black guibg=bg guifg=#a0a0a0 gui=bold,underline
+    hi VisualNOS ctermbg=8 ctermfg=0 guibg=bg guifg=#a0a0a0 gui=bold,underline
     hi WarningMsg guibg=bg guifg=#ee2c2c gui=bold
     hi WildMenu guibg=#e0e000 guifg=#000000 gui=bold
 
@@ -125,7 +129,7 @@ if &background == "dark"
     hi PreProc guibg=bg guifg=#d7a0d7 gui=none
     hi Special guibg=bg guifg=#e8b87e gui=none
     hi Todo guibg=#e0e000 guifg=#000000 gui=none
-    hi Underlined ctermbg=Black ctermfg=White guibg=bg guifg=#00a0ff gui=underline    
+    hi Underlined ctermbg=0 ctermfg=15 guibg=bg guifg=#00a0ff gui=underline    
 
     if s:moria_fontface == "mixed"
         hi Statement guibg=bg guifg=#7ec0ee gui=bold
@@ -135,55 +139,59 @@ if &background == "dark"
         hi Type guibg=bg guifg=#f09479 gui=none
     endif
 
-    hi htmlBold ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold
-    hi htmlBoldItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold,italic
-    hi htmlBoldUnderline ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold,underline
-    hi htmlBoldUnderlineItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold,underline,italic
-    hi htmlItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=italic
-    hi htmlUnderline ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=underline
-    hi htmlUnderlineItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=underline,italic
+    hi htmlBold ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold
+    hi htmlBoldItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,italic
+    hi htmlBoldUnderline ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,underline
+    hi htmlBoldUnderlineItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,underline,italic
+    hi htmlItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=italic
+    hi htmlUnderline ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=underline
+    hi htmlUnderlineItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=underline,italic
 elseif &background == "light"
     if s:moria_style == "light"
-        hi Normal ctermbg=White ctermfg=Black guibg=#f0f0f0 guifg=#000000 gui=none
+        hi Normal ctermbg=15 ctermfg=0 guibg=#f0f0f0 guifg=#000000 gui=none
 
-        hi CursorColumn ctermbg=LightGray ctermfg=Black guibg=#d8d8d8 gui=none
-        hi CursorLine ctermbg=LightGray ctermfg=Black guibg=#d8d8d8 gui=none
+        hi ColorColumn ctermbg=7 ctermfg=0 guibg=#d3d3d3 gui=none
+        hi CursorColumn ctermbg=7 ctermfg=0 guibg=#d8d8d8 gui=none
+        hi CursorLine ctermbg=7 ctermfg=0 guibg=#d8d8d8 gui=none
     elseif s:moria_style == "white"
-        hi Normal ctermbg=White ctermfg=Black guibg=#ffffff guifg=#000000 gui=none
+        hi Normal ctermbg=15 ctermfg=0 guibg=#ffffff guifg=#000000 gui=none
 
-        hi CursorColumn ctermbg=LightGray ctermfg=Black guibg=#dfdfdf gui=none
-        hi CursorLine ctermbg=LightGray ctermfg=Black guibg=#dfdfdf gui=none
+        hi ColorColumn ctermbg=7 ctermfg=0 guibg=#d7d7d7 gui=none
+        hi CursorColumn ctermbg=7 ctermfg=0 guibg=#dfdfdf gui=none
+        hi CursorLine ctermbg=7 ctermfg=0 guibg=#dfdfdf gui=none
     endif
     if s:moria_monochrome == 1
         hi FoldColumn ctermbg=bg guibg=bg guifg=#7a7a7a gui=none
         hi Folded guibg=#cfcfcf guifg=#404040 gui=bold
+        hi CursorLineNr guifg=#7a7a7a gui=bold
         hi LineNr guifg=#7a7a7a gui=none
         hi MoreMsg guibg=bg guifg=#505050 gui=bold
-        hi NonText ctermfg=DarkGray guibg=bg guifg=#7a7a7a gui=bold
+        hi NonText ctermfg=8 guibg=bg guifg=#7a7a7a gui=bold
         hi Pmenu guibg=#9a9a9a guifg=#000000 gui=none
         hi PmenuSbar guibg=#808080 guifg=fg gui=none
         hi PmenuThumb guibg=#c0c0c0 guifg=fg gui=none
         hi SignColumn ctermbg=bg guibg=bg guifg=#7a7a7a gui=none
-        hi StatusLine ctermbg=Black ctermfg=White guibg=#a0a0a0 guifg=fg gui=bold
-        hi StatusLineNC ctermbg=LightGray ctermfg=Black guibg=#b0b0b0 guifg=fg gui=none
+        hi StatusLine ctermbg=0 ctermfg=15 guibg=#a0a0a0 guifg=fg gui=bold
+        hi StatusLineNC ctermbg=7 ctermfg=0 guibg=#b0b0b0 guifg=fg gui=none
         hi TabLine guibg=#cdcdcd guifg=fg gui=underline
         hi TabLineFill guibg=#cdcdcd guifg=fg gui=underline
-        hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#b0b0b0 guifg=fg gui=none
+        hi VertSplit ctermbg=7 ctermfg=0 guibg=#b0b0b0 guifg=fg gui=none
     else
         hi FoldColumn ctermbg=bg guibg=bg guifg=#375288 gui=none
         hi Folded guibg=#cfcfcf guifg=#25365a gui=bold
+        hi CursorLineNr guifg=#375288 gui=bold
         hi LineNr guifg=#375288 gui=none
         hi MoreMsg guibg=bg guifg=#2f4471 gui=bold
-        hi NonText ctermfg=DarkGray guibg=bg guifg=#375288 gui=bold
+        hi NonText ctermfg=8 guibg=bg guifg=#375288 gui=bold
         hi Pmenu guibg=#708bc5 guifg=#000000 gui=none
         hi PmenuSbar guibg=#4a6db5 guifg=fg gui=none
         hi PmenuThumb guibg=#a6b7db guifg=fg gui=none
         hi SignColumn ctermbg=bg guibg=bg guifg=#375288 gui=none
-        hi StatusLine ctermbg=Black ctermfg=White guibg=#8fa5d1 guifg=fg gui=bold
-        hi StatusLineNC ctermbg=LightGray ctermfg=Black guibg=#a6b7db guifg=fg gui=none
+        hi StatusLine ctermbg=0 ctermfg=15 guibg=#8fa5d1 guifg=fg gui=bold
+        hi StatusLineNC ctermbg=7 ctermfg=0 guibg=#a6b7db guifg=fg gui=none
         hi TabLine guibg=#b8c6e2 guifg=fg gui=underline
         hi TabLineFill guibg=#b8c6e2 guifg=fg gui=underline
-        hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#a6b7db guifg=fg gui=none
+        hi VertSplit ctermbg=7 ctermfg=0 guibg=#a6b7db guifg=fg gui=none
     endif
     hi Cursor guibg=#883400 guifg=bg gui=none
     hi DiffAdd guibg=#008b00 guifg=#ffffff gui=none
@@ -193,7 +201,7 @@ elseif &background == "light"
     hi Directory guibg=bg guifg=#0000f0 gui=none
     hi ErrorMsg guibg=#ee2c2c guifg=#ffffff gui=bold
     hi IncSearch guibg=#ffcd78 gui=none
-    hi ModeMsg ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold
+    hi ModeMsg ctermbg=15 ctermfg=0 guibg=bg guifg=fg gui=bold
     hi PmenuSel guibg=#ffff00 guifg=#000000 gui=none
     hi Question guibg=bg guifg=#813f11 gui=bold
     hi Search guibg=#a0f0a0 gui=none
@@ -207,11 +215,11 @@ elseif &background == "light"
     hi TabLineSel guibg=bg guifg=fg gui=bold
     hi Title guifg=fg gui=bold
     if version >= 700
-        hi Visual ctermbg=LightGray ctermfg=Black guibg=#c4c4c4 gui=none
+        hi Visual ctermbg=7 ctermfg=0 guibg=#c4c4c4 gui=none
     else
-        hi Visual ctermbg=LightGray ctermfg=Black guibg=#c4c4c4 guifg=fg gui=none
+        hi Visual ctermbg=7 ctermfg=0 guibg=#c4c4c4 guifg=fg gui=none
     endif    
-    hi VisualNOS ctermbg=DarkGray ctermfg=Black guibg=bg guifg=#a0a0a0 gui=bold,underline
+    hi VisualNOS ctermbg=8 ctermfg=0 guibg=bg guifg=#a0a0a0 gui=bold,underline
     hi WarningMsg guibg=bg guifg=#ee2c2c gui=bold
     hi WildMenu guibg=#ffff00 guifg=fg gui=bold
 
@@ -227,15 +235,15 @@ elseif &background == "light"
     hi Statement guibg=bg guifg=#1f3f81 gui=bold
     hi Todo guibg=#ffff00 guifg=fg gui=none
     hi Type guibg=bg guifg=#912f11 gui=bold
-    hi Underlined ctermbg=White ctermfg=Black guibg=bg guifg=#0000cd gui=underline
-
-    hi htmlBold ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold
-    hi htmlBoldItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold,italic
-    hi htmlBoldUnderline ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold,underline
-    hi htmlBoldUnderlineItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold,underline,italic
-    hi htmlItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=italic
-    hi htmlUnderline ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=underline
-    hi htmlUnderlineItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=underline,italic
+    hi Underlined ctermbg=15 ctermfg=0 guibg=bg guifg=#0000cd gui=underline
+
+    hi htmlBold ctermbg=15 ctermfg=0 guibg=bg guifg=fg gui=bold
+    hi htmlBoldItalic ctermbg=15 ctermfg=0 guibg=bg guifg=fg gui=bold,italic
+    hi htmlBoldUnderline ctermbg=15 ctermfg=0 guibg=bg guifg=fg gui=bold,underline
+    hi htmlBoldUnderlineItalic ctermbg=15 ctermfg=0 guibg=bg guifg=fg gui=bold,underline,italic
+    hi htmlItalic ctermbg=15 ctermfg=0 guibg=bg guifg=fg gui=italic
+    hi htmlUnderline ctermbg=15 ctermfg=0 guibg=bg guifg=fg gui=underline
+    hi htmlUnderlineItalic ctermbg=15 ctermfg=0 guibg=bg guifg=fg gui=underline,italic
 endif
 
 hi! default link bbcodeBold htmlBold
diff --git a/zenburn.vim b/zenburn.vim
index af3f603..1f4acee 100644
--- a/zenburn.vim
+++ b/zenburn.vim
@@ -1,70 +1,195 @@
 " Vim color file
-" Maintainer:   Jani Nurminen <jani.nurminen at pp4.inet.fi>
-" Last Change:  $Id$
-" URL:      	http://slinky.imukuppi.org/zenburn/
-" License:      GPL
+" Maintainer:   Jani Nurminen <slinky at iki.fi>
+" Last Change:  $Id: zenburn.vim,v 2.21 2011/04/26 12:13:41 slinky Exp slinky $
+" URL:          http://slinky.imukuppi.org/zenburnpage/
+" License:      GNU GPL <http://www.gnu.org/licenses/gpl.html>
 "
 " Nothing too fancy, just some alien fruit salad to keep you in the zone.
-" This syntax file was designed to be used with dark environments and 
+" This syntax file was designed to be used with dark environments and
 " low light situations. Of course, if it works during a daybright office, go
 " ahead :)
 "
 " Owes heavily to other Vim color files! With special mentions
 " to "BlackDust", "Camo" and "Desert".
 "
-" To install, copy to ~/.vim/colors directory. Then :colorscheme zenburn.  
+" To install, copy to ~/.vim/colors directory.
+"
+" Alternatively, you can use Vimball installation:
+"     vim zenburn.vba
+"     :so %
+"     :q
+"
+" For details, see :help vimball
+"
+" After installation, use it with :colorscheme zenburn.
 " See also :help syntax
 "
 " Credits:
-"  - Jani Nurminen - original Zenburn
+"  - Jani Nurminen - original Zenburn, maintainer
 "  - Steve Hall & Cream posse - higher-contrast Visual selection
 "  - Kurt Maier - 256 color console coloring, low and high contrast toggle,
 "                 bug fixing
+"  - Charlie - spotted too bright StatusLine in non-high contrast mode
+"  - Pablo Castellazzi - CursorLine fix for 256 color mode
+"  - Tim Smith - force dark background
+"  - John Gabriele - spotted bad Ignore-group handling
+"  - Zac Thompson - spotted invisible NonText in low contrast mode
+"  - Christophe-Marie Duquesne - suggested making a Vimball,
+"    suggested support for ctags_highlighting.vim
+"  - Andrew Wagner - noted the CursorColumn bug (guifg was unintentionally set),
+"                    unify CursorColumn colour
+"  - Martin Langasek - clarify the license, whitespace fixes
+"  - Marcin Szamotulski - support autocomplete for Zenburn configuration
+"                         parameters
+"  - Clayton Parker (claytron) - Convinced by Kurt Maier to use Zenburn. Point
+"    out issues with LineNr, fix directory styles, and their usage in MacVim.
+"  - Paweł Piekarski - Spotted bad FoldColumn and TabLine. Made better 
+"                      FoldColumn colors, fixed TabLine colors.
 "
 " CONFIGURABLE PARAMETERS:
-" 
+"
 " You can use the default (don't set any parameters), or you can
 " set some parameters to tweak the Zenburn colours.
 "
+" To use them, put them into your .vimrc file before loading the color scheme,
+" example:
+"    let g:zenburn_high_Contrast=1
+"    colors zenburn
+"
+" You can also do ":let g:zenburn" then hit Ctrl-d or Tab to scroll through the
+" list of configurable parameters.
+"
 " * You can now set a darker background for bright environments. To activate, use:
 "   contrast Zenburn, use:
 "
 "      let g:zenburn_high_Contrast = 1
 "
+" * For example, Vim help files uses the Ignore-group for the pipes in tags
+"   like "|somelink.txt|". By default, the pipes are not visible, as they
+"   map to Ignore group. If you wish to enable coloring of the Ignore group,
+"   set the following parameter to 1. Warning, it might make some syntax files
+"   look strange.
+"
+"      let g:zenburn_color_also_Ignore = 1
+"
 " * To get more contrast to the Visual selection, use
-"   
+"
 "      let g:zenburn_alternate_Visual = 1
-" 
+"
+"   Note: this is enabled only if the old-style Visual
+"   if used, see g:zenburn_old_Visual
+"
 " * To use alternate colouring for Error message, use
-"     
+"
 "      let g:zenburn_alternate_Error = 1
 "
 " * The new default for Include is a duller orange. To use the original
 "   colouring for Include, use
-"     
+"
 "      let g:zenburn_alternate_Include = 1
 "
-" * To turn the parameter(s) back to defaults, use UNLET:
+" * Work-around to a Vim bug, it seems to misinterpret ctermfg and 234 and 237
+"   as light values, and sets background to light for some people. If you have
+"   this problem, use:
+"
+"      let g:zenburn_force_dark_Background = 1
+"
+" * By default the CursorColumn is of a lighter colour. I find it more readable
+"   that way, but some people may want to align it with the darker CursorLine
+"   color, for visual uniformity. To do so, use:
+"
+"      let g:zenburn_unified_CursorColumn = 1
+"
+"   Note: you can ignore this unless you use
+"   ":set cursorline cursorcolumn", since otherwise the effect won't be
+"   seen.
+"
+" * New (dark) Visual coloring has been introduced.
+"   The dark Visual is more aligned with the rest of the colour scheme,
+"   especially if you use line numbers. If you wish to use the 
+"   old Visual coloring, use
+"
+"      let g:zenburn_old_Visual = 1
+"
+"   Default is to use the new Visual.
+"
+"  * EXPERIMENTAL FEATURE: Zenburn will automatically detect if you 
+"    have ctags_highlighting.vim (by Al Budden, 
+"    http://www.vim.org/scripts/script.php?script_id=2646) enabled, and
+"    will set sensible highlight links. Nothing will happen if you do
+"    not have ctags_highlighting.vim. If you do not want this feature, you can
+"    override the check with:
+"
+"    let g:zenburn_disable_ctags_highlighting_support = 1
+"
+" NOTE:
+"
+" * To turn the parameter(s) back to defaults, use UNLET or set them to 0:
 "
 "      unlet g:zenburn_alternate_Include
+"   or 
+"      let g:zenburn_alternate_Include = 0
 "
-"   Setting to 0 won't work!
 "
 " That's it, enjoy!
-" 
+"
 " TODO
 "   - Visual alternate color is broken? Try GVim >= 7.0.66 if you have trouble
 "   - IME colouring (CursorIM)
-"   - obscure syntax groups: check and colourize
-"   - add more groups if necessary
+
+" Set defaults, but keep any parameters already set by the user
+if ! exists("g:zenburn_high_Contrast")
+    let g:zenburn_high_Contrast = 0
+endif
+
+if ! exists("g:zenburn_color_also_Ignore")
+    let g:zenburn_color_also_Ignore = 0
+endif
+
+if ! exists("g:zenburn_alternate_Error")
+    let g:zenburn_alternate_Error = 0
+endif
+
+if ! exists("g:zenburn_force_dark_Background")
+    let g:zenburn_force_dark_Background = 0
+endif
+
+if ! exists("g:zenburn_alternate_Visual")
+    let g:zenburn_alternate_Visual = 0
+endif
+
+if ! exists("g:zenburn_alternate_Include")
+    let g:zenburn_alternate_Include = 0
+endif
+
+if ! exists("g:zenburn_unified_CursorColumn")
+    let g:zenburn_unified_CursorColumn = 0
+endif
+
+if ! exists("g:zenburn_old_Visual")
+    let g:zenburn_old_Visual = 0
+endif
+
+if ! exists("g:zenburn_disable_ctags_highlighting_support")
+    " enabled by default
+    let g:zenburn_disable_ctags_highlighting_support = 0
+endif
+
+" -----------------------------------------------
 
 set background=dark
-hi clear          
+hi clear
 if exists("syntax_on")
     syntax reset
 endif
 let g:colors_name="zenburn"
 
+" check for ctags-highlighting
+if exists("g:loaded_ctags_highlighting") && g:loaded_ctags_highlighting && ! g:zenburn_disable_ctags_highlighting_support
+    " internal
+    let _zenburn_ctags = 1
+endif
+
 hi Boolean         guifg=#dca3a3
 hi Character       guifg=#dca3a3 gui=bold
 hi Comment         guifg=#7f9f7f gui=italic
@@ -78,7 +203,7 @@ hi DiffAdd         guifg=#709080 guibg=#313c36 gui=bold
 hi DiffChange      guibg=#333333
 hi DiffDelete      guifg=#333333 guibg=#464646
 hi DiffText        guifg=#ecbcbc guibg=#41363c gui=bold
-hi Directory       guifg=#dcdccc gui=bold
+hi Directory       guifg=#9fafaf gui=bold
 hi ErrorMsg        guifg=#80d4aa guibg=#2f2f2f gui=bold
 hi Exception       guifg=#c3bf9f gui=bold
 hi Float           guifg=#c0bed1
@@ -89,11 +214,9 @@ hi Identifier      guifg=#efdcbc
 hi IncSearch       guibg=#f8f893 guifg=#385f38
 hi Keyword         guifg=#f0dfaf gui=bold
 hi Label           guifg=#dfcfaf gui=underline
-hi LineNr          guifg=#9fafaf guibg=#262626
 hi Macro           guifg=#ffcfaf gui=bold
 hi ModeMsg         guifg=#ffcfaf gui=none
 hi MoreMsg         guifg=#ffffff gui=bold
-hi NonText         guifg=#404040
 hi Number          guifg=#8cd0d3
 hi Operator        guifg=#f0efd0
 hi PreCondit       guifg=#dfaf8f gui=bold
@@ -106,7 +229,7 @@ hi SpecialComment  guifg=#82a282 gui=bold
 hi Special         guifg=#cfbfaf
 hi SpecialKey      guifg=#9ece9e
 hi Statement       guifg=#e3ceab gui=none
-hi StatusLine      guifg=#2e4340 guibg=#ccdc90
+hi StatusLine      guifg=#313633 guibg=#ccdc90
 hi StatusLineNC    guifg=#2e3330 guibg=#88b090
 hi StorageClass    guifg=#c3bf9f gui=bold
 hi String          guifg=#cc9393
@@ -117,58 +240,60 @@ hi Todo            guifg=#dfdfdf guibg=bg gui=bold
 hi Typedef         guifg=#dfe4cf gui=bold
 hi Type            guifg=#dfdfbf gui=bold
 hi Underlined      guifg=#dcdccc gui=underline
-hi VertSplit       guifg=#303030 guibg=#688060
+hi VertSplit       guifg=#2e3330 guibg=#688060
 hi VisualNOS       guifg=#333333 guibg=#f18c96 gui=bold,underline
 hi WarningMsg      guifg=#ffffff guibg=#333333 gui=bold
 hi WildMenu        guibg=#2c302d guifg=#cbecd0 gui=underline
 
+hi SpellBad   guisp=#bc6c4c guifg=#dc8c6c
+hi SpellCap   guisp=#6c6c9c guifg=#8c8cbc
+hi SpellRare  guisp=#bc6c9c guifg=#bc8cbc
+hi SpellLocal guisp=#7cac7c guifg=#9ccc9c
+
 " Entering Kurt zone
 if &t_Co > 255
-    hi Boolean         ctermfg=181  
+    hi Boolean         ctermfg=181
     hi Character       ctermfg=181   cterm=bold
-    hi Comment         ctermfg=108   
+    hi Comment         ctermfg=108
     hi Conditional     ctermfg=223   cterm=bold
     hi Constant        ctermfg=181   cterm=bold
     hi Cursor          ctermfg=233   ctermbg=109     cterm=bold
     hi Debug           ctermfg=181   cterm=bold
     hi Define          ctermfg=223   cterm=bold
-    hi Delimiter       ctermfg=245  
+    hi Delimiter       ctermfg=245
     hi DiffAdd         ctermfg=66    ctermbg=237     cterm=bold
-    hi DiffChange      ctermbg=236  
-    hi DiffDelete      ctermfg=236   ctermbg=238    
+    hi DiffChange      ctermbg=236
+    hi DiffDelete      ctermfg=236   ctermbg=238
     hi DiffText        ctermfg=217   ctermbg=237     cterm=bold
-    hi Directory       ctermfg=188   cterm=bold
+    hi Directory       ctermfg=109   cterm=bold
     hi ErrorMsg        ctermfg=115   ctermbg=236     cterm=bold
     hi Exception       ctermfg=249   cterm=bold
-    hi Float           ctermfg=251  
-    hi FoldColumn      ctermfg=109   ctermbg=238    
-    hi Folded          ctermfg=109   ctermbg=238    
-    hi Function        ctermfg=228  
-    hi Identifier      ctermfg=223  
-    hi IncSearch       ctermbg=228   ctermfg=238    
+    hi Float           ctermfg=251
+    hi Function        ctermfg=228
+    hi Identifier      ctermfg=223
+    hi IncSearch       ctermbg=228   ctermfg=238
     hi Keyword         ctermfg=223   cterm=bold
     hi Label           ctermfg=187   cterm=underline
-    hi LineNr          ctermfg=248   ctermbg=235    
+    hi LineNr          ctermfg=248   ctermbg=233
     hi Macro           ctermfg=223   cterm=bold
     hi ModeMsg         ctermfg=223   cterm=none
     hi MoreMsg         ctermfg=15    cterm=bold
-    hi NonText         ctermfg=238  
-    hi Number          ctermfg=116  
-    hi Operator        ctermfg=230  
+    hi Number          ctermfg=116
+    hi Operator        ctermfg=230
     hi PreCondit       ctermfg=180   cterm=bold
     hi PreProc         ctermfg=223   cterm=bold
     hi Question        ctermfg=15    cterm=bold
     hi Repeat          ctermfg=223   cterm=bold
-    hi Search          ctermfg=230   ctermbg=236    
+    hi Search          ctermfg=230   ctermbg=236
     hi SpecialChar     ctermfg=181   cterm=bold
     hi SpecialComment  ctermfg=108   cterm=bold
-    hi Special         ctermfg=181  
-    hi SpecialKey      ctermfg=151  
+    hi Special         ctermfg=181
+    hi SpecialKey      ctermfg=151
     hi Statement       ctermfg=187   ctermbg=234     cterm=none
-    hi StatusLine      ctermfg=237   ctermbg=186    
-    hi StatusLineNC    ctermfg=236   ctermbg=108    
+    hi StatusLine      ctermfg=236   ctermbg=186
+    hi StatusLineNC    ctermfg=235   ctermbg=108
     hi StorageClass    ctermfg=249   cterm=bold
-    hi String          ctermfg=174  
+    hi String          ctermfg=174
     hi Structure       ctermfg=229   cterm=bold
     hi Tag             ctermfg=181   cterm=bold
     hi Title           ctermfg=7     ctermbg=234     cterm=bold
@@ -176,12 +301,37 @@ if &t_Co > 255
     hi Typedef         ctermfg=253   cterm=bold
     hi Type            ctermfg=187   cterm=bold
     hi Underlined      ctermfg=188   ctermbg=234     cterm=bold
-    hi VertSplit       ctermfg=236   ctermbg=65 
+    hi VertSplit       ctermfg=236   ctermbg=65
     hi VisualNOS       ctermfg=236   ctermbg=210     cterm=bold
     hi WarningMsg      ctermfg=15    ctermbg=236     cterm=bold
     hi WildMenu        ctermbg=236   ctermfg=194     cterm=bold
-    if exists("g:zenburn_high_Contrast")
+
+    " spellchecking, always "bright" background
+    hi SpellLocal ctermfg=14  ctermbg=237
+    hi SpellBad   ctermfg=9   ctermbg=237
+    hi SpellCap   ctermfg=12  ctermbg=237
+    hi SpellRare  ctermfg=13  ctermbg=237
+
+    " pmenu
+    hi PMenu      ctermfg=248  ctermbg=0
+    hi PMenuSel   ctermfg=223 ctermbg=235
+
+    if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
         hi Normal ctermfg=188 ctermbg=234
+        hi NonText         ctermfg=238
+
+        if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
+            hi Ignore          ctermfg=238
+        endif
+
+        " hc mode, darker CursorLine, default 236
+        hi CursorLine      ctermbg=233   cterm=none
+
+        if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
+            hi CursorColumn      ctermbg=233   cterm=none
+        else
+            hi CursorColumn      ctermbg=235   cterm=none
+        endif
     else
         hi Normal ctermfg=188 ctermbg=237
         hi Cursor          ctermbg=109
@@ -189,10 +339,8 @@ if &t_Co > 255
         hi diffdelete      ctermbg=238
         hi difftext        ctermbg=237
         hi errormsg        ctermbg=237
-        hi foldcolumn      ctermbg=238
-        hi folded          ctermbg=238
         hi incsearch       ctermbg=228
-        hi linenr          ctermbg=238  
+        hi linenr          ctermbg=235
         hi search          ctermbg=238
         hi statement       ctermbg=237
         hi statusline      ctermbg=144
@@ -200,46 +348,214 @@ if &t_Co > 255
         hi title           ctermbg=237
         hi todo            ctermbg=237
         hi underlined      ctermbg=237
-        hi vertsplit       ctermbg=65 
+        hi vertsplit       ctermbg=65
         hi visualnos       ctermbg=210
         hi warningmsg      ctermbg=236
         hi wildmenu        ctermbg=236
+        hi NonText         ctermfg=240
+
+        if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
+            hi Ignore          ctermfg=240
+        endif
+        
+        " normal mode, lighter CursorLine
+        hi CursorLine      ctermbg=238   cterm=none
+
+        if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
+            hi CursorColumn      ctermbg=238   cterm=none
+        else
+            hi CursorColumn      ctermbg=239   cterm=none
+        endif
+    endif
+
+    if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error
+        " use more jumpy Error
+        hi Error ctermfg=210 ctermbg=52 gui=bold
+    else
+        " default is something more zenburn-compatible
+        hi Error ctermfg=228 ctermbg=95 gui=bold
     endif
 endif
 
+if exists("g:zenburn_force_dark_Background") && g:zenburn_force_dark_Background
+    " Force dark background, because of a bug in VIM:  VIM sets background
+    " automatically during "hi Normal ctermfg=X"; it misinterprets the high
+    " value (234 or 237 above) as a light color, and wrongly sets background to
+    " light.  See ":help highlight" for details.
+    set background=dark
+endif
 
-if exists("g:zenburn_high_Contrast")
+if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
     " use new darker background
     hi Normal          guifg=#dcdccc guibg=#1f1f1f
+    hi CursorLine      guibg=#121212 gui=bold
+    if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
+        hi CursorColumn    guibg=#121212 gui=bold
+    else
+        hi CursorColumn    guibg=#2b2b2b
+    endif
+    hi Pmenu           guibg=#242424 guifg=#ccccbc
+    hi PMenuSel        guibg=#353a37 guifg=#ccdc90 gui=bold
+    hi PmenuSbar       guibg=#2e3330 guifg=#000000
+    hi PMenuThumb      guibg=#a0afa0 guifg=#040404
+    hi MatchParen      guifg=#f0f0c0 guibg=#383838 gui=bold
+    hi SignColumn      guifg=#9fafaf guibg=#181818 gui=bold
+    hi TabLineFill     guifg=#cfcfaf guibg=#181818 gui=bold
+    hi TabLineSel      guifg=#efefef guibg=#1c1c1b gui=bold
+    hi TabLine         guifg=#b6bf98 guibg=#181818 gui=bold
+    hi NonText         guifg=#404040 gui=bold
+    
+    hi LineNr          guifg=#9fafaf guibg=#161616
 else
     " Original, lighter background
     hi Normal          guifg=#dcdccc guibg=#3f3f3f
+    hi CursorLine      guibg=#434443
+    if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
+        hi CursorColumn    guibg=#434343
+    else
+        hi CursorColumn    guibg=#4f4f4f
+    endif
+    hi Pmenu           guibg=#2c2e2e guifg=#9f9f9f
+    hi PMenuSel        guibg=#242424 guifg=#d0d0a0 gui=bold
+    hi PmenuSbar       guibg=#2e3330 guifg=#000000
+    hi PMenuThumb      guibg=#a0afa0 guifg=#040404
+    hi MatchParen      guifg=#b2b2a0 guibg=#2e2e2e gui=bold
+    hi SignColumn      guifg=#9fafaf guibg=#343434 gui=bold
+    hi TabLineFill     guifg=#cfcfaf guibg=#353535 gui=bold
+    hi TabLineSel      guifg=#efefef guibg=#3a3a39 gui=bold
+    hi TabLine         guifg=#b6bf98 guibg=#353535 gui=bold
+    hi NonText         guifg=#5b605e gui=bold
+    
+    hi LineNr          guifg=#9fafaf guibg=#262626
 endif
 
-if exists("g:zenburn_alternate_Visual")
-    " Visual with more contrast, thanks to Steve Hall & Cream posse
-    " gui=none fixes weird highlight problem in at least GVim 7.0.66, thanks to Kurt Maier
-    hi Visual          guifg=#000000 guibg=#71d3b4 gui=none
-    hi VisualNOS       guifg=#000000 guibg=#71d3b4 gui=none
+if exists("g:zenburn_old_Visual") && g:zenburn_old_Visual
+    if exists("g:zenburn_alternate_Visual") && g:zenburn_alternate_Visual
+        " Visual with more contrast, thanks to Steve Hall & Cream posse
+        " gui=none fixes weird highlight problem in at least GVim 7.0.66, thanks to Kurt Maier
+        hi Visual          guifg=#000000 guibg=#71d3b4 gui=none
+        hi VisualNOS       guifg=#000000 guibg=#71d3b4 gui=none
+    else
+        " use default visual
+        hi Visual          guifg=#233323 guibg=#71d3b4 gui=none
+        hi VisualNOS       guifg=#233323 guibg=#71d3b4 gui=none
+    endif
 else
-    " use default visual
-    hi Visual          guifg=#233323 guibg=#71d3b4 gui=none
-    hi VisualNOS       guifg=#233323 guibg=#71d3b4 gui=none
+    " new Visual style
+    if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
+        " high contrast
+        "hi Visual        guibg=#304a3d
+        "hi VisualNos     guibg=#304a3d
+        "TODO no nice greenish in console, 65 is closest. use full black instead,
+        "although i like the green..!
+        hi Visual        guibg=#0f0f0f
+        hi VisualNos     guibg=#0f0f0f
+        if &t_Co > 255
+            hi Visual ctermbg=0
+        endif
+    else
+        " low contrast
+        hi Visual        guibg=#2f2f2f
+        hi VisualNOS     guibg=#2f2f2f
+
+        if &t_Co > 255
+            hi Visual    ctermbg=235
+            hi VisualNOS ctermbg=235
+        endif
+    endif
 endif
 
-if exists("g:zenburn_alternate_Error")
-    " use a bit different Error
-    hi Error           guifg=#ef9f9f guibg=#201010 gui=bold  
+if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error
+    " use more jumpy Error
+    hi Error        guifg=#e37170 guibg=#664040 gui=bold
 else
-    " default
-    hi Error           guifg=#e37170 guibg=#332323 gui=none
+    " default is something more zenburn-compatible
+    hi Error        guifg=#e37170 guibg=#3d3535 gui=none
 endif
 
-if exists("g:zenburn_alternate_Include")
+if exists("g:zenburn_alternate_Include") && g:zenburn_alternate_Include
     " original setting
-    hi Include         guifg=#ffcfaf gui=bold
+    hi Include      guifg=#ffcfaf gui=bold
 else
     " new, less contrasted one
-    hi Include         guifg=#dfaf8f gui=bold
+    hi Include      guifg=#dfaf8f gui=bold
+endif
+
+if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
+    " color the Ignore groups
+    " note: if you get strange coloring for your files, turn this off (unlet)
+    hi Ignore guifg=#545a4f
 endif
-    " TODO check every syntax group that they're ok
+
+" new tabline and fold column
+if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
+    hi FoldColumn    guibg=#161616
+    hi Folded        guibg=#161616
+    hi TabLine       guifg=#88b090 guibg=#313633 gui=none
+    hi TabLineSel    guifg=#ccd990 guibg=#222222
+    hi TabLineFill   guifg=#88b090 guibg=#313633 gui=none
+    
+    hi SpecialKey    guibg=#242424
+    
+    if &t_Co > 255
+        hi FoldColumn    ctermbg=233 ctermfg=109
+        hi Folded        ctermbg=233 ctermfg=109
+        hi TabLine       ctermbg=236 ctermfg=108 cterm=none
+        hi TabLineSel    ctermbg=235 ctermfg=186 cterm=bold
+        hi TabLineFill   ctermbg=236 ctermfg=236
+    endif
+else
+    hi FoldColumn    guibg=#333333
+    hi Folded        guibg=#333333
+    hi TabLine       guifg=#d0d0b8 guibg=#222222 gui=none
+    hi TabLineSel    guifg=#f0f0b0 guibg=#333333 gui=bold
+    hi TabLineFill   guifg=#dccdcc guibg=#101010 gui=none
+    
+    hi SpecialKey    guibg=#444444
+
+    if &t_Co > 255
+        hi FoldColumn    ctermbg=236 ctermfg=109
+        hi Folded        ctermbg=236 ctermfg=109
+        hi TabLine       ctermbg=235 ctermfg=187 cterm=none
+        hi TabLineSel    ctermbg=236 ctermfg=229 cterm=bold
+        hi TabLineFill   ctermbg=233 ctermfg=233
+    endif
+endif
+
+" EXPERIMENTAL ctags_highlighting support
+" link/set sensible defaults here;
+"
+" For now I mostly link to subset of Zenburn colors, the linkage is based
+" on appearance, not semantics. In later versions I might define more new colours.
+"
+" HELP NEEDED to make this work properly.
+if exists("_zenburn_ctags") && _zenburn_ctags
+
+        " Highlighter seems to think a lot of things are global variables even
+        " though they're not. Example: python method-local variable is
+        " coloured as a global variable. They should not be global, since
+        " they're not visible outside the method.
+        " If this is some very bright colour group then things look bad.
+    	hi link CTagsGlobalVariable    Identifier
+        
+        hi CTagsClass             guifg=#acd0b3
+        if &t_Co > 255
+            hi CTagsClass         ctermfg=115
+        endif
+
+        hi link CTagsImport       Statement
+        hi link CTagsMember       Function
+
+    	hi link CTagsGlobalConstant    Constant
+  
+        " These do not yet have support, I can't get them to appear
+        hi link EnumerationValue  Float
+        hi link EnumerationName   Identifier
+        hi link DefinedName       WarningMsg
+    	hi link LocalVariable     WarningMsg
+    	hi link Structure         WarningMsg
+    	hi link Union             WarningMsg
+endif
+
+" TODO check for more obscure syntax groups that they're ok
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/574381bcf268a8c4db9ad0322299fb45181ffd38




More information about the pld-cvs-commit mailing list