diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2018-06-08 13:24:58 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-06-08 19:24:58 +0200 |
| commit | 77192889f09a118c8993af79b2eaa7f43623b6c2 (patch) | |
| tree | 0b3a72293fef49c9d2c31b4d1c7adc4e8da47e5c | |
| parent | c7e6bb246715c9f1bef4d0ebe0ec361da9c3a07e (diff) | |
| download | rneovim-77192889f09a118c8993af79b2eaa7f43623b6c2.tar.gz rneovim-77192889f09a118c8993af79b2eaa7f43623b6c2.tar.bz2 rneovim-77192889f09a118c8993af79b2eaa7f43623b6c2.zip | |
vim-patch:8.0.0452: some macros are in lower case (#8505)
Problem: Some macros are in lower case.
Solution: Make a few more macros upper case.
https://github.com/vim/vim/commit/1c46544412382db8b3203d6c78e550df885540bd
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | src/nvim/fold.c | 2 | ||||
| -rw-r--r-- | src/nvim/gettext.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 9c29f18c0c..161ffe57cf 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -8827,7 +8827,7 @@ static void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr) } } unsigned long count = (unsigned long)(foldend - foldstart + 1); - txt = ngettext("+-%s%3ld line: ", "+-%s%3ld lines: ", count); + txt = NGETTEXT("+-%s%3ld line: ", "+-%s%3ld lines: ", count); r = xmalloc(STRLEN(txt) + STRLEN(dashes) // for %s + 20 // for %3ld diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 52ed2fe3dc..282b72b67a 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -1806,7 +1806,7 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, unsigned long count = (unsigned long)(lnume - lnum + 1); vim_snprintf((char *)buf, FOLD_TEXT_LEN, - ngettext("+--%3ld line folded", + NGETTEXT("+--%3ld line folded", "+--%3ld lines folded ", count), count); text = buf; diff --git a/src/nvim/gettext.h b/src/nvim/gettext.h index 60317b8484..acc7e3a92c 100644 --- a/src/nvim/gettext.h +++ b/src/nvim/gettext.h @@ -10,10 +10,11 @@ # else # define N_(x) x # endif +# define NGETTEXT(x, xs, n) ngettext(x, xs, n) #else # define _(x) ((char *)(x)) # define N_(x) x -# define ngettext(x, xs, n) ((n) == 1 ? (x) : (xs)) +# define NGETTEXT(x, xs, n) ((n) == 1 ? (x) : (xs)) # define bindtextdomain(x, y) // empty # define bind_textdomain_codeset(x, y) // empty # define textdomain(x) // empty |