Mercurial > vim
diff src/menu.c @ 23390:9a5f12b36273 v8.2.2238
patch 8.2.2238: Vim9: cannot load a Vim9 script without the +eval feature
Commit: https://github.com/vim/vim/commit/9b8d62267f583d5dc042920adb1de046959ad11d
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Dec 28 18:26:00 2020 +0100
patch 8.2.2238: Vim9: cannot load a Vim9 script without the +eval feature
Problem: Vim9: cannot load a Vim9 script without the +eval feature.
Solution: Support Vim9 script syntax without the +eval feature.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 28 Dec 2020 18:30:03 +0100 |
| parents | 73be82f278c0 |
| children | 7334bf933510 |
line wrap: on
line diff
--- a/src/menu.c +++ b/src/menu.c @@ -2310,11 +2310,7 @@ execute_menu(exarg_T *eap, vimmenu_T *me if (idx < 0) { // Use the Insert mode entry when returning to Insert mode. - if (restart_edit -#ifdef FEAT_EVAL - && !current_sctx.sc_sid -#endif - ) + if (restart_edit && !current_sctx.sc_sid) { idx = MENU_INDEX_INSERT; } @@ -2384,11 +2380,7 @@ execute_menu(exarg_T *eap, vimmenu_T *me // When executing a script or function execute the commands right now. // Also for the window toolbar. // Otherwise put them in the typeahead buffer. - if (eap == NULL -#ifdef FEAT_EVAL - || current_sctx.sc_sid != 0 -#endif - ) + if (eap == NULL || current_sctx.sc_sid != 0) { save_state_T save_state;