Mercurial > vim

comparison src/menu.c @ 28773:d770568e6c98 v8.2.4911

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
28772:7b07ca0bb292 28773:d770568e6c98
1752 int 1752 int
1753 get_menu_index(vimmenu_T *menu, int state) 1753 get_menu_index(vimmenu_T *menu, int state)
1754 { 1754 {
1755 int idx; 1755 int idx;
1756 1756
1757 if ((state & INSERT)) 1757 if ((state & MODE_INSERT))
1758 idx = MENU_INDEX_INSERT; 1758 idx = MENU_INDEX_INSERT;
1759 else if (state & CMDLINE) 1759 else if (state & MODE_CMDLINE)
1760 idx = MENU_INDEX_CMDLINE; 1760 idx = MENU_INDEX_CMDLINE;
1761 #ifdef FEAT_TERMINAL 1761 #ifdef FEAT_TERMINAL
1762 else if (term_use_loop()) 1762 else if (term_use_loop())
1763 idx = MENU_INDEX_TERMINAL; 1763 idx = MENU_INDEX_TERMINAL;
1764 #endif 1764 #endif
1767 if (VIsual_select) 1767 if (VIsual_select)
1768 idx = MENU_INDEX_SELECT; 1768 idx = MENU_INDEX_SELECT;
1769 else 1769 else
1770 idx = MENU_INDEX_VISUAL; 1770 idx = MENU_INDEX_VISUAL;
1771 } 1771 }
1772 else if (state == HITRETURN || state == ASKMORE) 1772 else if (state == MODE_HITRETURN || state == MODE_ASKMORE)
1773 idx = MENU_INDEX_CMDLINE; 1773 idx = MENU_INDEX_CMDLINE;
1774 else if (finish_op) 1774 else if (finish_op)
1775 idx = MENU_INDEX_OP_PENDING; 1775 idx = MENU_INDEX_OP_PENDING;
1776 else if ((state & NORMAL)) 1776 else if ((state & MODE_NORMAL))
1777 idx = MENU_INDEX_NORMAL; 1777 idx = MENU_INDEX_NORMAL;
1778 else 1778 else
1779 idx = MENU_INDEX_INVALID; 1779 idx = MENU_INDEX_INVALID;
1780 1780
1781 if (idx != MENU_INDEX_INVALID && menu->strings[idx] == NULL) 1781 if (idx != MENU_INDEX_INVALID && menu->strings[idx] == NULL)
1927 { 1927 {
1928 if (VIsual_select) 1928 if (VIsual_select)
1929 return MENU_INDEX_SELECT; 1929 return MENU_INDEX_SELECT;
1930 return MENU_INDEX_VISUAL; 1930 return MENU_INDEX_VISUAL;
1931 } 1931 }
1932 if (State & INSERT) 1932 if (State & MODE_INSERT)
1933 return MENU_INDEX_INSERT; 1933 return MENU_INDEX_INSERT;
1934 if ((State & CMDLINE) || State == ASKMORE || State == HITRETURN) 1934 if ((State & MODE_CMDLINE) || State == MODE_ASKMORE
1935 || State == MODE_HITRETURN)
1935 return MENU_INDEX_CMDLINE; 1936 return MENU_INDEX_CMDLINE;
1936 if (finish_op) 1937 if (finish_op)
1937 return MENU_INDEX_OP_PENDING; 1938 return MENU_INDEX_OP_PENDING;
1938 if (State & NORMAL) 1939 if (State & MODE_NORMAL)
1939 return MENU_INDEX_NORMAL; 1940 return MENU_INDEX_NORMAL;
1940 if (State & LANGMAP) // must be a "r" command, like Insert mode 1941 if (State & MODE_LANGMAP) // must be a "r" command, like Insert mode
1941 return MENU_INDEX_INSERT; 1942 return MENU_INDEX_INSERT;
1942 return MENU_INDEX_INVALID; 1943 return MENU_INDEX_INVALID;
1943 } 1944 }
1944 1945
1945 int 1946 int