From c805f2cf54aa4ab066bb9e7f3d5b7cc40d04004e Mon Sep 17 00:00:00 2001 From: ckelsel Date: Mon, 10 Jul 2017 08:55:54 +0800 Subject: vim-patch:7.4.2250 Problem: Some error message cannot be translated. Solution: Enclose them in _() and N_(). (Dominique Pelle) https://github.com/vim/vim/commit/5b30291785e6b9be1a607504c14bd03c601b59a6 --- src/nvim/window.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/nvim/window.c') diff --git a/src/nvim/window.c b/src/nvim/window.c index 43af2e5e4f..079e0647e1 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5532,8 +5532,8 @@ int match_add(win_T *wp, const char *const grp, const char *const pat, return -1; } if (id < -1 || id == 0) { - EMSGN("E799: Invalid ID: %" PRId64 - " (must be greater than or equal to 1)", + EMSGN(_("E799: Invalid ID: %" PRId64 + " (must be greater than or equal to 1)"), id); return -1; } @@ -5541,7 +5541,7 @@ int match_add(win_T *wp, const char *const grp, const char *const pat, cur = wp->w_match_head; while (cur != NULL) { if (cur->id == id) { - EMSGN("E801: ID already taken: %" PRId64, id); + EMSGN(_("E801: ID already taken: %" PRId64), id); return -1; } cur = cur->next; @@ -5706,8 +5706,8 @@ int match_delete(win_T *wp, int id, int perr) if (id < 1) { if (perr == TRUE) - EMSGN("E802: Invalid ID: %" PRId64 - " (must be greater than or equal to 1)", + EMSGN(_("E802: Invalid ID: %" PRId64 + " (must be greater than or equal to 1)"), id); return -1; } @@ -5717,7 +5717,7 @@ int match_delete(win_T *wp, int id, int perr) } if (cur == NULL) { if (perr == TRUE) - EMSGN("E803: ID not found: %" PRId64, id); + EMSGN(_("E803: ID not found: %" PRId64), id); return -1; } if (cur == prev) -- cgit From 06f4b963222efd2a986e79b7390b50d6e42941be Mon Sep 17 00:00:00 2001 From: ckelsel Date: Tue, 11 Jul 2017 08:27:05 +0800 Subject: lint --- src/nvim/window.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/nvim/window.c') diff --git a/src/nvim/window.c b/src/nvim/window.c index 079e0647e1..29f5412ba0 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5533,7 +5533,7 @@ int match_add(win_T *wp, const char *const grp, const char *const pat, } if (id < -1 || id == 0) { EMSGN(_("E799: Invalid ID: %" PRId64 - " (must be greater than or equal to 1)"), + " (must be greater than or equal to 1)"), id); return -1; } @@ -5705,10 +5705,11 @@ int match_delete(win_T *wp, int id, int perr) int rtype = SOME_VALID; if (id < 1) { - if (perr == TRUE) + if (perr) { EMSGN(_("E802: Invalid ID: %" PRId64 - " (must be greater than or equal to 1)"), + " (must be greater than or equal to 1)"), id); + } return -1; } while (cur != NULL && cur->id != id) { @@ -5716,8 +5717,9 @@ int match_delete(win_T *wp, int id, int perr) cur = cur->next; } if (cur == NULL) { - if (perr == TRUE) + if (perr) { EMSGN(_("E803: ID not found: %" PRId64), id); + } return -1; } if (cur == prev) -- cgit