diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-04-19 23:15:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 23:15:45 -0400 |
| commit | 462c53eb3ea256bb85eb3916400d984347f0626f (patch) | |
| tree | e196f6fa8b9c03009f383349c86b5ca79acf7199 /src/nvim/eval.c | |
| parent | f0c12012d99b33474bd6bb5dcb0ee3a6c6808789 (diff) | |
| parent | cb02137dfac7357650a2e9cc32acb66326e59058 (diff) | |
| download | rneovim-462c53eb3ea256bb85eb3916400d984347f0626f.tar.gz rneovim-462c53eb3ea256bb85eb3916400d984347f0626f.tar.bz2 rneovim-462c53eb3ea256bb85eb3916400d984347f0626f.zip | |
Merge pull request #6547 from jamessan/vim-7.4.2152
vim-patch:7.4.2152,7.4.2165,7.4.2173,7.4.2179,7.4.2209
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index dcbd7ab152..9f56d8db0c 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -4764,7 +4764,7 @@ static int get_string_tv(char_u **arg, typval_T *rettv, int evaluate) // Special key, e.g.: "\<C-W>" case '<': - extra = trans_special((const char_u **) &p, STRLEN(p), name, true); + extra = trans_special((const char_u **)&p, STRLEN(p), name, true, true); if (extra != 0) { name += extra; break; @@ -8663,7 +8663,6 @@ static void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr) char_u *r; int len; char *txt; - long count; rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; @@ -8691,8 +8690,8 @@ static void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr) s = skipwhite(s + 1); } } - count = (long)(foldend - foldstart + 1); - txt = _("+-%s%3ld lines: "); + unsigned long count = (unsigned long)(foldend - foldstart + 1); + txt = ngettext("+-%s%3ld line: ", "+-%s%3ld lines: ", count); r = xmalloc(STRLEN(txt) + STRLEN(dashes) // for %s + 20 // for %3ld @@ -8712,7 +8711,7 @@ static void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr) static void f_foldtextresult(typval_T *argvars, typval_T *rettv, FunPtr fptr) { char_u *text; - char_u buf[51]; + char_u buf[FOLD_TEXT_LEN]; foldinfo_T foldinfo; int fold_count; |