From abd1b1ff4253a8d9c4797f402c20277f6235f750 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 20 Aug 2024 06:25:48 +0800 Subject: [PATCH 1/3] vim-patch:175a87c: runtime(doc): more clarification for the :keeppatterns needed https://github.com/vim/vim/commit/175a87c7f163e34876c6848f829970fec61fc9d7 Co-authored-by: Christian Brabandt --- runtime/doc/cmdline.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 0062a22be3..e739dc3da7 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -348,7 +348,8 @@ terminals) :keepp[atterns] {command} *:keepp* *:keeppatterns* Execute {command}, without adding anything to the search - history or modifying the last substitute string for |:&|. + history and, in case of the the |:s| and |:&| command, without + modifying the last substitute pattern and substitute string. ============================================================================== 2. Command-line completion *cmdline-completion* From 9639552572d21472faa2c9db8e933dbffba547c5 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 20 Aug 2024 06:27:05 +0800 Subject: [PATCH 2/3] vim-patch:3840d2f: runtime(doc): remove trailing whitespace in cmdline.txt https://github.com/vim/vim/commit/3840d2feaf1454c934f71a97aae7a56a5ceccef9 Co-authored-by: Christian Brabandt --- runtime/doc/cmdline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index e739dc3da7..60bf9e7679 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -348,7 +348,7 @@ terminals) :keepp[atterns] {command} *:keepp* *:keeppatterns* Execute {command}, without adding anything to the search - history and, in case of the the |:s| and |:&| command, without + history and, in case of the the |:s| and |:&| command, without modifying the last substitute pattern and substitute string. ============================================================================== From 9f495296279b3d55ec9e92e9d78ed33347cc1bd6 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 21 Aug 2024 07:02:56 +0800 Subject: [PATCH 3/3] vim-patch:e44e644: runtime(doc): fix grammar in :h :keeppatterns - It's clear that :s and :& are Ex commands, so remove "command" along with the duplicate "the". - Use "or" instead of "and" following "without". closes: vim/vim#15527 https://github.com/vim/vim/commit/e44e64492cf0a99191826b05ea5ee80b3a5fb3f5 --- runtime/doc/cmdline.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 60bf9e7679..28d53feb4c 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -348,8 +348,8 @@ terminals) :keepp[atterns] {command} *:keepp* *:keeppatterns* Execute {command}, without adding anything to the search - history and, in case of the the |:s| and |:&| command, without - modifying the last substitute pattern and substitute string. + history and, in case of |:s| or |:&|, without modifying the + last substitute pattern or substitute string. ============================================================================== 2. Command-line completion *cmdline-completion*