aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-11-11 08:20:41 +0800
committerGitHub <noreply@github.com>2024-11-11 08:20:41 +0800
commitadbffff5d0e9972253079140453b55d8f9273b29 (patch)
treebbd6c76b6d223af02aa173abc97d8e6869688787
parent0e54931b99530cd58af0434e12c58fe6243acb64 (diff)
downloadrneovim-adbffff5d0e9972253079140453b55d8f9273b29.tar.gz
rneovim-adbffff5d0e9972253079140453b55d8f9273b29.tar.bz2
rneovim-adbffff5d0e9972253079140453b55d8f9273b29.zip
vim-patch:9.1.0849: there are a few typos in the source (#31159)
Problem: there are a few typos in the source. Solution: Correct typos (zeertzjq). closes: vim/vim#16026 https://github.com/vim/vim/commit/7c5152826f61bc968ba539ff6db3a55e75556bf2
-rw-r--r--runtime/doc/quickfix.txt2
-rw-r--r--runtime/doc/syntax.txt2
-rw-r--r--src/nvim/ex_cmds.c2
-rw-r--r--test/old/testdir/test_diffmode.vim2
4 files changed, 4 insertions, 4 deletions
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 901aaf6e82..576eebefcc 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -349,7 +349,7 @@ processing a quickfix or location list command, it will be aborted.
Example: >
:g/mypattern/caddexpr expand("%") .. ":" .. line(".") .. ":" .. getline(".")
<
- *:lad* *:addd* *:laddexpr*
+ *:lad* *:ladd* *:laddexpr*
:lad[dexpr] {expr} Same as ":caddexpr", except the location list for the
current window is used instead of the quickfix list.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index b9daff84f3..75a855bbdd 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2196,7 +2196,7 @@ To specify elements that should not be concealed, set the following variable: >
:let g:pandoc#syntax#conceal#blacklist = []
-This is a list of the rules wich can be used here:
+This is a list of the rules which can be used here:
- titleblock
- image
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 702dbeac27..834370afe5 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -2261,7 +2261,7 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
if (buf == NULL) {
goto theend;
}
- // autocommands try to edit a file that is goind to be removed, abort
+ // autocommands try to edit a file that is going to be removed, abort
if (buf_locked(buf)) {
// window was split, but not editing the new buffer, reset b_nwindows again
if (oldwin == NULL
diff --git a/test/old/testdir/test_diffmode.vim b/test/old/testdir/test_diffmode.vim
index a97006a7cc..880286d329 100644
--- a/test/old/testdir/test_diffmode.vim
+++ b/test/old/testdir/test_diffmode.vim
@@ -2007,7 +2007,7 @@ func Test_diff_overlapped_diff_blocks_will_be_merged()
call StopVimInTerminal(buf)
endfunc
-" switching windows in diff mode caused an unneccessary scroll
+" switching windows in diff mode caused an unnecessary scroll
func Test_diff_topline_noscroll()
CheckScreendump