diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-31 22:00:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-31 22:00:05 +0200 |
| commit | 39f7aa3c3124065b50f182b1d2f7ac92a0918656 (patch) | |
| tree | 238fc2ad919f9e66aca9519d9dd30585ae918d2a /runtime | |
| parent | 7d6979608ee83b06ccfab2589da3047b143defae (diff) | |
patch 8.2.1556: cursorline highlighting always overrules sign highlightingv8.2.1556
Problem: Cursorline highlighting always overrules sign highlighting.
Solution: Combine the highlighting, use the priority to decide how.
(closes #6812)
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/sign.txt | 6 | ||||
| -rw-r--r-- | runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index 1e88a62ffa..46cb9b59c3 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 8.2. Last change: 2019 Nov 30 +*sign.txt* For Vim version 8.2. Last change: 2020 Aug 31 VIM REFERENCE MANUAL by Gordon Prieur @@ -85,6 +85,10 @@ When the line on which the sign is placed is deleted, the sign is moved to the next line (or the last line of the buffer, if there is no next line). When the delete is undone the sign does not move back. +When a sign with line highlighting and 'cursorline' highlighting are both +present, if the priority is 100 or more then the sign highlighting takes +precedence, otherwise the 'cursorline' highlighting. + ============================================================================== 2. Commands *sign-commands* *:sig* *:sign* diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index 6680b48cce..832dcf584b 100644 --- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -2,7 +2,7 @@ " " Author: Bram Moolenaar " Copyright: Vim license applies, see ":help license" -" Last Change: 2020 Jul 12 +" Last Change: 2020 Aug 31 " " WORK IN PROGRESS - Only the basics work " Note: On MS-Windows you need a recent version of gdb. The one included with @@ -937,7 +937,7 @@ func s:HandleCursor(msg) endif exe lnum exe 'sign unplace ' . s:pc_id - exe 'sign place ' . s:pc_id . ' line=' . lnum . ' name=debugPC file=' . fname + exe 'sign place ' . s:pc_id . ' line=' . lnum . ' name=debugPC priority=110 file=' . fname setlocal signcolumn=yes endif elseif !s:stopped || fname != '' |