diff options
| author | Florian Walch <florian@fwalch.com> | 2016-01-24 12:58:44 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2016-01-24 12:58:44 +0100 |
| commit | c5f37c0fc0bffcb7be4e45eec38879025f255353 (patch) | |
| tree | 51f23c02c5c6861a96814456b00178339bd432c3 /src | |
| parent | 4172ce4eb078fe63cf3696dd10f9bdf47cd70eb1 (diff) | |
| parent | 7c94b2c3435e337b7d908f10ac03819ac7e41679 (diff) | |
| download | rneovim-c5f37c0fc0bffcb7be4e45eec38879025f255353.tar.gz rneovim-c5f37c0fc0bffcb7be4e45eec38879025f255353.tar.bz2 rneovim-c5f37c0fc0bffcb7be4e45eec38879025f255353.zip | |
Merge pull request #4090 from jbradaric/vim-7.4.739
vim-patch:7.4.739
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
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, |