Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 4 commits
  • 4 files changed
  • 0 comments
  • 2 contributors

Showing 4 changed files with 344 additions and 56 deletions. Show diff stats Hide diff stats

  1. +5 2 gitconfig
  2. +3 0  gitignore
  3. +334 49 vim/colors/zenburn.vim
  4. +2 5 vimrc
7 gitconfig
... ... @@ -1,6 +1,6 @@
1 1 [user]
2   - email = Thomas.Mayfield@gmail.com
3   - name = Thomas Mayfield
  2 + email = Thomas.Mayfield@gmail.com
  3 + name = Thomas Mayfield
4 4 [core]
5 5 editor = vim
6 6 excludesfile = ~/.gitignore
@@ -15,3 +15,6 @@
15 15 df = !git diff | mate
16 16 [push]
17 17 default = tracking
  18 +[heroku]
  19 +[merge]
  20 + tool = opendiff
3  gitignore
... ... @@ -1,3 +1,6 @@
1 1 .DS_Store
2 2 *.swp
3 3 *.swo
  4 +log/diagnostic.txt
  5 +*.swn
  6 +.powrc
383 vim/colors/zenburn.vim
... ... @@ -1,11 +1,11 @@
1 1 " Vim color file
2 2 " Maintainer: Jani Nurminen <slinky@iki.fi>
3   -" Last Change: $Id: zenburn.vim,v 2.13 2009/10/24 10:16:01 slinky Exp $
4   -" URL: http://slinky.imukuppi.org/zenburnpage/
5   -" License: GPL
  3 +" Version: v 2.22
  4 +" URL: http://slinky.imukuppi.org/zenburnpage/
  5 +" License: GNU GPL <http://www.gnu.org/licenses/gpl.html>
6 6 "
7 7 " Nothing too fancy, just some alien fruit salad to keep you in the zone.
8   -" This syntax file was designed to be used with dark environments and
  8 +" This syntax file was designed to be used with dark environments and
9 9 " low light situations. Of course, if it works during a daybright office, go
10 10 " ahead :)
11 11 "
@@ -25,7 +25,7 @@
25 25 " See also :help syntax
26 26 "
27 27 " Credits:
28   -" - Jani Nurminen - original Zenburn
  28 +" - Jani Nurminen - original Zenburn, maintainer
29 29 " - Steve Hall & Cream posse - higher-contrast Visual selection
30 30 " - Kurt Maier - 256 color console coloring, low and high contrast toggle,
31 31 " bug fixing
@@ -34,7 +34,20 @@
34 34 " - Tim Smith - force dark background
35 35 " - John Gabriele - spotted bad Ignore-group handling
36 36 " - Zac Thompson - spotted invisible NonText in low contrast mode
37   -" - Christophe-Marie Duquesne - suggested making a Vimball
  37 +" - Christophe-Marie Duquesne - suggested making a Vimball,
  38 +" suggested support for ctags_highlighting.vim
  39 +" - Andrew Wagner - noted the CursorColumn bug (guifg was unintentionally set),
  40 +" unify CursorColumn colour
  41 +" - Martin Langasek - clarify the license, whitespace fixes
  42 +" - Marcin Szamotulski - support autocomplete for Zenburn configuration
  43 +" parameters
  44 +" - Clayton Parker (claytron) - Convinced by Kurt Maier to use Zenburn. Point
  45 +" out issues with LineNr, fix directory styles, and their usage in MacVim.
  46 +" - Paweł Piekarski - Spotted bad FoldColumn and TabLine. Made better
  47 +" FoldColumn colors, fixed TabLine colors.
  48 +" - Jim - Fix for missing Include group for terminal
  49 +" - Peter (Sakartu) - ColorColumn fixes
  50 +" - Please see git log for the others not listed here
38 51 "
39 52 " CONFIGURABLE PARAMETERS:
40 53 "
@@ -46,12 +59,16 @@
46 59 " let g:zenburn_high_Contrast=1
47 60 " colors zenburn
48 61 "
49   -" * You can now set a darker background for bright environments. To activate, use:
50   -" contrast Zenburn, use:
  62 +" You can also do ":let g:zenburn" then hit Ctrl-d or Tab to scroll through the
  63 +" list of configurable parameters.
