aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-18 07:54:29 -04:00
Code Activity

patch 9.1.1637: FEAT_DIFF used in diff.pro

Browse Source 
Problem:  FEAT_DIFF used in diff.pro
Solution: Remove it from the diff protocol file
          (Yegappan Lakshmanan)

closes: #18005

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2025-08-16 17:33:53 +02:00
committed by Christian Brabandt
parent 90f5d67840
commit 3281a0ae62
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto.h
View File

@@ -73,7 +73,9 @@ extern int _stricoll(char *a, char *b);
# include "if_cscope.pro" # include "if_cscope.pro"
# include "debugger.pro" # include "debugger.pro"
# include "dict.pro" # include "dict.pro"
# ifdef FEAT_DIFF
# include "diff.pro" # include "diff.pro"
# endif
# include "linematch.pro" # include "linematch.pro"
# include "digraph.pro" # include "digraph.pro"
# include "drawline.pro" # include "drawline.pro"

2
src/proto/diff.pro
View File

@@ -22,10 +22,8 @@ int diffopt_horizontal(void);
int diffopt_hiddenoff(void); int diffopt_hiddenoff(void);
int diffopt_closeoff(void); int diffopt_closeoff(void);
void diff_update_line(linenr_T lnum); void diff_update_line(linenr_T lnum);
#ifdef FEAT_DIFF
int diff_change_parse(diffline_T *diffline, diffline_change_T *change, int *change_start, int *change_end); int diff_change_parse(diffline_T *diffline, diffline_change_T *change, int *change_start, int *change_end);
int diff_find_change(win_T *wp, linenr_T lnum, diffline_T *diffline); int diff_find_change(win_T *wp, linenr_T lnum, diffline_T *diffline);
#endif
int diff_infold(win_T *wp, linenr_T lnum); int diff_infold(win_T *wp, linenr_T lnum);
void nv_diffgetput(int put, long count); void nv_diffgetput(int put, long count);
void ex_diffgetput(exarg_T *eap); void ex_diffgetput(exarg_T *eap);

2
src/structs.h
View File

@@ -3606,7 +3606,7 @@ struct file_buffer
}; // file_buffer }; // file_buffer
#ifdef FEAT_DIFF #if defined(FEAT_DIFF) || defined(PROTO)
/* /*
* Stuff for diff mode. * Stuff for diff mode.
*/ */

2
src/version.c
View File

@@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1637,
/**/ /**/
1636, 1636,
/**/ /**/