diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-05-07 20:01:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-07 20:01:16 +0100 |
| commit | 249591057b4840785c50e41dd850efb8a8faf435 (patch) | |
| tree | e9ba171529cf753e7aab0ec9adf5be3fedc17d00 /src/menu.c | |
| parent | 9ff7d717aa3176de5c61de340deb93f41c7780fc (diff) | |
patch 8.2.4911: the mode #defines are not clearly namedv8.2.4911
Problem: The mode #defines are not clearly named.
Solution: Prepend MODE_. Renumber them to put the mapped modes first.
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/menu.c b/src/menu.c index 2af54a7621..3c4236b86a 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1754,9 +1754,9 @@ get_menu_index(vimmenu_T *menu, int state) { int idx; - if ((state & INSERT)) + if ((state & MODE_INSERT)) idx = MENU_INDEX_INSERT; - else if (state & CMDLINE) + else if (state & MODE_CMDLINE) idx = MENU_INDEX_CMDLINE; #ifdef FEAT_TERMINAL else if (term_use_loop()) @@ -1769,11 +1769,11 @@ get_menu_index(vimmenu_T *menu, int state) else idx = MENU_INDEX_VISUAL; } - else if (state == HITRETURN || state == ASKMORE) + else if (state == MODE_HITRETURN || state == MODE_ASKMORE) idx = MENU_INDEX_CMDLINE; else if (finish_op) idx = MENU_INDEX_OP_PENDING; - else if ((state & NORMAL)) + else if ((state & MODE_NORMAL)) idx = MENU_INDEX_NORMAL; else idx = MENU_INDEX_INVALID; @@ -1929,15 +1929,16 @@ get_menu_mode(void) return MENU_INDEX_SELECT; return MENU_INDEX_VISUAL; } - if (State & INSERT) + if (State & MODE_INSERT) return MENU_INDEX_INSERT; - if ((State & CMDLINE) || State == ASKMORE || State == HITRETURN) + if ((State & MODE_CMDLINE) || State == MODE_ASKMORE + || State == MODE_HITRETURN) return MENU_INDEX_CMDLINE; if (finish_op) return MENU_INDEX_OP_PENDING; - if (State & NORMAL) + if (State & MODE_NORMAL) return MENU_INDEX_NORMAL; - if (State & LANGMAP) // must be a "r" command, like Insert mode + if (State & MODE_LANGMAP) // must be a "r" command, like Insert mode return MENU_INDEX_INSERT; return MENU_INDEX_INVALID; } |