Mercurial > vim
changeset 18693:d7c47e45bcc3 v8.1.2338
patch 8.1.2338: using Visual mark sith :s gives E20 if not set
Commit: https://github.com/vim/vim/commit/c672525b487992306f69ceab093291ba3b8e4246
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 23 21:56:46 2019 +0100
patch 8.1.2338: using Visual mark sith :s gives E20 if not set
Problem: Using Visual mark sith :s gives E20 if not set.
Solution: Ignore errors when handling 'incsearch'. (closes https://github.com/vim/vim/issues/3837)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 23 Nov 2019 22:00:04 +0100 |
| parents | e83c4f346222 |
| children | a82b51842506 |
| files | src/ex_getln.c src/testdir/dumps/Test_incsearch_substitute_14.dump src/testdir/test_search.vim src/version.c |
| diffstat | 4 files changed, 37 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -197,6 +197,7 @@ do_incsearch_highlighting(int firstc, in exarg_T ea; pos_T save_cursor; int use_last_pat; + int retval = FALSE; *skiplen = 0; *patlen = ccline.cmdlen; @@ -213,6 +214,7 @@ do_incsearch_highlighting(int firstc, in if (firstc != ':') return FALSE; + ++emsg_off; vim_memset(&ea, 0, sizeof(ea)); ea.line1 = 1; ea.line2 = 1; @@ -224,13 +226,13 @@ do_incsearch_highlighting(int firstc, in cmd = skip_range(ea.cmd, NULL); if (vim_strchr((char_u *)"sgvl", *cmd) == NULL) - return FALSE; + goto theend; // Skip over "substitute" to find the pattern separator. for (p = cmd; ASCII_ISALPHA(*p); ++p) ; if (*skipwhite(p) == NUL) - return FALSE; + goto theend; if (STRNCMP(cmd, "substitute", p - cmd) == 0 || STRNCMP(cmd, "smagic", p - cmd) == 0 @@ -248,7 +250,7 @@ do_incsearch_highlighting(int firstc, in while (ASCII_ISALPHA(*(p = skipwhite(p)))) ++p; if (*p == NUL) - return FALSE; + goto theend; } else if (STRNCMP(cmd, "vimgrep", MAX(p - cmd, 3)) == 0 || STRNCMP(cmd, "vimgrepadd", MAX(p - cmd, 8)) == 0 @@ -261,13 +263,13 @@ do_incsearch_highlighting(int firstc, in { p++; if (*skipwhite(p) == NUL) - return FALSE; + goto theend; } if (*cmd != 'g') delim_optional = TRUE; } else - return FALSE; + goto theend; p = skipwhite(p); delim = (delim_optional && vim_isIDc(*p)) ? ' ' : *p++; @@ -276,7 +278,7 @@ do_incsearch_highlighting(int firstc, in use_last_pat = end == p && *end == delim; if (end == p && !use_last_pat) - return FALSE; + goto theend; // Don't do 'hlsearch' highlighting if the pattern matches everything. if (!use_last_pat) @@ -288,7 +290,7 @@ do_incsearch_highlighting(int firstc, in empty = empty_pattern(p); *end = c; if (empty) - return FALSE; + goto theend; } // found a non-empty pattern or // @@ -321,7 +323,10 @@ do_incsearch_highlighting(int firstc, in } curwin->w_cursor = save_cursor; - return TRUE; + retval = TRUE; +theend: + --emsg_off; + return retval; } static void
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_incsearch_substitute_14.dump @@ -0,0 +1,9 @@ +|a+1&#ffffff0|s+0&&|d|f|a+0&#ffff4012|s+0&#ffffff0|d|f| @61 +|~+0#4040ff13&| @68 +|~| @68 +|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @38|1|,|1| @11|A|l@1 +|b+0&&|s|d|f|b|s|d|f| @61 +|~+0#4040ff13&| @68 +|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @38|1|,|1| @11|A|l@1 +|:+0&&|'|<|,|'|>|s|/|a|/|b|/|g> @56 +@70
--- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -983,6 +983,19 @@ func Test_incsearch_substitute_dump() call VerifyScreenDump(buf, 'Test_incsearch_substitute_12', {}) call term_sendkeys(buf, "\<Esc>") call VerifyScreenDump(buf, 'Test_incsearch_substitute_13', {}) + call term_sendkeys(buf, ":%bwipe!\<CR>") + call term_sendkeys(buf, ":only!\<CR>") + + " get :'<,'>s command in history + call term_sendkeys(buf, ":set cmdheight=2\<CR>") + call term_sendkeys(buf, "aasdfasdf\<Esc>") + call term_sendkeys(buf, "V:s/a/b/g\<CR>") + " Using '<,'> does not give E20 + call term_sendkeys(buf, ":new\<CR>") + call term_sendkeys(buf, "aasdfasdf\<Esc>") + call term_sendkeys(buf, ":\<Up>\<Up>") + call VerifyScreenDump(buf, 'Test_incsearch_substitute_14', {}) + call term_sendkeys(buf, "<Esc>") call StopVimInTerminal(buf) call delete('Xis_subst_script')