mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 01:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6993 from ckelsel/vim-7.4.2250

Browse Source 
Vim 7.4.2250
This commit is contained in:
James McCoy
2017-07-13 23:19:12 -04:00
committed by GitHub
parent f746e38955 06f4b96322
commit c4ac3ffbef
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval.c
View File

@@ -12451,7 +12451,7 @@ static void f_matchadd(typval_T *argvars, typval_T *rettv, FunPtr fptr)
return; return;
} }
if (id >= 1 && id <= 3) { if (id >= 1 && id <= 3) {
EMSGN("E798: ID is reserved for \":match\": %" PRId64, id); EMSGN(_("E798: ID is reserved for \":match\": %" PRId64), id);
return; return;
} }
@@ -12508,7 +12508,7 @@ static void f_matchaddpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
// id == 3 is ok because matchaddpos() is supposed to substitute :3match // id == 3 is ok because matchaddpos() is supposed to substitute :3match
if (id == 1 || id == 2) { if (id == 1 || id == 2) {
EMSGN("E798: ID is reserved for \"match\": %" PRId64, id); EMSGN(_("E798: ID is reserved for \"match\": %" PRId64), id);
return; return;
} }

7
src/nvim/ex_cmds.c
View File

@@ -5023,8 +5023,9 @@ static void helptags_one(char_u *dir, char_u *ext, char_u *tagfname,
if (gen_expand_wildcards(1, buff_list, &filecount, &files, if (gen_expand_wildcards(1, buff_list, &filecount, &files,
EW_FILE|EW_SILENT) == FAIL EW_FILE|EW_SILENT) == FAIL
|| filecount == 0) { || filecount == 0) {
if (!got_int) if (!got_int) {
EMSG2("E151: No match: %s", NameBuff); EMSG2(_("E151: No match: %s"), NameBuff);
}
return; return;
} }
@@ -5223,7 +5224,7 @@ static void do_helptags(char_u *dirname, bool add_help_tags)
if (gen_expand_wildcards(1, buff_list, &filecount, &files, if (gen_expand_wildcards(1, buff_list, &filecount, &files,
EW_FILE|EW_SILENT) == FAIL EW_FILE|EW_SILENT) == FAIL
|| filecount == 0) { || filecount == 0) {
EMSG2("E151: No match: %s", NameBuff); EMSG2(_("E151: No match: %s"), NameBuff);
xfree(dirname); xfree(dirname);
return; return;
} }

2
src/nvim/spell.c
View File

@@ -2068,7 +2068,7 @@ char_u *did_set_spelllang(win_T *wp)
// destroying the buffer we are using... // destroying the buffer we are using...
if (!bufref_valid(&bufref)) { if (!bufref_valid(&bufref)) {
ret_msg = ret_msg =
(char_u *)"E797: SpellFileMissing autocommand deleted buffer"; (char_u *)N_("E797: SpellFileMissing autocommand deleted buffer");
goto theend; goto theend;
} }
} }

2
src/nvim/version.c
View File

@@ -194,7 +194,7 @@ static const int included_patches[] = {
// 2253 NA // 2253 NA
// 2252 NA // 2252 NA
2251, 2251,
// 2250, 2250,
2249, 2249,
2248, 2248,
// 2247 NA // 2247 NA

18
src/nvim/window.c
View File

@@ -5532,8 +5532,8 @@ int match_add(win_T *wp, const char *const grp, const char *const pat,
return -1; return -1;
} }
if (id < -1 || id == 0) { if (id < -1 || id == 0) {
EMSGN("E799: Invalid ID: %" PRId64 EMSGN(_("E799: Invalid ID: %" PRId64
" (must be greater than or equal to 1)", " (must be greater than or equal to 1)"),
id); id);
return -1; 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; cur = wp->w_match_head;
while (cur != NULL) { while (cur != NULL) {
if (cur->id == id) { if (cur->id == id) {
EMSGN("E801: ID already taken: %" PRId64, id); EMSGN(_("E801: ID already taken: %" PRId64), id);
return -1; return -1;
} }
cur = cur->next; cur = cur->next;
@@ -5705,10 +5705,11 @@ int match_delete(win_T *wp, int id, int perr)
int rtype = SOME_VALID; int rtype = SOME_VALID;
if (id < 1) { if (id < 1) {
if (perr == TRUE) if (perr) {
EMSGN("E802: Invalid ID: %" PRId64 EMSGN(_("E802: Invalid ID: %" PRId64
" (must be greater than or equal to 1)", " (must be greater than or equal to 1)"),
id); id);
}
return -1; return -1;
} }
while (cur != NULL && cur->id != id) { while (cur != NULL && cur->id != id) {
@@ -5716,8 +5717,9 @@ int match_delete(win_T *wp, int id, int perr)
cur = cur->next; cur = cur->next;
} }
if (cur == NULL) { if (cur == NULL) {
if (perr == TRUE) if (perr) {
EMSGN("E803: ID not found: %" PRId64, id); EMSGN(_("E803: ID not found: %" PRId64), id);
}
return -1; return -1;
} }
if (cur == prev) if (cur == prev)