Mercurial > vim
changeset 14648:c3222a7342ab v8.1.0337
patch 8.1.0337: :file fails in quickfix command
commit https://github.com/vim/vim/commit/379fb76b080521f7c09265ec3264b9e698923518
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Aug 30 15:58:28 2018 +0200
patch 8.1.0337: :file fails in quickfix command
Problem: :file fails in quickfix command.
Solution: Allow :file without argument when curbuf_lock is set. (Jason
Franklin)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 30 Aug 2018 16:00:08 +0200 |
| parents | 218059bfe484 |
| children | ea486a54b47e |
| files | src/ex_docmd.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 41 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2039,12 +2039,15 @@ do_one_cmd( errormsg = (char_u *)_(get_text_locked_msg()); goto doend; } + /* Disallow editing another buffer when "curbuf_lock" is set. - * Do allow ":edit" (check for argument later). - * Do allow ":checktime" (it's postponed). */ + * Do allow ":checktime" (it is postponed). + * Do allow ":edit" (check for an argument later). + * Do allow ":file" with no arguments (check for an argument later). */ if (!(ea.argt & CMDWIN) + && ea.cmdidx != CMD_checktime && ea.cmdidx != CMD_edit - && ea.cmdidx != CMD_checktime + && ea.cmdidx != CMD_file && !IS_USER_CMDIDX(ea.cmdidx) && curbuf_locked()) goto doend; @@ -2130,6 +2133,10 @@ do_one_cmd( else ea.arg = skipwhite(p); + // ":file" cannot be run with an argument when "curbuf_lock" is set + if (ea.cmdidx == CMD_file && *ea.arg != NUL && curbuf_locked()) + goto doend; + /* * Check for "++opt=val" argument. * Must be first, allow ":w ++enc=utf8 !cmd"
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -2485,6 +2485,35 @@ func Test_cclose_in_autocmd() call test_override('starting', 0) endfunc +" Check that ":file" without an argument is possible even when "curbuf_lock" +" is set. +func Test_file_from_copen() + " Works without argument. + augroup QF_Test + au! + au FileType qf file + augroup END + copen + + augroup QF_Test + au! + augroup END + cclose + + " Fails with argument. + augroup QF_Test + au! + au FileType qf call assert_fails(':file foo', 'E788') + augroup END + copen + augroup QF_Test + au! + augroup END + cclose + + augroup! QF_Test +endfunction + func Test_resize_from_copen() augroup QF_Test au!