summaryrefslogtreecommitdiff
path: root/src/globals.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-01-04 12:42:13 +0100
committerBram Moolenaar <Bram@vim.org>2021-01-04 12:42:13 +0100
commitd93a7fc1a98a58f8101ee780d4735079ad99ae35 (patch)
tree15445b4ab17588d6786645d1ff1235dfd4bb9fb6 /src/globals.h
parent82c38fe508155c11a904e6111b5bfb6adde3fb9a (diff)
downloadvim-git-d93a7fc1a98a58f8101ee780d4735079ad99ae35.tar.gz
patch 8.2.2295: incsearch does not detect empty pattern properlyv8.2.2295
Problem: Incsearch does not detect empty pattern properly. Solution: Return magic state when skipping over a pattern. (Christian Brabandt, closes #7612, closes #6420)
Diffstat (limited to 'src/globals.h')
-rw-r--r--src/globals.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/globals.h b/src/globals.h
index dcb0f6324..e4e73f210 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1945,7 +1945,6 @@ EXTERN int channel_need_redraw INIT(= FALSE);
#define FOR_ALL_LIST_ITEMS(l, li) \
for ((li) = (l)->lv_first; (li) != NULL; (li) = (li)->li_next)
-// While executing a regexp and set to MAGIC_ON or MAGIC_OFF this overrules
-// p_magic. Otherwise set to MAGIC_NOT_SET.
-
-EXTERN magic_T magic_overruled INIT(= MAGIC_NOT_SET);
+// While executing a regexp and set to OPTION_MAGIC_ON or OPTION_MAGIC_OFF this
+// overrules p_magic. Otherwise set to OPTION_MAGIC_NOT_SET.
+EXTERN optmagic_T magic_overruled INIT(= OPTION_MAGIC_NOT_SET);