]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.1282 v7.3.1282
authorBram Moolenaar <Bram@vim.org>
Mon, 1 Jul 2013 18:18:33 +0000 (20:18 +0200)
committerBram Moolenaar <Bram@vim.org>
Mon, 1 Jul 2013 18:18:33 +0000 (20:18 +0200)
Problem:    'cursorline' not drawn in any other window. (Charles Campbell)
Solution:   Do draw the cursor line in other windows.

src/screen.c
src/version.c

index eb1b1df4961a495eb764dfdf7682f19e295f0720..661da039cd81fd79930516dee5d51b20f4acdf55 100644 (file)
@@ -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
                }
index 5cd95de377ca6783b77ea8336c32aa0ca8db3986..9647ed3e36368eabeb5b7ce575c2d64c456254f9 100644 (file)
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1282,
 /**/
     1281,
 /**/