summaryrefslogtreecommitdiff
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
commit18c7549113ecc18bb59b4de033ea51e8629e7dd3 (patch)
tree278d0a744b3bb70830315fb5192e8a2b52567189
parentcc27ae76c2c0cc6836e8058e508c6405fe20b18a (diff)
downloadvim-18c7549113ecc18bb59b4de033ea51e8629e7dd3.tar.gz
updated for version 7.3.1282v7.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 eb1b1df4..661da039 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 5cd95de3..9647ed3e 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,