aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJurica Bradaric <jbradaric@gmail.com>2016-01-24 10:28:41 +0100
committerJurica Bradaric <jbradaric@gmail.com>2016-01-24 10:31:53 +0100
commit7c94b2c3435e337b7d908f10ac03819ac7e41679 (patch)
tree51f23c02c5c6861a96814456b00178339bd432c3 /src
parent4172ce4eb078fe63cf3696dd10f9bdf47cd70eb1 (diff)
downloadrneovim-7c94b2c3435e337b7d908f10ac03819ac7e41679.tar.gz
rneovim-7c94b2c3435e337b7d908f10ac03819ac7e41679.tar.bz2
rneovim-7c94b2c3435e337b7d908f10ac03819ac7e41679.zip
vim-patch:7.4.739
Problem: In a string "\U" only takes 4 digits, while after CTRL-V U eight digits can be used. Solution: Make "\U" also take eight digits. (Christian Brabandt) https://github.com/vim/vim/commit/acc39888cddbc8082fb3b89c1a46646bdca55e42
Diffstat (limited to 'src')
-rw-r--r--src/nvim/eval.c7
-rw-r--r--src/nvim/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index a5a8671697..9bdf314a3a 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -4638,10 +4638,13 @@ static int get_string_tv(char_u **arg, typval_T *rettv, int evaluate)
int n, nr;
int c = toupper(*p);
- if (c == 'X')
+ if (c == 'X') {
n = 2;
- else
+ } else if (*p == 'u') {
n = 4;
+ } else {
+ n = 8;
+ }
nr = 0;
while (--n >= 0 && ascii_isxdigit(p[1])) {
++p;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9fb7314949..edffe357ea 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -385,7 +385,7 @@ static int included_patches[] = {
// 742,
// 741,
// 740,
- // 739,
+ 739,
// 738 NA
// 737,
736,