|
 |
3ddd898 |
To: vim_dev@googlegroups.com
|
|
|
3ddd898 |
Subject: Patch 7.4.391
|
|
|
3ddd898 |
Fcc: outbox
|
|
|
3ddd898 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
3ddd898 |
Mime-Version: 1.0
|
|
|
3ddd898 |
Content-Type: text/plain; charset=UTF-8
|
|
|
3ddd898 |
Content-Transfer-Encoding: 8bit
|
|
|
3ddd898 |
------------
|
|
|
3ddd898 |
|
|
|
3ddd898 |
Patch 7.4.391
|
|
|
3ddd898 |
Problem: No 'cursorline' highlighting when the cursor is on a line with
|
|
|
3ddd898 |
diff highlighting. (Benjamin Fritz)
|
|
|
3ddd898 |
Solution: Combine the highlight attributes. (Christian Brabandt)
|
|
|
3ddd898 |
Files: src/screen.c
|
|
|
3ddd898 |
|
|
|
3ddd898 |
|
|
|
3ddd898 |
*** ../vim-7.4.390/src/screen.c 2014-07-30 16:44:17.499534723 +0200
|
|
|
3ddd898 |
--- src/screen.c 2014-08-06 13:14:02.163278457 +0200
|
|
|
3ddd898 |
***************
|
|
|
3ddd898 |
*** 3702,3708 ****
|
|
|
3ddd898 |
--- 3702,3713 ----
|
|
|
3ddd898 |
char_attr = 0; /* was: hl_attr(HLF_AT); */
|
|
|
3ddd898 |
#ifdef FEAT_DIFF
|
|
|
3ddd898 |
if (diff_hlf != (hlf_T)0)
|
|
|
3ddd898 |
+ {
|
|
|
3ddd898 |
char_attr = hl_attr(diff_hlf);
|
|
|
3ddd898 |
+ if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
|
|
|
3ddd898 |
+ char_attr = hl_combine_attr(char_attr,
|
|
|
3ddd898 |
+ hl_attr(HLF_CUL));
|
|
|
3ddd898 |
+ }
|
|
|
3ddd898 |
#endif
|
|
|
3ddd898 |
p_extra = NULL;
|
|
|
3ddd898 |
c_extra = ' ';
|
|
|
3ddd898 |
***************
|
|
|
3ddd898 |
*** 3753,3759 ****
|
|
|
3ddd898 |
#ifdef FEAT_SYN_HL
|
|
|
3ddd898 |
/* combine 'showbreak' with 'cursorline' */
|
|
|
3ddd898 |
if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
|
|
|
3ddd898 |
! char_attr = hl_combine_attr(char_attr, HLF_CLN);
|
|
|
3ddd898 |
#endif
|
|
|
3ddd898 |
}
|
|
|
3ddd898 |
# endif
|
|
|
3ddd898 |
--- 3758,3765 ----
|
|
|
3ddd898 |
#ifdef FEAT_SYN_HL
|
|
|
3ddd898 |
/* combine 'showbreak' with 'cursorline' */
|
|
|
3ddd898 |
if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
|
|
|
3ddd898 |
! char_attr = hl_combine_attr(char_attr,
|
|
|
3ddd898 |
! hl_attr(HLF_CUL));
|
|
|
3ddd898 |
#endif
|
|
|
3ddd898 |
}
|
|
|
3ddd898 |
# endif
|
|
|
3ddd898 |
***************
|
|
|
3ddd898 |
*** 3931,3936 ****
|
|
|
3ddd898 |
--- 3937,3944 ----
|
|
|
3ddd898 |
&& n_extra == 0)
|
|
|
3ddd898 |
diff_hlf = HLF_CHD; /* changed line */
|
|
|
3ddd898 |
line_attr = hl_attr(diff_hlf);
|
|
|
3ddd898 |
+ if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
|
|
|
3ddd898 |
+ line_attr = hl_combine_attr(line_attr, hl_attr(HLF_CUL));
|
|
|
3ddd898 |
}
|
|
|
3ddd898 |
#endif
|
|
|
3ddd898 |
|
|
|
3ddd898 |
***************
|
|
|
3ddd898 |
*** 4729,4735 ****
|
|
|
3ddd898 |
--- 4737,4748 ----
|
|
|
3ddd898 |
{
|
|
|
3ddd898 |
diff_hlf = HLF_CHD;
|
|
|
3ddd898 |
if (attr == 0 || char_attr != attr)
|
|
|
3ddd898 |
+ {
|
|
|
3ddd898 |
char_attr = hl_attr(diff_hlf);
|
|
|
3ddd898 |
+ if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
|
|
|
3ddd898 |
+ char_attr = hl_combine_attr(char_attr,
|
|
|
3ddd898 |
+ hl_attr(HLF_CUL));
|
|
|
3ddd898 |
+ }
|
|
|
3ddd898 |
}
|
|
|
3ddd898 |
# endif
|
|
|
3ddd898 |
}
|
|
|
3ddd898 |
***************
|
|
|
3ddd898 |
*** 10174,10182 ****
|
|
|
3ddd898 |
break;
|
|
|
3ddd898 |
screen_puts_len(NameBuff, len, 0, col,
|
|
|
3ddd898 |
#if defined(FEAT_SYN_HL)
|
|
|
3ddd898 |
! hl_combine_attr(attr, hl_attr(HLF_T))
|
|
|
3ddd898 |
#else
|
|
|
3ddd898 |
! attr
|
|
|
3ddd898 |
#endif
|
|
|
3ddd898 |
);
|
|
|
3ddd898 |
col += len;
|
|
|
3ddd898 |
--- 10187,10195 ----
|
|
|
3ddd898 |
break;
|
|
|
3ddd898 |
screen_puts_len(NameBuff, len, 0, col,
|
|
|
3ddd898 |
#if defined(FEAT_SYN_HL)
|
|
|
3ddd898 |
! hl_combine_attr(attr, hl_attr(HLF_T))
|
|
|
3ddd898 |
#else
|
|
|
3ddd898 |
! attr
|
|
|
3ddd898 |
#endif
|
|
|
3ddd898 |
);
|
|
|
3ddd898 |
col += len;
|
|
|
3ddd898 |
*** ../vim-7.4.390/src/version.c 2014-08-06 12:49:06.711289205 +0200
|
|
|
3ddd898 |
--- src/version.c 2014-08-06 13:19:19.135276179 +0200
|
|
|
3ddd898 |
***************
|
|
|
3ddd898 |
*** 736,737 ****
|
|
|
3ddd898 |
--- 736,739 ----
|
|
|
3ddd898 |
{ /* Add new patch number below this line */
|
|
|
3ddd898 |
+ /**/
|
|
|
3ddd898 |
+ 391,
|
|
|
3ddd898 |
/**/
|
|
|
3ddd898 |
|
|
|
3ddd898 |
--
|
|
|
3ddd898 |
It's totally unfair to suggest - as many have - that engineers are socially
|
|
|
3ddd898 |
inept. Engineers simply have different objectives when it comes to social
|
|
|
3ddd898 |
interaction.
|
|
|
3ddd898 |
(Scott Adams - The Dilbert principle)
|
|
|
3ddd898 |
|
|
|
3ddd898 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
3ddd898 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
3ddd898 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
3ddd898 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|