summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-07-01 20:18:33 +0200
committerBram Moolenaar <Bram@vim.org>2013-07-01 20:18:33 +0200
commitbd65c4647874e32c91a0d32c828fe6de445e5502 (patch)
tree05d8b53dea3c347d65f0e869399ef5568e628106
parent0e710d603e8ca42f746cd3862ed4022802e66110 (diff)
updated for version 7.3.1282v7.3.1282
Problem: 'cursorline' not drawn in any other window. (Charles Campbell) Solution: Do draw the cursor line in other windows.
-rw-r--r--src/screen.c9
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/screen.c b/src/screen.c
index eb1b1df496..661da039cd 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3369,8 +3369,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
/* Cursor line highlighting for 'cursorline' in the current window. Not
* when Visual mode is active, because it's not clear what is selected
* then. */
- if (wp->w_p_cul && wp == curwin && lnum == wp->w_cursor.lnum
- && !VIsual_active)
+ if (wp->w_p_cul && lnum == wp->w_cursor.lnum
+ && !(wp == curwin && VIsual_active))
{
line_attr = hl_attr(HLF_CUL);
area_highlighting = TRUE;
@@ -3543,7 +3543,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
* the current line differently.
* TODO: Can we use CursorLine instead of CursorLineNr
* when CursorLineNr isn't set? */
- if (((wp->w_p_cul && wp == curwin) || wp->w_p_rnu)
+ if ((wp->w_p_cul || wp->w_p_rnu)
&& lnum == wp->w_cursor.lnum)
char_attr = hl_attr(HLF_CLN);
#endif
@@ -3586,8 +3586,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
tocol += n_extra;
#ifdef FEAT_SYN_HL
/* combine 'showbreak' with 'cursorline' */
- if (wp->w_p_cul && wp == curwin
- && lnum == wp->w_cursor.lnum)
+ if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
char_attr = hl_combine_attr(char_attr, HLF_CLN);
#endif
}
diff --git a/src/version.c b/src/version.c
index 5cd95de377..9647ed3e36 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1282,
+/**/
1281,
/**/
1280,