commit d93a7fc1a98a58f8101ee780d4735079ad99ae35
author Bram Moolenaar <Bram@vim.org> Mon Jan 04 12:42:13 2021 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Jan 04 12:42:13 2021 +0100
tree 15445b4ab17588d6786645d1ff1235dfd4bb9fb6
parent 82c38fe508155c11a904e6111b5bfb6adde3fb9a

patch 8.2.2295: incsearch does not detect empty pattern properly

Problem:    Incsearch does not detect empty pattern properly.
Solution:   Return magic state when skipping over a pattern. (Christian
            Brabandt, closes #7612, closes #6420)

src/option.c

diff --git a/src/option.c b/src/option.c
index 094a723..b4893a1 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7009,9 +7009,9 @@
 {
     switch (magic_overruled)
     {
-	case MAGIC_ON:      return TRUE;
-	case MAGIC_OFF:     return FALSE;
-	case MAGIC_NOT_SET: break;
+	case OPTION_MAGIC_ON:      return TRUE;
+	case OPTION_MAGIC_OFF:     return FALSE;
+	case OPTION_MAGIC_NOT_SET: break;
     }
 #ifdef FEAT_EVAL
     if (in_vim9script())