patch 8.2.0152: restoring ctrl_x_mode is not needed

Problem:    Restoring ctrl_x_mode is not needed.
Solution:   Remove restoring the old value, it's changed again soon.

diff --git a/src/insexpand.c b/src/insexpand.c
index 454e2e3f9c85b8aff69df623d1b089b217aabc16..e3c811a50b00430fa1c0189bcec32e3e04c14a54 100644 (file)
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -2061,17 +2061,12 @@ ins_compl_prep(int c)
 
            auto_format(FALSE, TRUE);
 
-           {
-               int new_mode = ctrl_x_mode;
-
-               // Trigger the CompleteDone event to give scripts a chance to
-               // act upon the completion.  Do this before clearing the info,
-               // and restore ctrl_x_mode, so that complete_info() can be
-               // used.
-               ctrl_x_mode = prev_mode;
-               ins_apply_autocmds(EVENT_COMPLETEDONE);
-               ctrl_x_mode = new_mode;
-           }
+           // Trigger the CompleteDone event to give scripts a chance to
+           // act upon the completion.  Do this before clearing the info,
+           // and restore ctrl_x_mode, so that complete_info() can be
+           // used.
+           ctrl_x_mode = prev_mode;
+           ins_apply_autocmds(EVENT_COMPLETEDONE);
 
            ins_compl_free();
            compl_started = FALSE;

diff --git a/src/version.c b/src/version.c
index 88fadc7490ae801b020da944e962b611897d7170..d9543e18df3d2d91cc8d71c87765041caa4c6e8b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    152,
 /**/
     151,
 /**/