51 64 "
  65 +" * You can now set a darker background for bright environments. To activate, use:
52 66 " let g:zenburn_high_Contrast = 1
53 67 "
54   -" * For example, Vim help files uses the Ignore-group for the pipes in tags
  68 +" * For transparent terminals set the background to black with:
  69 +" let g:zenburn_transparent = 1
  70 +"
  71 +" * For example, Vim help files uses the Ignore-group for the pipes in tags
55 72 " like "|somelink.txt|". By default, the pipes are not visible, as they
56 73 " map to Ignore group. If you wish to enable coloring of the Ignore group,
57 74 " set the following parameter to 1. Warning, it might make some syntax files
@@ -63,6 +80,9 @@
63 80 "
64 81 " let g:zenburn_alternate_Visual = 1
65 82 "
  83 +" Note: this is enabled only if the old-style Visual
  84 +" if used, see g:zenburn_old_Visual
  85 +"
66 86 " * To use alternate colouring for Error message, use
67 87 "
68 88 " let g:zenburn_alternate_Error = 1
@@ -72,19 +92,55 @@
72 92 "
73 93 " let g:zenburn_alternate_Include = 1
74 94 "
  95 +" * To disable underlining for Labels, use
  96 +"
  97 +" let g:zenburn_disable_Label_underline = 1
  98 +"
75 99 " * Work-around to a Vim bug, it seems to misinterpret ctermfg and 234 and 237
76 100 " as light values, and sets background to light for some people. If you have
77 101 " this problem, use:
78 102 "
79 103 " let g:zenburn_force_dark_Background = 1
80 104 "
  105 +" * By default the CursorColumn is of a lighter colour. I find it more readable
  106 +" that way, but some people may want to align it with the darker CursorLine
  107 +" color, for visual uniformity. To do so, use:
  108 +"
  109 +" let g:zenburn_unified_CursorColumn = 1
  110 +"
  111 +" Note: you can ignore this unless you use
  112 +" ":set cursorline cursorcolumn", since otherwise the effect won't be
  113 +" seen.
  114 +"
  115 +" * New (dark) Visual coloring has been introduced.
  116 +" The dark Visual is more aligned with the rest of the colour scheme,
  117 +" especially if you use line numbers. If you wish to use the
  118 +" old Visual coloring, use
  119 +"
  120 +" let g:zenburn_old_Visual = 1
  121 +"
  122 +" Default is to use the new Visual.
  123 +"
  124 +" * EXPERIMENTAL FEATURE: Zenburn would like to support TagHighlight
  125 +" (an evolved ctags-highlighter) by Al Budden (homepage:
  126 +" http://www.cgtk.co.uk/vim-scripts/taghighlight).
  127 +" Current support status is broken: there is no automatic detection of
  128 +" TagHighlight, no specific language support; however there is some basic
  129 +" support for Python. If you are a user of TagHighlight and want to help,
  130 +" please enable:
  131 +"
  132 +" let g:zenburn_enable_TagHighlight=1
  133 +"
  134 +" and improve the corresponding block at the end of the file.
  135 +"
81 136 " NOTE:
82 137 "
83   -" * To turn the parameter(s) back to defaults, use UNLET:
  138 +" * To turn the parameter(s) back to defaults, use UNLET or set them to 0:
84 139 "
85 140 " unlet g:zenburn_alternate_Include
  141 +" or
  142 +" let g:zenburn_alternate_Include = 0
