Mercurial > vim

comparison src/screen.c @ 5078:22ac43fb6d30 v7.3.1282

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.1282 Problem: 'cursorline' not drawn in any other window. (Charles Campbell) Solution: Do draw the cursor line in other windows.
author Bram Moolenaar <bram@vim.org>
date Mon, 01 Jul 2013 20:18:33 +0200
parents 6a7ae677d6a1
children 8b7baf39a345
comparison
equal deleted inserted replaced
5077:a041ca5ae9a8 5078:22ac43fb6d30
3367 3367
3368 #ifdef FEAT_SYN_HL 3368 #ifdef FEAT_SYN_HL
3369 /* Cursor line highlighting for 'cursorline' in the current window. Not 3369 /* Cursor line highlighting for 'cursorline' in the current window. Not
3370 * when Visual mode is active, because it's not clear what is selected 3370 * when Visual mode is active, because it's not clear what is selected
3371 * then. */ 3371 * then. */
3372 if (wp->w_p_cul && wp == curwin && lnum == wp->w_cursor.lnum 3372 if (wp->w_p_cul && lnum == wp->w_cursor.lnum
3373 && !VIsual_active) 3373 && !(wp == curwin && VIsual_active))
3374 { 3374 {
3375 line_attr = hl_attr(HLF_CUL); 3375 line_attr = hl_attr(HLF_CUL);
3376 area_highlighting = TRUE; 3376 area_highlighting = TRUE;
3377 } 3377 }
3378 #endif 3378 #endif
3541 #ifdef FEAT_SYN_HL 3541 #ifdef FEAT_SYN_HL
3542 /* When 'cursorline' is set highlight the line number of 3542 /* When 'cursorline' is set highlight the line number of
3543 * the current line differently. 3543 * the current line differently.
3544 * TODO: Can we use CursorLine instead of CursorLineNr 3544 * TODO: Can we use CursorLine instead of CursorLineNr
3545 * when CursorLineNr isn't set? */ 3545 * when CursorLineNr isn't set? */
3546 if (((wp->w_p_cul && wp == curwin) || wp->w_p_rnu) 3546 if ((wp->w_p_cul || wp->w_p_rnu)
3547 && lnum == wp->w_cursor.lnum) 3547 && lnum == wp->w_cursor.lnum)
3548 char_attr = hl_attr(HLF_CLN); 3548 char_attr = hl_attr(HLF_CLN);
3549 #endif 3549 #endif
3550 } 3550 }
3551 } 3551 }
3584 * required when 'linebreak' is also set. */ 3584 * required when 'linebreak' is also set. */
3585 if (tocol == vcol) 3585 if (tocol == vcol)
3586 tocol += n_extra; 3586 tocol += n_extra;
3587 #ifdef FEAT_SYN_HL 3587 #ifdef FEAT_SYN_HL
3588 /* combine 'showbreak' with 'cursorline' */ 3588 /* combine 'showbreak' with 'cursorline' */
3589 if (wp->w_p_cul && wp == curwin 3589 if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
3590 && lnum == wp->w_cursor.lnum)
3591 char_attr = hl_combine_attr(char_attr, HLF_CLN); 3590 char_attr = hl_combine_attr(char_attr, HLF_CLN);
3592 #endif 3591 #endif
3593 } 3592 }
3594 # endif 3593 # endif
3595 } 3594 }