From 164370a4cb92f5063280d4748e1e67fafc79df34 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Wed, 9 Aug 2023 19:13:59 +0200 Subject: vim-patch:c2bd205254c8 Change "the" to "then" under ':help bufload()' (vim/vim#12662) https://github.com/vim/vim/commit/c2bd205254c89ecf46e08965f53d7991315d9c98 N/A commits: vim-patch:64dea84bb05a (we have our own manpager at home) vim-patch:958e15bb1c7d (we have our own editorconfig syntax file) vim-patch:c41b3c9f95ac (we don't have defaults.vim) Co-authored-by: Daniel Steinberg --- runtime/doc/builtin.txt | 2 +- runtime/lua/vim/_meta/vimfn.lua | 2 +- src/nvim/eval.lua | 2 +- 3 files changed, 3 insertions(+), 3 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/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()|. -- cgit From f81645abd2e54b3b70ac5d420594430f27639510 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Wed, 9 Aug 2023 19:20:18 +0200 Subject: vim-patch:0401933a5be3 Fix alignment in filetype.txt (vim/vim#12618) There are three spaces because the "<" is concealed. https://github.com/vim/vim/commit/0401933a5be3b72e12427cdaf8b7ff2694690d02 Co-authored-by: zeertzjq --- runtime/doc/filetype.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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* -- cgit