86 143 "
87   -" Setting to 0 won't work!
88 144 "
89 145 " That's it, enjoy!
90 146 "
@@ -92,7 +148,55 @@
92 148 " - Visual alternate color is broken? Try GVim >= 7.0.66 if you have trouble
93 149 " - IME colouring (CursorIM)
94 150
  151 +" Set defaults, but keep any parameters already set by the user
  152 +if ! exists("g:zenburn_high_Contrast")
  153 + let g:zenburn_high_Contrast = 0
  154 +endif
  155 +
  156 +if ! exists("g:zenburn_transparent")
  157 + let g:zenburn_transparent = 0
  158 +endif
  159 +
  160 +if ! exists("g:zenburn_color_also_Ignore")
  161 + let g:zenburn_color_also_Ignore = 0
  162 +endif
  163 +
  164 +if ! exists("g:zenburn_alternate_Error")
  165 + let g:zenburn_alternate_Error = 0
  166 +endif
  167 +
  168 +if ! exists("g:zenburn_force_dark_Background")
  169 + let g:zenburn_force_dark_Background = 0
  170 +endif
  171 +
  172 +if ! exists("g:zenburn_alternate_Visual")
  173 + let g:zenburn_alternate_Visual = 0
  174 +endif
  175 +
  176 +if ! exists("g:zenburn_alternate_Include")
  177 + let g:zenburn_alternate_Include = 0
  178 +endif
  179 +
  180 +if ! exists("g:zenburn_disable_Label_underline")
  181 + let g:zenburn_disable_Label_underline = 0
  182 +endif
  183 +
  184 +if ! exists("g:zenburn_unified_CursorColumn")
  185 + let g:zenburn_unified_CursorColumn = 0
  186 +endif
  187 +
  188 +if ! exists("g:zenburn_old_Visual")
  189 + let g:zenburn_old_Visual = 0
  190 +endif
  191 +
  192 +if ! exists("g:zenburn_enable_TagHighlight")
  193 + let g:zenburn_enable_TagHighlight = 0
  194 +endif
  195 +
  196 +" -----------------------------------------------
  197 +
95 198 set background=dark
  199 +
96 200 hi clear
97 201 if exists("syntax_on")
98 202 syntax reset
@@ -112,7 +216,7 @@ hi DiffAdd guifg=#709080 guibg=#313c36 gui=bold
112 216 hi DiffChange guibg=#333333
113 217 hi DiffDelete guifg=#333333 guibg=#464646
114 218 hi DiffText guifg=#ecbcbc guibg=#41363c gui=bold
115   -hi Directory guifg=#dcdccc gui=bold
  219 +hi Directory guifg=#9fafaf gui=bold
116 220 hi ErrorMsg guifg=#80d4aa guibg=#2f2f2f gui=bold
117 221 hi Exception guifg=#c3bf9f gui=bold
118 222 hi Float guifg=#c0bed1
@@ -122,8 +226,6 @@ hi Function guifg=#efef8f
122 226 hi Identifier guifg=#efdcbc
123 227 hi IncSearch guibg=#f8f893 guifg=#385f38
124 228 hi Keyword guifg=#f0dfaf gui=bold
125   -hi Label guifg=#dfcfaf gui=underline
126   -hi LineNr guifg=#9fafaf guibg=#262626
127 229 hi Macro guifg=#ffcfaf gui=bold
128 230 hi ModeMsg guifg=#ffcfaf gui=none
129 231 hi MoreMsg guifg=#ffffff gui=bold
@@ -175,18 +277,16 @@ if &t_Co > 255
175 277 hi DiffChange ctermbg=236
176 278 hi DiffDelete ctermfg=236 ctermbg=238
177 279 hi DiffText ctermfg=217 ctermbg=237 cterm=bold
178   - hi Directory ctermfg=188 cterm=bold
  280 + hi Directory ctermfg=109 cterm=bold
179 281 hi ErrorMsg ctermfg=115 ctermbg=236 cterm=bold
180 282 hi Exception ctermfg=249 cterm=bold
181 283 hi Float ctermfg=251
182   - hi FoldColumn ctermfg=109 ctermbg=238
183   - hi Folded ctermfg=109 ctermbg=238
184 284 hi Function ctermfg=228
185 285 hi Identifier ctermfg=223
  286 + hi Include ctermfg=180 cterm=bold
186 287 hi IncSearch ctermbg=228 ctermfg=238
187 288 hi Keyword ctermfg=223 cterm=bold
188   - hi Label ctermfg=187 cterm=underline
189   - hi LineNr ctermfg=248 ctermbg=235
  289 + hi LineNr ctermfg=248 ctermbg=233
