changeset 19187:1f67e58e7f8c v8.2.0152

patch 8.2.0152: restoring ctrl_x_mode is not needed Commit: https://github.com/vim/vim/commit/da812e282a4e2d6d8c9604a3a2a38396437dfe20 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 26 18:35:31 2020 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 Jan 2020 18:45:03 +0100
parents fb5a7c75b07e
children dde53931f9e2
files src/insexpand.c src/version.c
diffstat 2 files changed, 8 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    152,
+/**/
     151,
 /**/
     150,