Mercurial > vim
changeset 29042:e150d0e4701f v8.2.5043
patch 8.2.5043: can open a cmdline window from a substitute expression
Commit: https://github.com/vim/vim/commit/71223e2db87c2bf3b09aecb46266b56cda26191d
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon May 30 15:23:09 2022 +0100
patch 8.2.5043: can open a cmdline window from a substitute expression
Problem: Can open a cmdline window from a substitute expression.
Solution: Disallow opening a command line window when text or buffer is
locked.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 30 May 2022 16:30:03 +0200 |
parents | e875e8e94e8a |
children | f8d534f719dc |
files | src/buffer.c src/ex_getln.c src/proto/ex_getln.pro src/testdir/test_substitute.vim src/version.c src/window.c |
diffstat | 6 files changed, 51 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buffer.c +++ b/src/buffer.c @@ -2407,12 +2407,7 @@ buflist_getfile( if (buf == curbuf) return OK; - if (text_locked()) - { - text_locked_msg(); - return FAIL; - } - if (curbuf_locked()) + if (text_or_buf_locked()) return FAIL; // altfpos may be changed by getfile(), get it now
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -2740,6 +2740,21 @@ get_text_locked_msg(void) } /* + * Check for text, window or buffer locked. + * Give an error message and return TRUE if something is locked. + */ + int +text_or_buf_locked(void) +{ + if (text_locked()) + { + text_locked_msg(); + return TRUE; + } + return curbuf_locked(); +} + +/* * Check if "curbuf_lock" or "allbuf_lock" is set and return TRUE when it is * and give an error message. */ @@ -4379,6 +4394,10 @@ open_cmdwin(void) int save_KeyTyped; #endif + // Can't do this when text or buffer is locked. + if (text_or_buf_locked()) + return K_IGNORE; + // Can't do this recursively. Can't do it when typing a password. if (cmdwin_type != 0 # if defined(FEAT_CRYPT) || defined(FEAT_EVAL)
--- a/src/proto/ex_getln.pro +++ b/src/proto/ex_getln.pro @@ -3,9 +3,10 @@ void cmdline_init(void); char_u *getcmdline(int firstc, long count, int indent, getline_opt_T do_concat); char_u *getcmdline_prompt(int firstc, char_u *prompt, int attr, int xp_context, char_u *xp_arg); int check_opt_wim(void); +int text_locked(void); void text_locked_msg(void); char *get_text_locked_msg(void); -int text_locked(void); +int text_or_buf_locked(void); int curbuf_locked(void); int allbuf_locked(void); char_u *getexline(int c, void *cookie, int indent, getline_opt_T options); @@ -32,8 +33,8 @@ cmdline_info_T *get_cmdline_info(void); void f_getcmdcompltype(typval_T *argvars, typval_T *rettv); void f_getcmdline(typval_T *argvars, typval_T *rettv); void f_getcmdpos(typval_T *argvars, typval_T *rettv); +void f_getcmdscreenpos(typval_T *argvars, typval_T *rettv); void f_setcmdpos(typval_T *argvars, typval_T *rettv); -void f_getcmdscreenpos(typval_T *argvars, typval_T *rettv); void f_getcmdtype(typval_T *argvars, typval_T *rettv); int get_cmdline_firstc(void); int get_list_range(char_u **str, int *num1, int *num2);
--- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -1035,6 +1035,31 @@ func Test_sub_undo_change() delfunc Repl endfunc +" This was opening a command line window from the expression +func Test_sub_open_cmdline_win() + " the error only happens in a very specific setup, run a new Vim instance to + " get a clean starting point. + let lines =<< trim [SCRIPT] + norm o0000000000000000000000000000000000000000000000000000 + func Replace() + norm q/ + endfunc + s/\%')/\=Replace() + redir >Xresult + messages + redir END + qall! + [SCRIPT] + call writefile(lines, 'Xscript') + if RunVim([], [], '-u NONE -S Xscript') + let messages = readfile('Xresult') + call assert_match('E565: Not allowed to change text or change window', messages[3]) + endif + + call delete('Xscript') + call delete('Xresult') +endfunc + " Test for the 2-letter and 3-letter :substitute commands func Test_substitute_short_cmd() new