New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hl-Syntax can override 'cursorline', 'cursorcolumn' #7364

Merged
merged 2 commits into from Oct 7, 2017

Conversation

Projects
None yet
3 participants
@justinmk
Member

justinmk commented Oct 7, 2017

Rebase of #6380

  • Break out 'cursorcolumn'/'colorcolumn' change into a separate commit (so that the higher-risk change for 'cursorline' can be reverted if necessary)
  • Document change in vim_diff.txt

@justinmk justinmk force-pushed the justinmk:syn-override-cursorline branch from b70cd3a to ba118c9 Oct 7, 2017

@justinmk justinmk force-pushed the justinmk:syn-override-cursorline branch from ba118c9 to d1874ab Oct 7, 2017

@justinmk justinmk added this to the 0.2.1 milestone Oct 7, 2017

@justinmk justinmk added the syntax label Oct 7, 2017

@justinmk justinmk referenced this pull request Oct 7, 2017

Merged

[RFC] doc; minor runtime bug fixes #7188

1 of 1 task complete

@justinmk justinmk merged commit 032b088 into neovim:master Oct 7, 2017

2 of 3 checks passed

QuickBuild Build pr-7364 finished with status FAILED
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@justinmk justinmk deleted the justinmk:syn-override-cursorline branch Oct 7, 2017

@justinmk

This comment has been minimized.

Member

justinmk commented Oct 15, 2017

For reference: part of this PR (d1874ab) was reverted in #7400. Tentative future plan is:

If foreground is defined on CursorLine we can't just assume it should be low priority.

Compromise:

  • low-priority CursorLine if only background is set (foreground is not set)
  • high-priority ("same as Vim" priority) CursorLine if foreground and background are set
Highlights of vertical separators are determined by the window to the
left of the separator. The highlight of a tabpage in |tabline| is
determined by the last focused window in the tabpage. Highlights of
determine by the last-focused window of the tabpage. Highlights of

This comment has been minimized.

@bfredl

bfredl Oct 23, 2017

Member

The old "determined" was correct

justinmk added a commit to justinmk/neovim that referenced this pull request Nov 8, 2017

NVIM v0.2.1
FEATURES:
0e873a3 Lua(Jit) built-in neovim#4411
5b32bce Windows: `:terminal` neovim#7007
7b0ceb3 UI/API: externalize cmdline neovim#7173
b67f58b UI/API: externalize wildmenu neovim#7454
b23aa1c UI: 'winhighlight' neovim#6597
17531ed UI: command-line coloring (`:help input()-highlight`) neovim#6364
244a1f9 API: execute lua directly from the remote api neovim#6704
45626de API: `get_keymap()` neovim#6236
db99982 API: `nvim_get_hl_by_name()`, `nvim_get_hl_by_id()` neovim#7082
dc68538 menu_get() function neovim#6322
9db42d4 :cquit : take an error code argument neovim#7336
9cc185d job-control: serverstart(): support ipv6 neovim#6680
1b7a9bf job-control: sockopen() neovim#6594
6efe84a clipboard: fallback to tmux clipboard neovim#6894
6016ac2 clipboard: customize clipboard with `g:clipboard` neovim#6030
3a86dd5 ruby: override ruby host via `g:ruby_host_prog` neovim#6841
16cce1a debug: $NVIM_LOG_FILE neovim#6827
0cba3da `:checkhealth` built-in, validates $VIMRUNTIME neovim#7399

FIXES:
105d680 TUI: more terminals, improve scroll/resize neovim#6816
cb912a3 :terminal : handle F1-F12, other keys neovim#7241
619838f inccommand: improve performance neovim#6949
04b3c32 inccommand: Fix matches for zero-width neovim#7487
60b1e8a inccommand: multiline, other fixes neovim#7315
f1f7f3b inccommand: Ignore leading modifiers in the command neovim#6967
1551f71 inccommand: fix 'gdefault' lockup neovim#7262
6338199 API: bufhl: support creating new groups neovim#7414
541dde3 API: allow K_EVENT during operator-pending
8c732f7 terminal: adjust for 'number' neovim#7440
5bec946 UI: preserve wildmenu during jobs/events neovim#7110
c349083 UI: disable 'lazyredraw' during ui_refresh. neovim#6259
51808a2 send FocusGained/FocusLost event instead of pseudokey neovim#7221
133f8bc shada: preserve unnamed register on restart neovim#4700
1b70a1d shada: avoid assertion on corrupt shada file neovim#6958
9f534f3 mksession: Restore tab-local working directory neovim#6859
de1084f fix buf_write() crash neovim#7140
7f76986 syntax: register 'Normal' highlight group neovim#6973
6e7a8c3 RPC: close channel if stream was closed neovim#7081
85f3084 clipboard: disallow recursion; show hint only once neovim#7203
8d1ccb6 clipboard: performance, avoid weird edge-cases neovim#7193
01487d4 'titleold' neovim#7358
01e53a5 Windows: better path-handling, separator (slash) hygiene neovim#7349
0f2873c Windows: multibyte startup arguments neovim#7060

CHANGES:
9ff0cc7 :terminal : start in normal-mode neovim#6808
032b088 lower priority of 'cursorcolumn', 'colorcolumn' neovim#7364
2a3bcd1 RPC: Don't delay notifications when request is pending neovim#6544
023f67c :terminal : Do not change 'number', 'relativenumber' neovim#6796
1ef2d76 socket.c: Disable Nagle's algorithm on TCP sockets neovim#6915
6720fe2 help: `K` tries Vim help instead of manpage neovim#3104
7068370 help, man.vim: change "outline" map to `gO` neovim#7405

@justinmk justinmk referenced this pull request Nov 8, 2017

Merged

NVIM v0.2.1 #7505

@danielyli

This comment has been minimized.

danielyli commented Dec 8, 2017

I’m still seeing CursorLine background colors overriding ErrorMsg background colors in 0.2.2. Is this expected?

@justinmk

This comment has been minimized.

Member

justinmk commented Dec 8, 2017

The code was reverted, so no.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment