diff options
| author | Christian Brabandt <cb@256bit.org> | 2024-03-13 20:59:27 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-13 20:59:27 +0100 |
| commit | 0a32b8854b52381fd17a6fcc5e38a3b9e77c8923 (patch) | |
| tree | 55566ff53c9fe6281bfa96c70f6a1e8be0b06e3a | |
| parent | 8c55d60658b7ee3458dca57fc5eec90ca9bb9bf3 (diff) | |
patch 9.1.0178: E1513 might be confusingv9.1.0178
Problem: E1513 might be confusing
(Christoph Thoma)
Solution: reword error message, fix test to not
depend on the actual message
fixes: #14189
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/doc/message.txt | 4 | ||||
| -rw-r--r-- | src/errors.h | 2 | ||||
| -rw-r--r-- | src/testdir/test_winfixbuf.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 4abdd9e5d9..6453b95fab 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 9.1. Last change: 2024 Mar 05 +*message.txt* For Vim version 9.1. Last change: 2024 Mar 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -123,7 +123,7 @@ You cannot have two buffers with exactly the same name. This includes the path leading to the file. *E1513* - Cannot edit buffer. 'winfixbuf' is enabled ~ + Cannot switch buffer. 'winfixbuf' is enabled ~ If a window has 'winfixbuf' enabled, you cannot change that window's current buffer. You need to set 'nowinfixbuf' before continuing. You may use [!] to diff --git a/src/errors.h b/src/errors.h index 6e7f28d899..5dccc63b7a 100644 --- a/src/errors.h +++ b/src/errors.h @@ -3614,4 +3614,4 @@ EXTERN char e_wrong_number_of_characters_for_field_str[] EXTERN char e_wrong_character_width_for_field_str[] INIT(= N_("E1512: Wrong character width for field \"%s\"")); EXTERN char e_winfixbuf_cannot_go_to_buffer[] - INIT(= N_("E1513: Cannot edit buffer. 'winfixbuf' is enabled")); + INIT(= N_("E1513: Cannot switch buffer. 'winfixbuf' is enabled")); diff --git a/src/testdir/test_winfixbuf.vim b/src/testdir/test_winfixbuf.vim index 7f692f865c..04043f8734 100644 --- a/src/testdir/test_winfixbuf.vim +++ b/src/testdir/test_winfixbuf.vim @@ -493,7 +493,7 @@ func Test_browse_edit_fail() try browse edit! other call assert_equal(l:other, bufnr()) - catch /E338:/ + catch /^Vim\%((\a\+)\)\=:E338:/ " Ignore E338, which occurs if console Vim is built with +browse. " Console Vim without +browse will treat this as a regular :edit. endtry @@ -511,7 +511,7 @@ func Test_browse_edit_pass() try browse write other - catch /E338:/ + catch /^Vim\%((\a\+)\)\=:E338:/ " Ignore E338, which occurs if console Vim is built with +browse. " Console Vim without +browse will treat this as a regular :write. endtry @@ -2532,7 +2532,7 @@ EOF try pyxdo test_winfixbuf_Test_pythonx_pyxdo_set_buffer() - catch /Vim(pyxdo):vim.error: Vim:E1513: Cannot edit buffer. 'winfixbuf' is enabled/ + catch /Vim\%((\a\+)\)\=:E1513:/ let l:caught = 1 endtry @@ -2563,7 +2563,7 @@ func Test_pythonx_pyxfile() try pyxfile file.py - catch /Vim(pyxfile):vim.error: Vim:E1513: Cannot edit buffer. 'winfixbuf' is enabled/ + catch /Vim\%((\a\+)\)\=:E1513:/ let l:caught = 1 endtry @@ -2596,7 +2596,7 @@ import vim buffer = vim.vars["_previous_buffer"] vim.current.buffer = vim.buffers[buffer] EOF - catch /Vim(pythonx):vim\.error: Vim:E1513: Cannot edit buffer. 'winfixbuf' is enabled/ + catch /Vim\%((\a\+)\)\=:E1513:/ let l:caught = 1 endtry diff --git a/src/version.c b/src/version.c index 78c496b735..1e2efcb86e 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 178, +/**/ 177, /**/ 176, |