190 290 hi Macro ctermfg=223 cterm=bold
191 291 hi ModeMsg ctermfg=223 cterm=none
192 292 hi MoreMsg ctermfg=15 cterm=bold
@@ -217,7 +317,6 @@ if &t_Co > 255
217 317 hi VisualNOS ctermfg=236 ctermbg=210 cterm=bold
218 318 hi WarningMsg ctermfg=15 ctermbg=236 cterm=bold
219 319 hi WildMenu ctermbg=236 ctermfg=194 cterm=bold
220   - hi CursorLine ctermbg=236 cterm=none
221 320
222 321 " spellchecking, always "bright" background
223 322 hi SpellLocal ctermfg=14 ctermbg=237
@@ -229,13 +328,24 @@ if &t_Co > 255
229 328 hi PMenu ctermfg=248 ctermbg=0
230 329 hi PMenuSel ctermfg=223 ctermbg=235
231 330
232   - if exists("g:zenburn_high_Contrast")
  331 + if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
233 332 hi Normal ctermfg=188 ctermbg=234
234 333 hi NonText ctermfg=238
235 334
236   - if exists("g:zenburn_color_also_Ignore")
  335 + if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
237 336 hi Ignore ctermfg=238
238 337 endif
  338 +
  339 + " hc mode, darker CursorLine, default 236
  340 + hi CursorLine ctermbg=233 cterm=none
  341 +
  342 + if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
  343 + hi CursorColumn ctermbg=233 cterm=none
  344 + else
  345 + hi CursorColumn ctermbg=235 cterm=none
  346 + endif
  347 +
  348 + hi ColorColumn ctermbg=235
239 349 else
240 350 hi Normal ctermfg=188 ctermbg=237
241 351 hi Cursor ctermbg=109
@@ -243,10 +353,8 @@ if &t_Co > 255
243 353 hi diffdelete ctermbg=238
244 354 hi difftext ctermbg=237
245 355 hi errormsg ctermbg=237
246   - hi foldcolumn ctermbg=238
247   - hi folded ctermbg=238
248 356 hi incsearch ctermbg=228
249   - hi linenr ctermbg=238
  357 + hi linenr ctermbg=235
250 358 hi search ctermbg=238
251 359 hi statement ctermbg=237
252 360 hi statusline ctermbg=144
@@ -259,22 +367,47 @@ if &t_Co > 255
259 367 hi warningmsg ctermbg=236
260 368 hi wildmenu ctermbg=236
261 369 hi NonText ctermfg=240
262   -
263   - if exists("g:zenburn_color_also_Ignore")
  370 +
  371 + if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
264 372 hi Ignore ctermfg=240
265 373 endif
  374 +
  375 + " normal mode, lighter CursorLine
  376 + hi CursorLine ctermbg=238 cterm=none
  377 +
  378 + if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
  379 + hi CursorColumn ctermbg=238 cterm=none
  380 + else
  381 + hi CursorColumn ctermbg=239 cterm=none
  382 + endif
  383 +
  384 + hi ColorColumn ctermbg=238
266 385 endif
267 386
268   - if exists("g:zenburn_alternate_Error")
  387 + if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error
269 388 " use more jumpy Error
270 389 hi Error ctermfg=210 ctermbg=52 gui=bold
271 390 else
272 391 " default is something more zenburn-compatible
273 392 hi Error ctermfg=228 ctermbg=95 gui=bold
274 393 endif
  394 +
  395 + if exists("g:zenburn_alternate_Include") && g:zenburn_alternate_Include
  396 + " original setting
  397 + hi Include ctermfg=223 cterm=bold
  398 + else
  399 + " new, less contrasted one
  400 + hi Include ctermfg=180 cterm=bold
  401 + endif
  402 +
  403 + if exists("g:zenburn_disable_Label_underline") && g:zenburn_disable_Label_underline
  404 + hi Label ctermfg=187
  405 + else
  406 + hi Label ctermfg=187 cterm=underline
  407 + endif
275 408 endif
276 409
277   -if exists("g:zenburn_force_dark_Background")
  410 +if exists("g:zenburn_force_dark_Background") && g:zenburn_force_dark_Background
278 411 " Force dark background, because of a bug in VIM: VIM sets background
279 412 " automatically during "hi Normal ctermfg=X"; it misinterprets the high
280 413 " value (234 or 237 above) as a light color, and wrongly sets background to
@@ -282,51 +415,101 @@ if exists("g:zenburn_force_dark_Background")
282 415 set background=dark
283 416 endif
284 417
285   -if exists("g:zenburn_high_Contrast")
  418 +if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
