Skip to content

Commit 48ac671

Browse files
committed
patch 8.1.1632: build with EXITFREE but without +arabic fails
Problem: Build with EXITFREE but without +arabic fails. Solution: Rename the function and adjust #ifdefs. (closes #4613)
1 parent 4e03857 commit 48ac671

4 files changed

Lines changed: 15 additions & 11 deletions

File tree

src/ex_getln.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3174,7 +3174,7 @@ static char_u *arshape_buf = NULL;
31743174

31753175
# if defined(EXITFREE) || defined(PROTO)
31763176
void
3177-
free_cmdline_buf(void)
3177+
free_arshape_buf(void)
31783178
{
31793179
vim_free(arshape_buf);
31803180
}

src/misc2.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ free_all_mem(void)
10601060
spell_free_all();
10611061
# endif
10621062

1063-
#if defined(FEAT_INS_EXPAND) && defined(FEAT_BEVAL_TERM)
1063+
# if defined(FEAT_INS_EXPAND) && defined(FEAT_BEVAL_TERM)
10641064
ui_remove_balloon();
10651065
# endif
10661066

@@ -1092,7 +1092,7 @@ free_all_mem(void)
10921092
# endif
10931093
# if defined(FEAT_KEYMAP)
10941094
do_cmdline_cmd((char_u *)"set keymap=");
1095-
#endif
1095+
# endif
10961096
}
10971097

10981098
# ifdef FEAT_TITLE
@@ -1149,11 +1149,11 @@ free_all_mem(void)
11491149
# ifdef FEAT_CMDHIST
11501150
init_history();
11511151
# endif
1152-
#ifdef FEAT_TEXT_PROP
1152+
# ifdef FEAT_TEXT_PROP
11531153
clear_global_prop_types();
1154-
#endif
1154+
# endif
11551155

1156-
#ifdef FEAT_QUICKFIX
1156+
# ifdef FEAT_QUICKFIX
11571157
{
11581158
win_T *win;
11591159
tabpage_T *tab;
@@ -1163,7 +1163,7 @@ free_all_mem(void)
11631163
FOR_ALL_TAB_WINDOWS(tab, win)
11641164
qf_free_all(win);
11651165
}
1166-
#endif
1166+
# endif
11671167

11681168
// Close all script inputs.
11691169
close_all_scripts();
@@ -1177,9 +1177,9 @@ free_all_mem(void)
11771177

11781178
/* Free all buffers. Reset 'autochdir' to avoid accessing things that
11791179
* were freed already. */
1180-
#ifdef FEAT_AUTOCHDIR
1180+
# ifdef FEAT_AUTOCHDIR
11811181
p_acd = FALSE;
1182-
#endif
1182+
# endif
11831183
for (buf = firstbuf; buf != NULL; )
11841184
{
11851185
bufref_T bufref;
@@ -1193,7 +1193,9 @@ free_all_mem(void)
11931193
buf = firstbuf;
11941194
}
11951195

1196-
free_cmdline_buf();
1196+
# ifdef FEAT_ARABIC
1197+
free_arshape_buf();
1198+
# endif
11971199

11981200
/* Clear registers. */
11991201
clear_registers();

src/proto/ex_getln.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ char_u *getexmodeline(int promptc, void *cookie, int indent, int do_concat);
1212
int cmdline_overstrike(void);
1313
int cmdline_at_end(void);
1414
colnr_T cmdline_getvcol_cursor(void);
15-
void free_cmdline_buf(void);
15+
void free_arshape_buf(void);
1616
void putcmdline(int c, int shift);
1717
void unputcmdline(void);
1818
int put_on_cmdline(char_u *str, int len, int redraw);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,8 @@ static char *(features[]) =
777777

778778
static int included_patches[] =
779779
{ /* Add new patch number below this line */
780+
/**/
781+
1632,
780782
/**/
781783
1631,
782784
/**/

0 commit comments

Comments
 (0)