aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-29 08:54:38 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-29 09:27:19 -0400
commit0a0034718c00fd9f434d20d29e415287db284bbe (patch)
tree8d99d94c42772a4c39acf059745609b85d596974 /runtime/doc
parent27fb03f5a03db6738967f9e0e0ea85ea0fab7592 (diff)
downloadrneovim-0a0034718c00fd9f434d20d29e415287db284bbe.tar.gz
rneovim-0a0034718c00fd9f434d20d29e415287db284bbe.tar.bz2
rneovim-0a0034718c00fd9f434d20d29e415287db284bbe.zip
vim-patch:2547aa930b59
Update runtime files. https://github.com/vim/vim/commit/2547aa930b59f5e2bcb70e81d5a57ed461e59b4f Omit modifyOtherKeys, vim9, vim.man.
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/arabic.txt4
-rw-r--r--runtime/doc/change.txt2
-rw-r--r--runtime/doc/digraph.txt2
-rw-r--r--runtime/doc/ft_sql.txt6
-rw-r--r--runtime/doc/mbyte.txt8
-rw-r--r--runtime/doc/repeat.txt2
-rw-r--r--runtime/doc/rileft.txt2
-rw-r--r--runtime/doc/sign.txt2
-rw-r--r--runtime/doc/syntax.txt2
-rw-r--r--runtime/doc/usr_27.txt2
10 files changed, 17 insertions, 15 deletions
diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt
index a3d979e519..df91b8d065 100644
--- a/runtime/doc/arabic.txt
+++ b/runtime/doc/arabic.txt
@@ -72,7 +72,7 @@ Arabic requires ISO-8859-6 as well as Presentation Form-B fonts
(without Form-B, Arabic will _NOT_ be usable). It is highly
recommended that users search for so-called 'ISO-10646-1' fonts.
Do an Internet search or check www.arabeyes.org for further
-info on where to attain the necessary Arabic fonts.
+info on where to obtain the necessary Arabic fonts.
Font Installation
@@ -118,7 +118,7 @@ o Setting the appropriate character Encoding
>
:set encoding=utf-8
<
- to your vimrc file (entering the command manually into you VIM
+ to your vimrc file (entering the command manually into your Vim
window is highly discouraged). In short, include ':set
encoding=utf-8' to your vimrc file.
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index e8ca9ba7a0..18cafa8d63 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1698,7 +1698,7 @@ Some examples:
Automatic formatting *auto-format* *autoformat*
When the 'a' flag is present in 'formatoptions' text is formatted
-automatically when inserting text or deleting text. This works nice for
+automatically when inserting text or deleting text. This works nicely for
editing text paragraphs. A few hints on how to use this:
- You need to properly define paragraphs. The simplest is paragraphs that are
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
index 271b8c2597..b7dc16341d 100644
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -30,6 +30,8 @@ An alternative is using the 'keymap' option.
it is the Unicode character, see |digraph-encoding|.
Example: >
:digr e: 235 a: 228
+< You can use `:exe` to enter a hex number: >
+ :exe 'digr += ' .. 0x2A72
< Avoid defining a digraph with '_' (underscore) as the
first character, it has a special meaning in the
future.
diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt
index f0a70d993e..f38c8edbf3 100644
--- a/runtime/doc/ft_sql.txt
+++ b/runtime/doc/ft_sql.txt
@@ -308,7 +308,7 @@ can create any of the following: >
~/.config/nvim/indent/sqlite.vim
No changes are necessary to the SQLSetType function. It will automatically
-pickup the new SQL files and load them when you issue the SQLSetType command.
+pick up the new SQL files and load them when you issue the SQLSetType command.
==============================================================================
@@ -515,7 +515,7 @@ beginning with those characters. >
4.3.2 Column Completion: *sql-completion-columns*
The SQL completion plugin can also display a list of columns for particular
-tables. The column completion is trigger via <C-C>c.
+tables. The column completion is triggered via <C-C>c.
NOTE: The following example uses <Right> to trigger a column list while
the popup window is active.
@@ -723,7 +723,7 @@ your platform (often a case on *nix) you define the following variable in
your |init.vim|: >
let g:omni_sql_no_default_maps = 1
-Do no edit ftplugin/sql.vim directly! If you change this file your changes
+Do not edit ftplugin/sql.vim directly! If you change this file your changes
will be over written on future updates. Vim has a special directory structure
which allows you to make customizations without changing the files that are
included with the Vim distribution. If you wish to customize the maps
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index a6410a09cb..952e8efad7 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -90,7 +90,7 @@ There are several ways to enter multi-byte characters:
- For MS-Windows IME can be used. See |IME|.
- For all systems keymaps can be used. See |mbyte-keymap|.
-The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose
+The options 'iminsert', 'imsearch' and 'imcmdline' can be used to choose
the different input methods or disable them temporarily.
==============================================================================
@@ -103,8 +103,8 @@ in, or just use a certain locale inside Vim.
WHAT IS A LOCALE? *locale*
-There are many of languages in the world. And there are different cultures
-and environments at least as much as the number of languages. A linguistic
+There are many languages in the world. And there are different cultures and
+environments at least as many as the number of languages. A linguistic
environment corresponding to an area is called "locale". This includes
information about the used language, the charset, collating order for sorting,
date format, currency format and so on. For Vim only the language and charset
@@ -512,7 +512,7 @@ input_server_name is your |IM-server| name (check your |IM-server|
your_input_style is one of |OverTheSpot|, |OffTheSpot|, |Root|. See
also |xim-input-style|.
-*international may not necessary if you use X11R6.
+*international may not be necessary if you use X11R6.
*.inputMethod and *.preeditType are optional if you use X11R6.
For example, when you are using kinput2 as |IM-server|, >
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 31bd93ca24..fb41c459f1 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -596,7 +596,7 @@ Creating Vim packages *package-create*
This assumes you write one or more plugins that you distribute as a package.
If you have two unrelated plugins you would use two packages, so that Vim
-users can chose what they include or not. Or you can decide to use one
+users can choose what they include or not. Or you can decide to use one
package with optional plugins, and tell the user to add the ones he wants with
`:packadd`.
diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt
index 550a696de0..d45a2dce7e 100644
--- a/runtime/doc/rileft.txt
+++ b/runtime/doc/rileft.txt
@@ -64,7 +64,7 @@ o Invocations
+ 'rightleft' ('rl') sets window orientation to right-to-left.
+ 'delcombine' ('deco'), boolean, if editing UTF-8 encoded languages,
allows one to remove a composing character which gets superimposed
- on those that proceeded them (some languages require this).
+ on those that preceded them (some languages require this).
+ 'rightleftcmd' ('rlc') sets the command-line within certain modes
(such as search) to be utilized in right-to-left orientation as well.
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 563f14f4c8..2ee5c31c01 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -68,7 +68,7 @@ other plugins using signs.
*sign-priority*
Each placed sign is assigned a priority value. When multiple signs are placed
on the same line, the attributes of the sign with the highest priority is used
-independent of the sign group. The default priority for a sign is 10. The
+independently of the sign group. The default priority for a sign is 10. The
priority is assigned at the time of placing a sign.
When the line on which the sign is placed is deleted, the sign is moved to the
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 124117169a..f0aded842c 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1906,7 +1906,7 @@ new highlightings for the following groups.:
Debug, DebugSpecial, DebugString, DebugBoolean, DebugType
which are used for the statement itself, special characters used in debug
strings, strings, boolean constants and types (this, super) respectively. I
-have opted to chose another background for those statements.
+have opted to choose another background for those statements.
Javadoc is a program that takes special comments out of Java program files and
creates HTML pages. The standard configuration will highlight this HTML code
diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt
index 57eafce7a6..230603de70 100644
--- a/runtime/doc/usr_27.txt
+++ b/runtime/doc/usr_27.txt
@@ -434,7 +434,7 @@ redefined without changing the search pattern.
/\f\+
-The "\f" items stands for file name characters. Thus this matches a sequence
+The "\f" item stands for file name characters. Thus this matches a sequence
of characters that can be a file name.
Which characters can be part of a file name depends on the system you are
using. On MS-Windows, the backslash is included, on Unix it is not. This is