diff --git a/src/ex_getln.c b/src/ex_getln.c
index 303786c..c9c63ac 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3174,7 +3174,7 @@
 
 # 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 be9233f..892fbc5 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1060,7 +1060,7 @@
     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 @@
 # endif
 # if defined(FEAT_KEYMAP)
 	do_cmdline_cmd((char_u *)"set keymap=");
-#endif
+# endif
     }
 
 # ifdef FEAT_TITLE
@@ -1149,11 +1149,11 @@
 # 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 @@
 	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 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 @@
 	    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 8095eff..5d51370 100644
--- a/src/proto/ex_getln.pro
+++ b/src/proto/ex_getln.pro
@@ -12,7 +12,7 @@
 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 4759fd6..59c3c51 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1632,
+/**/
     1631,
 /**/
     1630,