mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 19:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove FEAT_DIFF

Browse Source 
Support for vim's diff mode.
This commit is contained in:
Hinidu
2014-04-08 23:55:58 +03:00
committed by Justin M. Keyes
parent dd7657c160
commit 6f38fe39c4
3 changed files with 12 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/nvim/screen.c
View File

@@ -2301,11 +2301,7 @@ win_line (
int change_end = -1; /* last col of changed area */
colnr_T trailcol = MAXCOL; /* start of trailing spaces */
int need_showbreak = FALSE;
#if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \
|| defined(FEAT_SYN_HL) || defined(FEAT_DIFF)
# define LINE_ATTR
int line_attr = 0; /* attribute for the whole line */
#endif
matchitem_T *cur; /* points to the match list */
match_T *shl; /* points to search_hl or a match */
int shl_flag; /* flag to indicate whether search_hl
@@ -2315,9 +2311,7 @@ win_line (
of the matches */
int prev_c = 0; /* previous Arabic character */
int prev_c1 = 0; /* first composing char for prev_c */
#if defined(LINE_ATTR)
int did_line_attr = 0;
#endif
/* draw_state: items that are drawn in sequence: */
#define WL_START 0 /* nothing done yet */
@@ -2518,7 +2512,6 @@ win_line (
filler_lines = wp->w_topfill;
filler_todo = filler_lines;
#ifdef LINE_ATTR
/* If this line has a sign with line highlighting set line_attr. */
v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL);
if (v != 0)
@@ -2529,7 +2522,6 @@ win_line (
line_attr = hl_attr(HLF_L);
if (line_attr != 0)
area_highlighting = TRUE;
#endif
line = ml_get_buf(wp->w_buffer, lnum, FALSE);
ptr = line;
@@ -3036,14 +3028,12 @@ win_line (
char_attr = area_attr;
else if (search_attr != 0)
char_attr = search_attr;
#ifdef LINE_ATTR
/* Use line_attr when not in the Visual or 'incsearch' area
* (area_attr may be 0 when "noinvcur" is set). */
else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL)
|| vcol < fromcol || vcol_prev < fromcol_prev
|| vcol >= tocol))
char_attr = line_attr;
#endif
else {
attr_pri = FALSE;
if (has_syntax)
@@ -3509,15 +3499,7 @@ win_line (
* character if the line break is included. */
/* For a diff line the highlighting continues after the
* "$". */
if (
diff_hlf == (hlf_T)0
# ifdef LINE_ATTR
&&
# endif
# ifdef LINE_ATTR
line_attr == 0
# endif
) {
if (diff_hlf == (hlf_T)0 && line_attr == 0) {
/* In virtualedit, visual selections may extend
* beyond end of line. */
if (area_highlighting && virtual_active()
@@ -3570,9 +3552,7 @@ win_line (
(col < W_WIDTH(wp)))) {
c = ' ';
--ptr; /* put it back at the NUL */
}
#if defined(LINE_ATTR)
else if ((
} else if ((
diff_hlf != (hlf_T)0 ||
line_attr != 0
) && (
@@ -3596,7 +3576,6 @@ win_line (
char_attr = hl_attr(diff_hlf);
}
}
#endif
}
if ( wp->w_p_cole > 0
@@ -3705,11 +3684,7 @@ win_line (
/*
* At end of the text line or just after the last character.
*/
if (c == NUL
#if defined(LINE_ATTR)
|| did_line_attr == 1
#endif
) {
if (c == NUL || did_line_attr == 1) {
long prevcol = (long)(ptr - line) - (c == NUL);
/* we're not really at that column when skipping some text */
@@ -3740,11 +3715,7 @@ win_line (
|| lnum == curwin->w_cursor.lnum)
&& c == NUL)
/* highlight 'hlsearch' match at end of line */
|| (prevcol_hl_flag == TRUE
# if defined(LINE_ATTR)
&& did_line_attr <= 1
# endif
)
|| (prevcol_hl_flag == TRUE && did_line_attr <= 1)
)) {
int n = 0;