Mercurial > vim
diff src/menu.c @ 28773:d770568e6c98 v8.2.4911
patch 8.2.4911: the mode #defines are not clearly named
Commit: https://github.com/vim/vim/commit/249591057b4840785c50e41dd850efb8a8faf435
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat May 7 20:01:16 2022 +0100
patch 8.2.4911: the mode #defines are not clearly named
Problem: The mode #defines are not clearly named.
Solution: Prepend MODE_. Renumber them to put the mapped modes first.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 07 May 2022 21:15:06 +0200 |
| parents | 9849df834f1d |
| children | d0241e74bfdb |
line wrap: on
line diff
--- a/src/menu.c +++ b/src/menu.c @@ -1754,9 +1754,9 @@ get_menu_index(vimmenu_T *menu, int stat { 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 stat 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; }