diff options
author | James McCoy <jamessan@jamessan.com> | 2017-07-26 07:07:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-26 07:07:00 -0400 |
commit | 86f0cd7902bc232ea51b06b2c4dd4758a479b3b4 (patch) | |
tree | ee875a305438ddc71da486cc5183e144e24b8eed | |
parent | 6e83db479ca5d03f29bf92fe49735eba5339b75e (diff) | |
parent | d94e39a517d5ccf895c6f1b95bfb621954f3bbec (diff) | |
download | rneovim-86f0cd7902bc232ea51b06b2c4dd4758a479b3b4.tar.gz rneovim-86f0cd7902bc232ea51b06b2c4dd4758a479b3b4.tar.bz2 rneovim-86f0cd7902bc232ea51b06b2c4dd4758a479b3b4.zip |
Merge pull request #7070 from jbradaric/vim-8.0.0062
vim-patch:8.0.0062
-rw-r--r-- | runtime/doc/digraph.txt | 3 | ||||
-rw-r--r-- | src/nvim/digraph.c | 1 | ||||
-rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index 89351c5b4f..43f8ccab06 100644 --- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -143,7 +143,7 @@ a standard meaning: Two 2 Hook Nine 9 Horn - Equals = Cyrillic (= used as second char) + Equals = Cyrillic (= used as second char) Asterisk * Greek Percent sign % Greek/Cyrillic special Plus + smalls: Arabic, capitals: Hebrew @@ -922,6 +922,7 @@ char digraph hex dec official name ~ † /- 2020 8224 DAGGER ‡ /= 2021 8225 DOUBLE DAGGER ‥ .. 2025 8229 TWO DOT LEADER +… ,. 2026 8230 HORIZONTAL ELLIPSIS ‰ %0 2030 8240 PER MILLE SIGN ′ 1' 2032 8242 PRIME ″ 2' 2033 8243 DOUBLE PRIME diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c index 32e71f61f7..bfb1b94738 100644 --- a/src/nvim/digraph.c +++ b/src/nvim/digraph.c @@ -793,6 +793,7 @@ static digr_T digraphdefault[] = { '/', '-', 0x2020 }, { '/', '=', 0x2021 }, { '.', '.', 0x2025 }, + { ',', '.', 0x2026 }, { '%', '0', 0x2030 }, { '1', '\'', 0x2032 }, { '2', '\'', 0x2033 }, diff --git a/src/nvim/version.c b/src/nvim/version.c index 62e8919913..bc478c4123 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -667,7 +667,7 @@ static const int included_patches[] = { // 65 NA 64, // 63, - // 62, + 62, // 61 NA 60, // 59 NA |