aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.1.1632: build with EXITFREE but without +arabic fails

Browse Source 
Problem:    Build with EXITFREE but without +arabic fails.
Solution:   Rename the function and adjust #ifdefs. (closes #4613)
This commit is contained in:
Bram Moolenaar
2019-07-04 20:26:21 +02:00
parent 4e038571aa
commit 48ac671fe5
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ex_getln.c
View File

@@ -3174,7 +3174,7 @@ static char_u *arshape_buf = NULL;
# if defined(EXITFREE) || defined(PROTO) # if defined(EXITFREE) || defined(PROTO)
void void
free_cmdline_buf(void) free_arshape_buf(void)
{ {
vim_free(arshape_buf); vim_free(arshape_buf);
} }

20
src/misc2.c
View File

@@ -1060,7 +1060,7 @@ free_all_mem(void)
spell_free_all(); spell_free_all();
# endif # endif
#if defined(FEAT_INS_EXPAND) && defined(FEAT_BEVAL_TERM) # if defined(FEAT_INS_EXPAND) && defined(FEAT_BEVAL_TERM)
ui_remove_balloon(); ui_remove_balloon();
# endif # endif
@@ -1092,7 +1092,7 @@ free_all_mem(void)
# endif # endif
# if defined(FEAT_KEYMAP) # if defined(FEAT_KEYMAP)
do_cmdline_cmd((char_u *)"set keymap="); do_cmdline_cmd((char_u *)"set keymap=");
#endif # endif
} }
# ifdef FEAT_TITLE # ifdef FEAT_TITLE
@@ -1149,11 +1149,11 @@ free_all_mem(void)
# ifdef FEAT_CMDHIST # ifdef FEAT_CMDHIST
init_history(); init_history();
# endif # endif
#ifdef FEAT_TEXT_PROP # ifdef FEAT_TEXT_PROP
clear_global_prop_types(); clear_global_prop_types();
#endif # endif
#ifdef FEAT_QUICKFIX # ifdef FEAT_QUICKFIX
{ {
win_T *win; win_T *win;
tabpage_T *tab; tabpage_T *tab;
@@ -1163,7 +1163,7 @@ free_all_mem(void)
FOR_ALL_TAB_WINDOWS(tab, win) FOR_ALL_TAB_WINDOWS(tab, win)
qf_free_all(win); qf_free_all(win);
} }
#endif # endif
// Close all script inputs. // Close all script inputs.
close_all_scripts(); close_all_scripts();
@@ -1177,9 +1177,9 @@ free_all_mem(void)
/* Free all buffers. Reset 'autochdir' to avoid accessing things that /* Free all buffers. Reset 'autochdir' to avoid accessing things that
* were freed already. */ * were freed already. */
#ifdef FEAT_AUTOCHDIR # ifdef FEAT_AUTOCHDIR
p_acd = FALSE; p_acd = FALSE;
#endif # endif
for (buf = firstbuf; buf != NULL; ) for (buf = firstbuf; buf != NULL; )
{ {
bufref_T bufref; bufref_T bufref;
@@ -1193,7 +1193,9 @@ free_all_mem(void)
buf = firstbuf; buf = firstbuf;
} }
free_cmdline_buf(); # ifdef FEAT_ARABIC
free_arshape_buf();
# endif
/* Clear registers. */ /* Clear registers. */
clear_registers(); clear_registers();

2
src/proto/ex_getln.pro
View File

@@ -12,7 +12,7 @@ char_u *getexmodeline(int promptc, void *cookie, int indent, int do_concat);
int cmdline_overstrike(void); int cmdline_overstrike(void);
int cmdline_at_end(void); int cmdline_at_end(void);
colnr_T cmdline_getvcol_cursor(void); colnr_T cmdline_getvcol_cursor(void);
void free_cmdline_buf(void); void free_arshape_buf(void);
void putcmdline(int c, int shift); void putcmdline(int c, int shift);
void unputcmdline(void); void unputcmdline(void);
int put_on_cmdline(char_u *str, int len, int redraw); int put_on_cmdline(char_u *str, int len, int redraw);

2
src/version.c
View File

@@ -777,6 +777,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 */
/**/
1632,
/**/ /**/
1631, 1631,
/**/ /**/