286 419 " use new darker background
287 420 hi Normal guifg=#dcdccc guibg=#1f1f1f
288 421 hi CursorLine guibg=#121212 gui=bold
  422 + if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
  423 + hi CursorColumn guibg=#121212 gui=bold
  424 + else
  425 + hi CursorColumn guibg=#2b2b2b
  426 + endif
289 427 hi Pmenu guibg=#242424 guifg=#ccccbc
290 428 hi PMenuSel guibg=#353a37 guifg=#ccdc90 gui=bold
291 429 hi PmenuSbar guibg=#2e3330 guifg=#000000
292 430 hi PMenuThumb guibg=#a0afa0 guifg=#040404
293 431 hi MatchParen guifg=#f0f0c0 guibg=#383838 gui=bold
294 432 hi SignColumn guifg=#9fafaf guibg=#181818 gui=bold
295   - hi TabLineFill guifg=#cfcfaf guibg=#181818 gui=bold
296   - hi TabLineSel guifg=#efefef guibg=#1c1c1b gui=bold
297   - hi TabLine guifg=#b6bf98 guibg=#181818 gui=bold
298   - hi CursorColumn guifg=#dcdccc guibg=#2b2b2b
299 433 hi NonText guifg=#404040 gui=bold
  434 +
  435 + hi LineNr guifg=#9fafaf guibg=#161616
  436 +
  437 + hi ColorColumn guibg=#33332f
300 438 else
301 439 " Original, lighter background
302 440 hi Normal guifg=#dcdccc guibg=#3f3f3f
303 441 hi CursorLine guibg=#434443
  442 + if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
  443 + hi CursorColumn guibg=#434343
  444 + else
  445 + hi CursorColumn guibg=#4f4f4f
  446 + endif
304 447 hi Pmenu guibg=#2c2e2e guifg=#9f9f9f
305 448 hi PMenuSel guibg=#242424 guifg=#d0d0a0 gui=bold
306 449 hi PmenuSbar guibg=#2e3330 guifg=#000000
307 450 hi PMenuThumb guibg=#a0afa0 guifg=#040404
308 451 hi MatchParen guifg=#b2b2a0 guibg=#2e2e2e gui=bold
309 452 hi SignColumn guifg=#9fafaf guibg=#343434 gui=bold
310   - hi TabLineFill guifg=#cfcfaf guibg=#353535 gui=bold
311   - hi TabLineSel guifg=#efefef guibg=#3a3a39 gui=bold
312   - hi TabLine guifg=#b6bf98 guibg=#353535 gui=bold
313   - hi CursorColumn guifg=#dcdccc guibg=#4f4f4f
314 453 hi NonText guifg=#5b605e gui=bold
  454 +
  455 + hi LineNr guifg=#9fafaf guibg=#262626
  456 +
  457 + hi ColorColumn guibg=#484848
315 458 endif
316 459
  460 +if exists("g:zenburn_transparent") && g:zenburn_transparent
  461 + hi Normal ctermbg=0 guibg=#000000
  462 + hi Statement ctermbg=NONE
  463 + hi Title ctermbg=NONE
  464 + hi Todo ctermbg=NONE
  465 + hi Underlined ctermbg=NONE
  466 + hi DiffAdd ctermbg=NONE
  467 + hi DiffText ctermbg=NONE
  468 + hi ErrorMsg ctermbg=NONE
  469 + hi LineNr ctermbg=NONE
  470 +endif
317 471
318   -if exists("g:zenburn_alternate_Visual")
319   - " Visual with more contrast, thanks to Steve Hall & Cream posse
320   - " gui=none fixes weird highlight problem in at least GVim 7.0.66, thanks to Kurt Maier
321   - hi Visual guifg=#000000 guibg=#71d3b4 gui=none
322   - hi VisualNOS guifg=#000000 guibg=#71d3b4 gui=none
  472 +if exists("g:zenburn_old_Visual") && g:zenburn_old_Visual
  473 + if exists("g:zenburn_alternate_Visual") && g:zenburn_alternate_Visual
  474 + " Visual with more contrast, thanks to Steve Hall & Cream posse
  475 + " gui=none fixes weird highlight problem in at least GVim 7.0.66, thanks to Kurt Maier
  476 + hi Visual guifg=#000000 guibg=#71d3b4 gui=none
  477 + hi VisualNOS guifg=#000000 guibg=#71d3b4 gui=none
  478 + else
  479 + " use default visual
  480 + hi Visual guifg=#233323 guibg=#71d3b4 gui=none
  481 + hi VisualNOS guifg=#233323 guibg=#71d3b4 gui=none
  482 + endif
