aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/colors/darkblue.vim1
-rw-r--r--runtime/colors/delek.vim1
-rw-r--r--runtime/colors/desert.vim2
-rw-r--r--runtime/colors/evening.vim1
-rw-r--r--runtime/colors/morning.vim1
-rw-r--r--runtime/colors/peachpuff.vim1
-rw-r--r--runtime/colors/shine.vim1
-rw-r--r--runtime/colors/slate.vim1
-rw-r--r--runtime/doc/options.txt3
-rw-r--r--runtime/doc/syntax.txt3
-rw-r--r--runtime/doc/vim_diff.txt3
-rw-r--r--src/nvim/option.c2
12 files changed, 5 insertions, 15 deletions
diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim
index 4117122728..88f0bd73b9 100644
--- a/runtime/colors/darkblue.vim
+++ b/runtime/colors/darkblue.vim
@@ -17,7 +17,6 @@ let colors_name = "darkblue"
hi Normal guifg=#c0c0c0 guibg=#000040 ctermfg=gray ctermbg=black
hi ErrorMsg guifg=#ffffff guibg=#287eff ctermfg=white ctermbg=lightblue
hi Visual guifg=#8080ff guibg=fg gui=reverse ctermfg=lightblue ctermbg=fg cterm=reverse
-hi VisualNOS guifg=#8080ff guibg=fg gui=reverse,underline ctermfg=lightblue ctermbg=fg cterm=reverse,underline
hi Todo guifg=#d14a14 guibg=#1248d1 ctermfg=red ctermbg=darkblue
hi Search guifg=#90fff0 guibg=#2050d0 ctermfg=white ctermbg=darkblue cterm=underline term=underline
hi IncSearch guifg=#b0ffff guibg=#2050d0 ctermfg=darkblue ctermbg=gray
diff --git a/runtime/colors/delek.vim b/runtime/colors/delek.vim
index 8c5f7f4fe3..dd3a33a9e8 100644
--- a/runtime/colors/delek.vim
+++ b/runtime/colors/delek.vim
@@ -39,7 +39,6 @@ hi StatusLineNC cterm=bold ctermbg=blue ctermfg=black guibg=gold guifg=blue
hi Title ctermfg=DarkMagenta gui=bold guifg=Magenta
hi VertSplit cterm=reverse gui=reverse
hi Visual ctermbg=NONE cterm=reverse gui=reverse guifg=Grey guibg=fg
-hi VisualNOS cterm=underline,bold gui=underline,bold
hi WarningMsg ctermfg=DarkRed guifg=Red
hi WildMenu ctermfg=Black ctermbg=Yellow guibg=Yellow guifg=Black
diff --git a/runtime/colors/desert.vim b/runtime/colors/desert.vim
index 7166220f26..542e5ae015 100644
--- a/runtime/colors/desert.vim
+++ b/runtime/colors/desert.vim
@@ -47,7 +47,6 @@ hi StatusLine guibg=#c2bfa5 guifg=black gui=none
hi StatusLineNC guibg=#c2bfa5 guifg=grey50 gui=none
hi Title guifg=indianred
hi Visual gui=none guifg=khaki guibg=olivedrab
-"hi VisualNOS
hi WarningMsg guifg=salmon
"hi WildMenu
"hi Menu
@@ -83,7 +82,6 @@ hi StatusLineNC cterm=reverse
hi VertSplit cterm=reverse
hi Title ctermfg=5
hi Visual cterm=reverse
-hi VisualNOS cterm=bold,underline
hi WarningMsg ctermfg=1
hi WildMenu ctermfg=0 ctermbg=3
hi Folded ctermfg=darkgrey ctermbg=NONE
diff --git a/runtime/colors/evening.vim b/runtime/colors/evening.vim
index 298fd24811..5dae08280e 100644
--- a/runtime/colors/evening.vim
+++ b/runtime/colors/evening.vim
@@ -23,7 +23,6 @@ hi StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold
hi StatusLineNC term=reverse cterm=reverse gui=reverse
hi VertSplit term=reverse cterm=reverse gui=reverse
hi Visual term=reverse ctermbg=black guibg=grey60
-hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
hi Cursor guibg=Green guifg=Black
hi lCursor guibg=Cyan guifg=Black
diff --git a/runtime/colors/morning.vim b/runtime/colors/morning.vim
index f1ab841416..fca9c2a742 100644
--- a/runtime/colors/morning.vim
+++ b/runtime/colors/morning.vim
@@ -23,7 +23,6 @@ hi StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold
hi StatusLineNC term=reverse cterm=reverse gui=reverse
hi VertSplit term=reverse cterm=reverse gui=reverse
hi Visual term=reverse ctermbg=grey guibg=grey80
-hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
hi Cursor guibg=Green guifg=NONE
hi lCursor guibg=Cyan guifg=NONE
diff --git a/runtime/colors/peachpuff.vim b/runtime/colors/peachpuff.vim
index 3c15305b00..1c0c2390f8 100644
--- a/runtime/colors/peachpuff.vim
+++ b/runtime/colors/peachpuff.vim
@@ -34,7 +34,6 @@ hi StatusLineNC term=reverse cterm=reverse gui=bold guifg=PeachPuff guibg=Gray45
hi VertSplit term=reverse cterm=reverse gui=bold guifg=White guibg=Gray45
hi Title term=bold ctermfg=5 gui=bold guifg=DeepPink3
hi Visual term=reverse cterm=reverse gui=reverse guifg=Grey80 guibg=fg
-hi VisualNOS term=bold,underline cterm=bold,underline gui=bold,underline
hi WarningMsg term=standout ctermfg=1 gui=bold guifg=Red
hi WildMenu term=standout ctermfg=0 ctermbg=3 guifg=Black guibg=Yellow
hi Folded term=standout ctermfg=4 ctermbg=7 guifg=Black guibg=#e3c1a5
diff --git a/runtime/colors/shine.vim b/runtime/colors/shine.vim
index afc72b30fb..eedb9c9b25 100644
--- a/runtime/colors/shine.vim
+++ b/runtime/colors/shine.vim
@@ -24,7 +24,6 @@ hi StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold
hi StatusLineNC term=reverse cterm=reverse gui=reverse
hi VertSplit term=reverse cterm=reverse gui=reverse
hi Visual term=reverse cterm=reverse gui=reverse guifg=Grey guibg=fg
-hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
hi Cursor ctermbg=Green guibg=Green guifg=Black
hi lCursor guibg=Cyan guifg=Black
diff --git a/runtime/colors/slate.vim b/runtime/colors/slate.vim
index f9a70b8777..ffc13b822a 100644
--- a/runtime/colors/slate.vim
+++ b/runtime/colors/slate.vim
@@ -45,7 +45,6 @@ let colors_name = "slate"
:hi Todo guifg=orangered guibg=yellow2
:hi Directory ctermfg=darkcyan
:hi ErrorMsg cterm=bold guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi VisualNOS cterm=bold,underline
:hi WildMenu ctermfg=0 ctermbg=3
:hi DiffAdd ctermbg=4
:hi DiffChange ctermbg=5
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 63466ac3ae..b6ce83825a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3492,9 +3492,6 @@ A jump table for the options with a short description can be found at |Q_op|.
|hl-Title| t Titles for output from ":set all", ":autocmd" etc.
|hl-VertSplit| c column used to separate vertically split windows
|hl-Visual| v Visual mode
- |hl-VisualNOS| V Visual mode when Vim does is "Not Owning the
- Selection" Only X11 Gui's |gui-x11| and
- |xterm-clipboard|.
|hl-WarningMsg| w warning messages
|hl-WildMenu| W wildcard matches displayed for 'wildmenu'
|hl-Folded| f line used for closed folds
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 7e1488651e..6bc1b2873c 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4836,8 +4836,7 @@ Title titles for output from ":set all", ":autocmd" etc.
*hl-Visual*
Visual Visual mode selection
*hl-VisualNOS*
-VisualNOS Visual mode selection when vim is "Not Owning the Selection".
- Only X11 Gui's |gui-x11| and |xterm-clipboard| supports this.
+VisualNOS Removed. |vim-differences| {Nvim}
*hl-WarningMsg*
WarningMsg warning messages
*hl-WildMenu*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index bb3cce1552..6ad3dab246 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -131,6 +131,9 @@ MS-DOS support:
'bioskey'
'conskey'
+Highlight groups:
+ |hl-VisualNOS|
+
Other options:
'guipty'
'macatsui'
diff --git a/src/nvim/option.c b/src/nvim/option.c
index e168f0fd94..113c47f112 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -366,7 +366,7 @@ typedef struct vimoption {
"8:SpecialKey,~:EndOfBuffer,z:TermCursor,Z:TermCursorNC,@:NonText," \
"d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr," \
"N:CursorLineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title," \
- "v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn," \
+ "v:Visual,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn," \
"A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,-:Conceal," \
"B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel," \
"x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill," \