Commit: patch 9.1.0157: Duplicate assignment in f_getregion()

5 views
Skip to first unread message

Christian Brabandt

unread,
Mar 7, 2024, 3:45:16 PM3/7/24
to vim...@googlegroups.com
patch 9.1.0157: Duplicate assignment in f_getregion()

Commit: https://github.com/vim/vim/commit/0df8f93bdaea77a1afb9f4eca94fe67ec73e6df2
Author: zeertzjq <zeer...@outlook.com>
Date: Thu Mar 7 21:40:53 2024 +0100

patch 9.1.0157: Duplicate assignment in f_getregion()

Problem: Duplicate assignment in f_getregion().
Solution: Remove the duplicate assignment. Also improve getregion()
docs wording and fix an unrelated typo (zeertzjq)

closes: #14154

Signed-off-by: zeertzjq <zeer...@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 09b4dd068..fb957e54a 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,4 +1,4 @@
-*builtin.txt* For Vim version 9.1. Last change: 2024 Mar 06
+*builtin.txt* For Vim version 9.1. Last change: 2024 Mar 07


VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4280,7 +4280,7 @@ getregion({pos1}, {pos2} [, {opts}]) *getregion()*
{pos1} and {pos2} must both be |List|s with four numbers.
See |getpos()| for the format of the list. It's possible
to specify positions from a different buffer, but please
- note the limitations at |getregion-notes|
+ note the limitations at |getregion-notes|.

The optional argument {opts} is a Dict and supports the
following items:
@@ -4314,9 +4314,9 @@ getregion({pos1}, {pos2} [, {opts}]) *getregion()*
- If {pos1} and {pos2} are not in the same buffer, an empty
list is returned.
- {pos1} and {pos2} must belong to a |bufloaded()| buffer.
- - It is evaluated in current window context, this makes a
- different if a buffer is displayed in a different window and
- 'virtualedit' or 'list' is set
+ - It is evaluated in current window context, which makes a
+ difference if the buffer is displayed in a window with
+ different 'virtualedit' or 'list' values.

Examples: >
:xnoremap <CR>
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 23d5dd386..2bb9ccec5 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5546,7 +5546,6 @@ f_getregion(typval_T *argvars, typval_T *rettv)
// buffer not loaded
if (findbuf == NULL || findbuf->b_ml.ml_mfp == NULL)
return;
- save_curbuf = curbuf;
curbuf = findbuf;
}

diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
index 13c4990b8..eec0e0bc0 100644
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -583,7 +583,7 @@ funct Test_undofile()
endif
call assert_equal('', undofile(''))

- " Test undofile() with 'undodir' set to to an existing directory.
+ " Test undofile() with 'undodir' set to an existing directory.
call mkdir('Xundodir')
set undodir=Xundodir
let cwd = getcwd()
diff --git a/src/version.c b/src/version.c
index 03ad6fe19..86537c437 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 157,
/**/
156,
/**/
Reply all
Reply to author
Forward
0 new messages