From b62c0c8d9c22ae7fc9ee200733f8312efa6dbced Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Mon, 20 Feb 2023 08:12:59 +0100 Subject: docs: fix typos (#21961) Co-authored-by: Ben Morgan --- runtime/doc/intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 6bf6850ccf..11ba1b408c 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -382,7 +382,7 @@ Note: - If numlock is on the |TUI| receives plain ASCII values, so mapping , , ..., and will not work. - Nvim supports mapping multibyte chars with modifiers such as ``. Which - combinations actually work depends on the the UI or host terminal. + combinations actually work depends on the UI or host terminal. - When a key is pressed using a meta or alt modifier and no mapping exists for that keypress, Nvim may behave as though was pressed before the key. - It is possible to notate combined modifiers (e.g. for CTRL-ALT-T), -- cgit From 344a1ee8e6b7d78120f8393d1babfd285e866334 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 22 Feb 2023 00:07:26 +0800 Subject: docs: fix typos (#22353) --- runtime/doc/intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 11ba1b408c..685c953718 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -358,7 +358,7 @@ notation meaning equivalent decimal value(s) ~ keypad origin (middle) *keypad-origin* keypad page-up (upper right) *keypad-page-up* keypad page-down (lower right) *keypad-page-down* - keypad delete *keypad-delete* + keypad delete *keypad-delete* keypad + *keypad-plus* keypad - *keypad-minus* keypad * *keypad-multiply* -- cgit From 08991b078267e5de0a19a136d00d4f71ad651a32 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sat, 13 May 2023 21:33:22 +0200 Subject: docs: small fixes Co-authored-by: Christian Clason Co-authored-by: Gregory Anders Co-authored-by: HiPhish Co-authored-by: Julio B Co-authored-by: T727 <74924917+T-727@users.noreply.github.com> Co-authored-by: camoz Co-authored-by: champignoom <66909116+champignoom@users.noreply.github.com> --- runtime/doc/intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 685c953718..15fe3838b7 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -385,7 +385,7 @@ Note: combinations actually work depends on the UI or host terminal. - When a key is pressed using a meta or alt modifier and no mapping exists for that keypress, Nvim may behave as though was pressed before the key. -- It is possible to notate combined modifiers (e.g. for CTRL-ALT-T), +- It is possible to notate combined modifiers (e.g. for CTRL-ALT-T), but your terminal must encode the input for that to work. |tui-input| *<>* -- cgit From 4e6356559c8cd44dbcaa765d1f39e176064526ec Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 22 Jun 2023 03:44:51 -0700 Subject: test: spellcheck :help (vimdoc) files #24109 Enforce consistent terminology (defined in `gen_help_html.lua:spell_dict`) for common misspellings. This does not spellcheck English in general (perhaps a future TODO, though it may be noisy). --- runtime/doc/intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 15fe3838b7..86f7832376 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -83,7 +83,7 @@ For the most recent information about sponsoring look on the Vim web site: https://www.vim.org/sponsor/ -Neovim development is funded separately from Vim: +Nvim development is funded separately from Vim: https://neovim.io/#sponsor -- cgit From 036da0d07921e67090d1a62c9a4e382ca09d8584 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 24 Jun 2023 13:47:10 +0200 Subject: fix(docs): vimdoc syntax errors gen_help_html: truncate parse-error sample text --- runtime/doc/intro.txt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 86f7832376..ab380184fc 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -517,16 +517,15 @@ CTRL-O in Insert mode you get a beep but you are still in Insert mode, type again. *i_esc* - TO mode ~ - Normal Visual Select Insert Replace Cmd-line Ex ~ -FROM mode ~ -Normal v V ^V `*4` *1 R gR : / ? ! Q -Visual `*2` ^G c C -- : -- -Select `*5` ^O ^G `*6` -- -- -- -Insert -- -- -- -- -Replace -- -- -- -- -Command-line `*3` -- -- :start -- -- -Ex :vi -- -- -- -- -- + FROM mode TO mode ~ + Normal Visual Select Insert Replace Cmd-line Ex > + Normal v V ^V *4 *1 R gR : / ? ! Q + Visual *2 ^G c C -- : -- + Select *5 ^O ^G *6 -- -- -- + Insert -- -- -- -- + Replace -- -- -- -- + Command-line `*3` -- -- :start -- -- + Ex :vi -- -- -- -- -- -- not possible -- cgit From 047c22a28cf1ed723791e714b2a5b7c6b4b0e1fc Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 16 Jul 2023 18:39:45 +0800 Subject: docs(term.txt): reorder paragraphs about TUI input (#24367) Make |tui-modifyOtherKeys| and |tui-csiu| tags appear at a better place. Also adapt the || help update from https://github.com/vim/vim/commit/dad4473f02e1fec86d43a2fc094536a4b27d3b25 --- runtime/doc/intro.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index ab380184fc..b496dc5240 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -372,6 +372,7 @@ notation meaning equivalent decimal value(s) ~ control-key *control* *ctrl* * alt-key or meta-key *META* *ALT* * same as * meta-key when it's not alt * command-key or "super" key * Date: Tue, 8 Aug 2023 13:41:55 +0000 Subject: docs: Bram farewell #24589 ref #24579 --- runtime/doc/intro.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index b496dc5240..afb67373fd 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -193,6 +193,16 @@ Elvis Another Vi clone, made by Steve Kirkendall. Very compact but isn't Vim Nvim is based on Vim. https://www.vim.org/ +============================================================================== +Bram Moolenaar *Bram* *brammool* + +Nvim is a fork of the Vim ("Vi IMproved") text editor, which was originally +developed by Bram Moolenaar. Searching his name within the source code of +Nvim will reveal just how much of his work still remains in Nvim. +On August 3, 2023, he passed away at the age of 62. If Vim or Nvim have been +of use to you in your life, please read |Uganda| and consider honoring his +memory however you may see fit. + ============================================================================== Notation *notation* -- cgit From cbf54ec2a5aaa1a00ff89e26bab44a30d09d4631 Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Sun, 13 Aug 2023 13:25:10 +0100 Subject: vim-patch:e978b4534a5e (#24697) Farewell to Bram and dedicate upcoming Vim 9.1 to him (vim/vim#12749) https://github.com/vim/vim/commit/e978b4534a5e10471108259118c0ef791106fd92 Also update the header for the following files that were converted to Vim9 script upstream: - autoload/ccomplete.lua (vim9jitted) - ftplugin.vim - ftplugof.vim - indent.vim - indent/vim.vim - makemenu.vim This also updates the "Last Change" dates, even if some changes (due to rewrites to Vim9 script) were not ported. There's still a few other places where Bram is still mentioned as a maintainer in the files we and Vim have: - ftplugin/bash.vim - indent/bash.vim - indent/html.vim - indent/mail.vim - macros/accents.vim - macros/editexisting.vim - syntax/bash.vim - syntax/shared/typescriptcommon.vim - syntax/tar.vim - syntax/typescript.vim - syntax/typescriptreact.vim - syntax/zimbu.vim Maybe future patches will address that. Also exclude changes to .po files that didn't apply automatically (the `:messages` maintainer string isn't used in Nvim anyway). Co-authored-by: Christian Brabandt --- runtime/doc/intro.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index afb67373fd..a39d07e3f2 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -88,9 +88,9 @@ Nvim development is funded separately from Vim: https://neovim.io/#sponsor ============================================================================== -Credits *credits* +Credits *credits* -Most of Vim was written by Bram Moolenaar . +Most of Vim was written by Bram Moolenaar |Bram-Moolenaar| Parts of the documentation come from several Vi manuals, written by: W.N. Joy @@ -194,7 +194,7 @@ Elvis Another Vi clone, made by Steve Kirkendall. Very compact but isn't Vim Nvim is based on Vim. https://www.vim.org/ ============================================================================== -Bram Moolenaar *Bram* *brammool* +Bram Moolenaar *Bram* *Moolenaar* *Bram-Moolenaar* *brammool* Nvim is a fork of the Vim ("Vi IMproved") text editor, which was originally developed by Bram Moolenaar. Searching his name within the source code of @@ -203,6 +203,9 @@ On August 3, 2023, he passed away at the age of 62. If Vim or Nvim have been of use to you in your life, please read |Uganda| and consider honoring his memory however you may see fit. +Obituary Articles: https://github.com/vim/vim/discussions/12742 +Say Farewell: https://github.com/vim/vim/discussions/12737 + ============================================================================== Notation *notation* -- cgit From 4b6023be7c2b132e7e6994adc73a7b79fbf40946 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 12 Sep 2023 07:37:05 +0800 Subject: vim-patch:596ad66d1ddb (#25102) runtime(doc): documentation updates This is a collection of various improvements to the help pages closes vim/vim#12790 https://github.com/vim/vim/commit/596ad66d1ddb742ef349e98eb06b8e4052f68f51 Co-authored-by: Christian Brabandt Co-authored-by: Houl Co-authored-by: Doug Kearns Co-authored-by: Adri Verhoef --- runtime/doc/intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index a39d07e3f2..e1a92bc87b 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -121,7 +121,7 @@ Vim would never have become what it is now, without the help of these people! Eric Fischer Mac port, 'cindent', and other improvements Benji Fisher Answering lots of user questions Bill Foster Athena GUI port (later removed) - Google Lets me work on Vim one day a week + Google Let Bram work on Vim one day a week Loic Grenie xvim (ideas for multi windows version) Sven Guckes Vim promoter and previous WWW page maintainer Darren Hiebert Exuberant ctags -- cgit From 677df72e4032d819a3e49a41f015bea7457271a4 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sat, 16 Sep 2023 17:40:28 +0200 Subject: docs: remove joke from pronounce N-Jim does not sounds like "Ninja", and the joke doesn't really land. --- runtime/doc/intro.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index e1a92bc87b..975aff6bf6 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -22,8 +22,7 @@ is not located in the default place. You can jump to subjects like with tags: Use CTRL-] to jump to a subject under the cursor, use CTRL-T to jump back. *pronounce* -Vim is pronounced as one word, like Jim. So Nvim is N-Jim, which sounds like -"Ninja". Starting Nvim is like performing a roundhouse kick. +Vim is pronounced as one word, like Jim. So Nvim is "En-Vim", two syllables. This manual is a reference for all Nvim editor and API features. It is not an introduction; instead for beginners, there is a hands-on |tutor| and a user -- cgit From 1b55f51d0d8468ca357514a868ac8e188b0c8722 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Wed, 20 Sep 2023 04:15:23 -0700 Subject: docs: misc #24561 fix #24699 fix #25253 --- runtime/doc/intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 975aff6bf6..299c18ac2e 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -536,7 +536,7 @@ CTRL-O in Insert mode you get a beep but you are still in Insert mode, type Visual *2 ^G c C -- : -- Select *5 ^O ^G *6 -- -- -- Insert -- -- -- -- - Replace -- -- -- -- + Replace -- -- -- -- Command-line `*3` -- -- :start -- -- Ex :vi -- -- -- -- -- -- cgit From bfe8a39512bc4dbf4921c56158c61a172e8f10cf Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 26 Oct 2023 06:41:54 +0800 Subject: vim-patch:partial:5985879e3c36 (#25780) runtime(doc): Fix typos in several documents (vim/vim#13420) * Fix typos in several documents * Update runtime/doc/terminal.txt https://github.com/vim/vim/commit/5985879e3c36383155f84649fa42d06813a1893e Skip runtime/doc/indent.txt: not ported yet Co-authored-by: h_east Co-authored-by: K.Takata --- runtime/doc/intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/doc/intro.txt') diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 299c18ac2e..85115fc22b 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -89,7 +89,7 @@ Nvim development is funded separately from Vim: ============================================================================== Credits *credits* -Most of Vim was written by Bram Moolenaar |Bram-Moolenaar| +Most of Vim was written by Bram Moolenaar |Bram-Moolenaar|. Parts of the documentation come from several Vi manuals, written by: W.N. Joy -- cgit