323 483 else
324   - " use default visual
325   - hi Visual guifg=#233323 guibg=#71d3b4 gui=none
326   - hi VisualNOS guifg=#233323 guibg=#71d3b4 gui=none
  484 + " new Visual style
  485 + if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
  486 + " high contrast
  487 + "hi Visual guibg=#304a3d
  488 + "hi VisualNos guibg=#304a3d
  489 + "TODO no nice greenish in console, 65 is closest. use full black instead,
  490 + "although i like the green..!
  491 + hi Visual guibg=#0f0f0f
  492 + hi VisualNos guibg=#0f0f0f
  493 + if &t_Co > 255
  494 + if exists("g:zenburn_transparent") && g:zenburn_transparent
  495 + hi Visual ctermbg=235
  496 + else
  497 + hi Visual ctermbg=0
  498 + endif
  499 + endif
  500 + else
  501 + " low contrast
  502 + hi Visual guibg=#2f2f2f
  503 + hi VisualNOS guibg=#2f2f2f
  504 +
  505 + if &t_Co > 255
  506 + hi Visual ctermbg=235
  507 + hi VisualNOS ctermbg=235
  508 + endif
  509 + endif
327 510 endif
328 511
329   -if exists("g:zenburn_alternate_Error")
  512 +if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error
330 513 " use more jumpy Error
331 514 hi Error guifg=#e37170 guibg=#664040 gui=bold
332 515 else
@@ -334,7 +517,7 @@ else
334 517 hi Error guifg=#e37170 guibg=#3d3535 gui=none
335 518 endif
336 519
337   -if exists("g:zenburn_alternate_Include")
  520 +if exists("g:zenburn_alternate_Include") && g:zenburn_alternate_Include
338 521 " original setting
339 522 hi Include guifg=#ffcfaf gui=bold
340 523 else
@@ -342,10 +525,112 @@ else
342 525 hi Include guifg=#dfaf8f gui=bold
343 526 endif
344 527
345   -if exists("g:zenburn_color_also_Ignore")
  528 +if exists("g:zenburn_disable_Label_underline") && g:zenburn_disable_Label_underline
  529 + hi Label guifg=#dfcfaf
  530 +else
  531 + hi Label guifg=#dfcfaf gui=underline
  532 +endif
  533 +
  534 +if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
