Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Trailing space highlight #48

Open
wants to merge 4 commits into from

1 participant

@nevar

"syn match" did't match inside "syn region".
For independent highlight trailing space use "match".

@greduan greduan referenced this pull request from a commit
@greduan greduan Merged forks #18 #20 #32 #35 #45 #48 #49 #54 #57
Now I'm gonna make my own changes to this stuff in order for it to be
all to my own liking. Lots of things to come.
4843c02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 29, 2012
  1. @nevar
Commits on Aug 19, 2013
  1. @nevar

    Remove trailing space

    nevar authored
  2. @nevar

    Add underline

    nevar authored
  3. @nevar
This page is out of date. Refresh to see the latest.
Showing with 28 additions and 27 deletions.
  1. +28 −27 colors/solarized.vim
View
55 colors/solarized.vim
@@ -19,9 +19,9 @@
" ---------------------------------------------------------------------
" OPTIONS:
" ---------------------------------------------------------------------
-" See the "solarized.txt" help file included with this colorscheme (in the
-" "doc" subdirectory) for information on options, usage, the Toggle Background
-" function and more. If you have already installed Solarized, this is available
+" See the "solarized.txt" help file included with this colorscheme (in the "doc"
+" subdirectory) for information on options, usage, the Toggle Background
+" function and more. If you have already installed Solarized, this is available
" from the Solarized menu and command line as ":help solarized"
"
" ---------------------------------------------------------------------
@@ -36,7 +36,7 @@
" and unarchive the file.
" 2. Move `solarized.vim` to your `.vim/colors` directory.
" 3. Move each of the files in each subdirectories to the corresponding .vim
-" subdirectory (e.g. autoload/togglebg.vim goes into your .vim/autoload
+" subdirectory (e.g. autoload/togglebg.vim goes into your .vim/autoload
" directory as .vim/autoload/togglebg.vim).
"
" RECOMMENDED PATHOGEN INSTALLATION OPTION:
@@ -131,7 +131,7 @@
"
" }}}
" Environment Specific Overrides "{{{
-" Allow or disallow certain features based on current terminal emulator or
+" Allow or disallow certain features based on current terminal emulator or
" environment.
" Terminals that support italics
@@ -159,9 +159,9 @@ endif
" }}}
" Default option values"{{{
" ---------------------------------------------------------------------
-" s:options_list is used to autogenerate a list of all non-default options
-" using "call SolarizedOptions()" or with the "Generate .vimrc commands"
-" Solarized menu option. See the "Menus" section below for the function itself.
+" s:options_list is used to autogenerate a list of all non-default options using
+" "call SolarizedOptions()" or with the "Generate .vimrc commands" Solarized
+" menu option. See the "Menus" section below for the function itself.
let s:options_list=[
\'" this block of commands has been autogenerated by solarized.vim and',
\'" includes the current, non-default Solarized option values.',
@@ -484,9 +484,9 @@ exe "let s:fmt_ital = ' ".s:vmode."=NONE".s:i. " term=NONE".s:i."'"
exe "let s:fmt_stnd = ' ".s:vmode."=NONE".s:s. " term=NONE".s:s."'"
exe "let s:fmt_revr = ' ".s:vmode."=NONE".s:r. " term=NONE".s:r."'"
exe "let s:fmt_revb = ' ".s:vmode."=NONE".s:r.s:b. " term=NONE".s:r.s:b."'"
-" revbb (reverse bold for bright colors) is only set to actual bold in low
-" color terminals (t_co=8, such as OS X Terminal.app) and should only be used
-" with colors 8-15.
+" revbb (reverse bold for bright colors) is only set to actual bold in low color
+" terminals (t_co=8, such as OS X Terminal.app) and should only be used with
+" colors 8-15.
exe "let s:fmt_revbb = ' ".s:vmode."=NONE".s:r.s:bb. " term=NONE".s:r.s:bb."'"
exe "let s:fmt_revbbu = ' ".s:vmode."=NONE".s:r.s:bb.s:u." term=NONE".s:r.s:bb.s:u."'"
@@ -583,7 +583,7 @@ exe "hi! Special" .s:fmt_none .s:fg_red .s:bg_none
" SpecialComment special things inside a comment
" Debug debugging statements
-exe "hi! Underlined" .s:fmt_none .s:fg_violet .s:bg_none
+exe "hi! Underlined" .s:fmt_undr .s:fg_violet .s:bg_none
" *Underlined text that stands out, HTML links
exe "hi! Ignore" .s:fmt_none .s:fg_none .s:bg_none
@@ -618,7 +618,8 @@ exe "hi! IncSearch" .s:fmt_stnd .s:fg_orange .s:bg_none
exe "hi! Search" .s:fmt_revr .s:fg_yellow .s:bg_none
exe "hi! MoreMsg" .s:fmt_none .s:fg_blue .s:bg_none
exe "hi! ModeMsg" .s:fmt_none .s:fg_blue .s:bg_none
-exe "hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_base02
+exe "hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_base03
+exe "hi! CursorLineNr" .s:fmt_none .s:fg_base01 .s:bg_base02
exe "hi! Question" .s:fmt_bold .s:fg_cyan .s:bg_none
if ( has("gui_running") || &t_Co > 8 )
exe "hi! VertSplit" .s:fmt_none .s:fg_base00 .s:bg_base00
@@ -729,7 +730,7 @@ hi! link diffLine Identifier
"exe "hi! gitDiffAdded"
"exe "hi! gitDiffRemoved"
"gitcommit
-"exe "hi! gitcommitSummary"
+"exe "hi! gitcommitSummary"
exe "hi! gitcommitComment" .s:fmt_ital .s:fg_base01 .s:bg_none
hi! link gitcommitUntracked gitcommitComment
hi! link gitcommitDiscarded gitcommitComment
@@ -972,19 +973,19 @@ hi! link pandocMetadataTitle pandocMetadata
"}}}
" Utility autocommand "{{{
" ---------------------------------------------------------------------
-" In cases where Solarized is initialized inside a terminal vim session and
-" then transferred to a gui session via the command `:gui`, the gui vim process
-" does not re-read the colorscheme (or .vimrc for that matter) so any `has_gui`
+" In cases where Solarized is initialized inside a terminal vim session and then
+" transferred to a gui session via the command `:gui`, the gui vim process does
+" not re-read the colorscheme (or .vimrc for that matter) so any `has_gui`
" related code that sets gui specific values isn't executed.
"
-" Currently, Solarized sets only the cterm or gui values for the colorscheme
-" depending on gui or terminal mode. It's possible that, if the following
-" autocommand method is deemed excessively poor form, that approach will be
-" used again and the autocommand below will be dropped.
+" Currently, Solarized sets only the cterm or gui values for the colorscheme
+" depending on gui or terminal mode. It's possible that, if the following
+" autocommand method is deemed excessively poor form, that approach will be used
+" again and the autocommand below will be dropped.
"
-" However it seems relatively benign in this case to include the autocommand
-" here. It fires only in cases where vim is transferring from terminal to gui
-" mode (detected with the script scope s:vmode variable). It also allows for
+" However it seems relatively benign in this case to include the autocommand
+" here. It fires only in cases where vim is transferring from terminal to gui
+" mode (detected with the script scope s:vmode variable). It also allows for
" other potential terminal customizations that might make gui mode suboptimal.
"
autocmd GUIEnter * if (s:vmode != "gui") | exe "colorscheme " . g:colors_name | endif
@@ -995,10 +996,10 @@ function! s:SolarizedHiTrail()
if g:solarized_hitrail==0
hi! clear solarizedTrailingSpace
else
- syn match solarizedTrailingSpace "\s*$"
exe "hi! solarizedTrailingSpace " .s:fmt_undr .s:fg_red .s:bg_none .s:sp_red
+ match solarizedTrailingSpace "\s\+$"
endif
-endfunction
+endfunction
augroup SolarizedHiTrail
autocmd!
if g:solarized_hitrail==1
@@ -1113,5 +1114,5 @@ autocmd ColorScheme * if g:colors_name != "solarized" | silent! aunmenu Solarize
" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
" THE SOFTWARE.
"
-" vim:foldmethod=marker:foldlevel=0
+" vim:foldmethod=marker:foldlevel=0:expandtab
"}}}
Something went wrong with that request. Please try again.