From da812e282a4e2d6d8c9604a3a2a38396437dfe20 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 26 Jan 2020 18:35:31 +0100 Subject: [PATCH] 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. --- src/insexpand.c | 17 ++++++----------- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/insexpand.c b/src/insexpand.c index 454e2e3f9c..e3c811a50b 100644 --- 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 88fadc7490..d9543e18df 100644 --- 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, /**/