346 535 " color the Ignore groups
347 536 " note: if you get strange coloring for your files, turn this off (unlet)
348 537 hi Ignore guifg=#545a4f
349 538 endif
350 539
  540 +" new tabline and fold column
  541 +if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
  542 + hi FoldColumn guibg=#161616
  543 + hi Folded guibg=#161616
  544 + hi TabLine guifg=#88b090 guibg=#313633 gui=none
  545 + hi TabLineSel guifg=#ccd990 guibg=#222222
  546 + hi TabLineFill guifg=#88b090 guibg=#313633 gui=none
  547 +
  548 + hi SpecialKey guibg=#242424
  549 +
  550 + if &t_Co > 255
  551 + hi FoldColumn ctermbg=233 ctermfg=109
  552 + hi Folded ctermbg=233 ctermfg=109
  553 + hi TabLine ctermbg=236 ctermfg=108 cterm=none
  554 + hi TabLineSel ctermbg=235 ctermfg=186 cterm=bold
  555 + hi TabLineFill ctermbg=236 ctermfg=236 cterm=bold
  556 + endif
  557 +else
  558 + hi FoldColumn guibg=#333333
  559 + hi Folded guibg=#333333
  560 + hi TabLine guifg=#d0d0b8 guibg=#222222 gui=none
  561 + hi TabLineSel guifg=#f0f0b0 guibg=#333333 gui=bold
  562 + hi TabLineFill guifg=#dccdcc guibg=#101010 gui=none
  563 +
  564 + hi SpecialKey guibg=#444444
  565 +
  566 + if &t_Co > 255
  567 + hi FoldColumn ctermbg=236 ctermfg=109
  568 + hi Folded ctermbg=236 ctermfg=109
  569 + hi TabLine ctermbg=235 ctermfg=187 cterm=none
  570 + hi TabLineSel ctermbg=236 ctermfg=229 cterm=bold
  571 + hi TabLineFill ctermbg=233 ctermfg=233 cterm=bold
  572 + endif
  573 +endif
  574 +
  575 +" EXPERIMENTAL TagHighlight support
  576 +" link/set sensible defaults here;
  577 +"
  578 +" For now I mostly link to subset of Zenburn colors, the linkage is based
  579 +" on appearance, not semantics. In later versions I might define more new colours.
  580 +"
  581 +" HELP NEEDED to make this work properly.
  582 +
  583 +if exists("g:zenburn_enable_TagHighlight") && g:zenburn_enable_TagHighlight
  584 + " CTag support may vary, but the first step is to start using it so
  585 + " we can fix it!
  586 + "
  587 + " Consult /plugin/TagHighlight/data/kinds.txt for info on your
  588 + " language and what's been defined.
  589 + "
  590 + " There is potential for language indepedent features here. (Acutally,
  591 + " seems it may be required for this to be useful...) This way we can
  592 + " implement features depending on how well CTags are currently implemented
  593 + " for the language. ie. Global problem for python is annoying. Special
  594 + " colors are defined for special language features, etc..
  595 + "
  596 + " For now all I care about is python supported features:
  597 + " c:CTagsClass
  598 + " f:CTagsFunction
  599 + " i:CTagsImport
  600 + " m:CTagsMember
  601 + " v:CTagsGlobalVariable
  602 + "
  603 + " Note: TagHighlight defaults to setting new tags to Keyword
  604 + " highlighting.
  605 +
  606 + " TODO conditionally run each section
  607 + " BEGIN Python Section
  608 + hi link Class Function
  609 + hi link Import PythonInclude
  610 + hi link Member Function
  611 + "Note: Function is already defined
  612 +
  613 + " Highlighter seems to think a lot of things are global variables even
  614 + " though they're not. Example: python method-local variable is
  615 + " coloured as a global variable. They should not be global, since
  616 + " they're not visible outside the method.
  617 + " If this is some very bright colour group then things look bad.
  618 + " hi link GlobalVariable Identifier
  619 +
  620 + " Because of this problem I am disabling the feature by setting it to
  621 + " Normal instead
  622 + hi link GlobalVariable Normal
  623 + " END Python Section
  624 +
  625 + " Starting point for other languages.
  626 + hi link GlobalConstant Constant
  627 + hi link EnumerationValue Float
  628 + hi link EnumerationName Identifier
  629 + hi link DefinedName WarningMsg
  630 + hi link LocalVariable WarningMsg
  631 + hi link Structure WarningMsg
  632 + hi link Union WarningMsg
  633 +endif
  634 +
351 635 " TODO check for more obscure syntax groups that they're ok
  636 +
7 vimrc
@@ -129,12 +129,9 @@ autocmd BufWinLeave * call clearmatches()
129 129 if exists('$TMUX')
130 130 let &t_SI = "\<Esc>Ptmux;\<Esc>\<Esc>]50;CursorShape=1\x7\<Esc>\\"
131 131 let &t_EI = "\<Esc>Ptmux;\<Esc>\<Esc>]50;CursorShape=0\x7\<Esc>\\"
132   -else
133   - let &t_SI = "\<Esc>]50;CursorShape=1\x7"
134   - let &t_EI = "\<Esc>]50;CursorShape=0\x7"
  132 + inoremap <special> <Esc> <Esc>hl
  133 + set guicursor+=i:blinkwait0
135 134 endif
136   -inoremap <special> <Esc> <Esc>hl
137   -set guicursor+=i:blinkwait0
138 135
139 136 " Enable 256 colors to stop the CSApprox warning
140 137 if &term == 'xterm' || &term == 'screen'

No commit comments for this range

Something went wrong with that request. Please try again.