From a2e48b556b7537acd26353b6cc201410be7cf3dc Mon Sep 17 00:00:00 2001 From: erw7 Date: Sun, 25 Aug 2019 13:45:45 +0900 Subject: vim-patch:8.1.0362: cannot get the script line number when executing a function Problem: Cannot get the script line number when executing a function. Solution: Store the line number besides the script ID. (Ozaki Kiichi, closes vim/vim#3362) Also display the line number with ":verbose set". https://github.com/vim/vim/commit/f29c1c6aa3f365c025890fab5fb9efbe88eb1761 --- src/nvim/menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/menu.c') diff --git a/src/nvim/menu.c b/src/nvim/menu.c index 368faf7d0b..181efbf3b0 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -1370,7 +1370,7 @@ void ex_emenu(exarg_T *eap) /* Found the menu, so execute. * Use the Insert mode entry when returning to Insert mode. */ - if (((State & INSERT) || restart_edit) && !current_SID) { + if (((State & INSERT) || restart_edit) && !current_sctx.sc_sid) { mode = (char_u *)"Insert"; idx = MENU_INDEX_INSERT; } else if (State & CMDLINE) { @@ -1431,7 +1431,7 @@ void ex_emenu(exarg_T *eap) if (menu->strings[idx] != NULL) { // When executing a script or function execute the commands right now. // Otherwise put them in the typeahead buffer. - if (current_SID != 0) { + if (current_sctx.sc_sid != 0) { exec_normal_cmd(menu->strings[idx], menu->noremap[idx], menu->silent[idx]); } else { -- cgit