summaryrefslogtreecommitdiffstats
path: root/src/globals.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-09-28 22:29:58 +0200
committerBram Moolenaar <Bram@vim.org>2020-09-28 22:29:58 +0200
commit4934ad0e448bfa03ba19c7c5b411c457a9910442 (patch)
treebe240c37e3e2be89bde36969b2287a934b4209fc /src/globals.h
parentd58a3bf7dac8d53faf42e13cc1152b110f12c404 (diff)
patch 8.2.1769: popup filter interferes with using :normal to move the cursorv8.2.1769
Problem: A popup filter interferes with using :normal to move the cursor in a popup. Solution: Do not invoke the filter when ex_normal_busy is set.
Diffstat (limited to 'src/globals.h')
-rw-r--r--src/globals.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/globals.h b/src/globals.h
index eb33507d9f..4ca3092e9d 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1150,12 +1150,9 @@ EXTERN typebuf_T typebuf // typeahead buffer
= {NULL, NULL, 0, 0, 0, 0, 0, 0, 0}
#endif
;
-EXTERN int ex_normal_busy INIT(= 0); // recursiveness of ex_normal()
-EXTERN int ex_normal_lock INIT(= 0); // forbid use of ex_normal()
-#ifdef FEAT_PROP_POPUP
-// Set to TRUE when ex_normal_busy is set and out of typeahead.
-EXTERN int ex_normal_busy_done INIT(= FALSE);
-#endif
+EXTERN int ex_normal_busy INIT(= 0); // recursiveness of ex_normal()
+EXTERN int in_feedkeys INIT(= 0); // ex_normal_busy set in feedkeys()
+EXTERN int ex_normal_lock INIT(= 0); // forbid use of ex_normal()
#ifdef FEAT_EVAL
EXTERN int ignore_script INIT(= FALSE); // ignore script input