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)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 303786cc501a75329e264fe9552366ad77e5a726..c9c63acb4ee123cfdeb628ac1f9a2c9f0b221e5c 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3174,7 +3174,7 @@ static char_u     *arshape_buf = NULL;
 
 # if defined(EXITFREE) || defined(PROTO)
     void
-free_cmdline_buf(void)
+free_arshape_buf(void)
 {
     vim_free(arshape_buf);
 }

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

diff --git a/src/proto/ex_getln.pro b/src/proto/ex_getln.pro
index 8095eff142748c00dde7893f593e6dd78be9fce8..5d513707bfd2271ce7028fcdcf4e9ed4f532c4b3 100644 (file)
--- a/src/proto/ex_getln.pro
+++ b/src/proto/ex_getln.pro
@@ -12,7 +12,7 @@ char_u *getexmodeline(int promptc, void *cookie, int indent, int do_concat);
 int cmdline_overstrike(void);
 int cmdline_at_end(void);
 colnr_T cmdline_getvcol_cursor(void);
-void free_cmdline_buf(void);
+void free_arshape_buf(void);
 void putcmdline(int c, int shift);
 void unputcmdline(void);
 int put_on_cmdline(char_u *str, int len, int redraw);

diff --git a/src/version.c b/src/version.c
index 4759fd6edd465de588cfe2c1904595abcf222da9..59c3c51228f8aeac0556ad11e4677b5447b7f658 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1632,
 /**/
     1631,
 /**/