aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-08-10 03:20:56 +0800
committerGitHub <noreply@github.com>2023-08-10 03:20:56 +0800
commitbad71a4ca7075bc7f89be6849cfbbd9657ec0baa (patch)
treea43dc889a18ded91390cdd7ca2d067675d490367
parent8f9b2652fbe298ecde9dcc9603808c772db05531 (diff)
parentf81645abd2e54b3b70ac5d420594430f27639510 (diff)
downloadrneovim-bad71a4ca7075bc7f89be6849cfbbd9657ec0baa.tar.gz
rneovim-bad71a4ca7075bc7f89be6849cfbbd9657ec0baa.tar.bz2
rneovim-bad71a4ca7075bc7f89be6849cfbbd9657ec0baa.zip
Merge pull request #24631 from clason/vim-c2bd205254c8
vim-patch:{c2bd205254c8,0401933a5be3}: typo fixes
-rw-r--r--runtime/doc/builtin.txt2
-rw-r--r--runtime/doc/filetype.txt6
-rw-r--r--runtime/lua/vim/_meta/vimfn.lua2
-rw-r--r--src/nvim/eval.lua2
4 files changed, 6 insertions, 6 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 0c239b223d..e678a8d804 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -398,7 +398,7 @@ bufload({buf}) *bufload()*
refers to an existing file then the file is read. Otherwise
the buffer will be empty. If the buffer was already loaded
then there is no change. If the buffer is not related to a
- file the no file is read (e.g., when 'buftype' is "nofile").
+ file then no file is read (e.g., when 'buftype' is "nofile").
If there is an existing swap file for the file of the buffer,
there will be no dialog, the buffer will be loaded anyway.
The {buf} argument is used like with |bufexists()|.
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 1dad3cd433..9ebdc71eb2 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -357,7 +357,7 @@ ways to change this:
You must create a new filetype plugin in a directory early in
'runtimepath'. For Unix, for example you could use this file: >
vim ~/.config/nvim/ftplugin/fortran.vim
-< You can set those settings and mappings that you would like to add. Note
+< You can set those settings and mappings that you would like to add. Note
that the global plugin will be loaded after this, it may overrule the
settings that you do here. If this is the case, you need to use one of the
following two methods.
@@ -366,7 +366,7 @@ ways to change this:
You must put the copy in a directory early in 'runtimepath'. For Unix, for
example, you could do this: >
cp $VIMRUNTIME/ftplugin/fortran.vim ~/.config/nvim/ftplugin/fortran.vim
-< Then you can edit the copied file to your liking. Since the b:did_ftplugin
+< Then you can edit the copied file to your liking. Since the b:did_ftplugin
variable will be set, the global plugin will not be loaded.
A disadvantage of this method is that when the distributed plugin gets
improved, you will have to copy and modify it again.
@@ -375,7 +375,7 @@ ways to change this:
You must create a new filetype plugin in a directory from the end of
'runtimepath'. For Unix, for example, you could use this file: >
vim ~/.config/nvim/after/ftplugin/fortran.vim
-< In this file you can change just those settings that you want to change.
+< In this file you can change just those settings that you want to change.
==============================================================================
3. Docs for the default filetype plugins. *ftplugin-docs*
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 7c98ed8849..14aae99971 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -534,7 +534,7 @@ function vim.fn.buflisted(buf) end
--- refers to an existing file then the file is read. Otherwise
--- the buffer will be empty. If the buffer was already loaded
--- then there is no change. If the buffer is not related to a
---- file the no file is read (e.g., when 'buftype' is "nofile").
+--- file then no file is read (e.g., when 'buftype' is "nofile").
--- If there is an existing swap file for the file of the buffer,
--- there will be no dialog, the buffer will be loaded anyway.
--- The {buf} argument is used like with |bufexists()|.
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index d48a69f3d8..4e6688a4a1 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -747,7 +747,7 @@ M.funcs = {
refers to an existing file then the file is read. Otherwise
the buffer will be empty. If the buffer was already loaded
then there is no change. If the buffer is not related to a
- file the no file is read (e.g., when 'buftype' is "nofile").
+ file then no file is read (e.g., when 'buftype' is "nofile").
If there is an existing swap file for the file of the buffer,
there will be no dialog, the buffer will be loaded anyway.
The {buf} argument is used like with |bufexists()|.