mirror of
https://github.com/neovim/neovim.git
synced 2026-07-22 00:51:33 +00:00
vim-patch:8.1.0118: duplicate error message for put command
Problem: Duplicate error message for put command.
Solution: Check return value of u_save(). (Jason Franklin)
f52f9ea8f5
This commit is contained in:
@@ -2791,8 +2791,8 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
|
||||
}
|
||||
|
||||
if (!curbuf->terminal) {
|
||||
// Autocommands may be executed when saving lines for undo, which may make
|
||||
// y_array invalid. Start undo now to avoid that.
|
||||
// Autocommands may be executed when saving lines for undo. This might
|
||||
// make y_array invalid, so we start undo now to avoid that.
|
||||
if (u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1) == FAIL) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
" Tests for put commands, e.g. ":put", "p", "gp", "P", "gP", etc.
|
||||
|
||||
func Test_put_block()
|
||||
if !has('multi_byte')
|
||||
@@ -58,3 +59,48 @@ func Test_put_lines()
|
||||
bw!
|
||||
call setreg('a', a[0], a[1])
|
||||
endfunc
|
||||
|
||||
func Test_put_fails_when_nomodifiable()
|
||||
new
|
||||
set nomodifiable
|
||||
|
||||
normal! yy
|
||||
call assert_fails(':put', 'E21')
|
||||
call assert_fails(':put!', 'E21')
|
||||
call assert_fails(':normal! p', 'E21')
|
||||
call assert_fails(':normal! gp', 'E21')
|
||||
call assert_fails(':normal! P', 'E21')
|
||||
call assert_fails(':normal! gP', 'E21')
|
||||
|
||||
if has('mouse')
|
||||
set mouse=n
|
||||
call assert_fails('execute "normal! \<MiddleMouse>"', 'E21')
|
||||
set mouse&
|
||||
endif
|
||||
|
||||
bwipeout!
|
||||
endfunc
|
||||
|
||||
" A bug was discovered where the Normal mode put commands (e.g., "p") would
|
||||
" output duplicate error messages when invoked in a non-modifiable buffer.
|
||||
func Test_put_p_errmsg_nodup()
|
||||
new
|
||||
set nomodifiable
|
||||
|
||||
normal! yy
|
||||
|
||||
func Capture_p_error()
|
||||
redir => s:p_err
|
||||
normal! p
|
||||
redir END
|
||||
endfunc
|
||||
|
||||
silent! call Capture_p_error()
|
||||
|
||||
" Error message output within a function should be three lines (the function
|
||||
" name, the line number, and the error message).
|
||||
call assert_equal(3, count(s:p_err, "\n"))
|
||||
|
||||
delfunction Capture_p_error
|
||||
bwipeout!
|
||||
endfunc
|
||||
|
||||
Reference in New Issue
Block a user