mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16730 from VVKot/vim-8.1.0136

Browse Source 
vim-patch:8.1.{136, 139, 164, 300, 672, 748}
This commit is contained in:
zeertzjq
2022-03-09 16:13:20 +08:00
committed by GitHub
parent b743e415fe ee903e86fd
commit 5ad63c3d98
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/regexp.c
View File

@@ -468,6 +468,8 @@ static int toggle_Magic(int x)
#define EMSG_RET_FAIL(m) return (emsg(m), rc_did_emsg = true, FAIL) #define EMSG_RET_FAIL(m) return (emsg(m), rc_did_emsg = true, FAIL)
#define EMSG2_RET_NULL(m, c) \ #define EMSG2_RET_NULL(m, c) \
return (semsg((m), (c) ? "" : "\\"), rc_did_emsg = true, (void *)NULL) return (semsg((m), (c) ? "" : "\\"), rc_did_emsg = true, (void *)NULL)
#define EMSG3_RET_NULL(m, c, a) \
return (semsg((const char *)(m), (c) ? "" : "\\", (a)), rc_did_emsg = true, (void *)NULL)
#define EMSG2_RET_FAIL(m, c) \ #define EMSG2_RET_FAIL(m, c) \
return (semsg((m), (c) ? "" : "\\"), rc_did_emsg = true, FAIL) return (semsg((m), (c) ? "" : "\\"), rc_did_emsg = true, FAIL)
#define EMSG_ONE_RET_NULL EMSG2_RET_NULL(_( \ #define EMSG_ONE_RET_NULL EMSG2_RET_NULL(_( \
@@ -1762,13 +1764,9 @@ static char_u *regpiece(int *flagp)
if (re_multi_type(peekchr()) != NOT_MULTI) { if (re_multi_type(peekchr()) != NOT_MULTI) {
// Can't have a multi follow a multi. // Can't have a multi follow a multi.
if (peekchr() == Magic('*')) { if (peekchr() == Magic('*')) {
snprintf((char *)IObuff, IOSIZE, _("E61: Nested %s*"), EMSG2_RET_NULL(_("E61: Nested %s*"), reg_magic >= MAGIC_ON);
reg_magic >= MAGIC_ON ? "" : "\\");
} else {
snprintf((char *)IObuff, IOSIZE, _("E62: Nested %s%c"),
reg_magic == MAGIC_ALL ? "" : "\\", no_Magic(peekchr()));
} }
EMSG_RET_NULL((char *)IObuff); EMSG3_RET_NULL(_("E62: Nested %s%c"), reg_magic == MAGIC_ALL, no_Magic(peekchr()));
} }
return ret; return ret;
@@ -1927,10 +1925,8 @@ static char_u *regatom(int *flagp)
case Magic('{'): case Magic('{'):
case Magic('*'): case Magic('*'):
c = no_Magic(c); c = no_Magic(c);
snprintf((char *)IObuff, IOSIZE, _("E64: %s%c follows nothing"), EMSG3_RET_NULL(_("E64: %s%c follows nothing"),
(c == '*' ? reg_magic >= MAGIC_ON : reg_magic == MAGIC_ALL) (c == '*' ? reg_magic >= MAGIC_ON : reg_magic == MAGIC_ALL), c);
? "" : "\\", c);
EMSG_RET_NULL((char *)IObuff);
// NOTREACHED // NOTREACHED
case Magic('~'): /* previous substitute pattern */ case Magic('~'): /* previous substitute pattern */
@@ -2537,7 +2533,9 @@ do_multibyte:
static bool re_mult_next(char *what) static bool re_mult_next(char *what)
{ {
if (re_multi_type(peekchr()) == MULTI_MULT) { if (re_multi_type(peekchr()) == MULTI_MULT) {
EMSG2_RET_FAIL(_("E888: (NFA regexp) cannot repeat %s"), what); semsg(_("E888: (NFA regexp) cannot repeat %s"), what);
rc_did_emsg = true;
return false;
} }
return true; return true;
} }
@@ -3149,9 +3147,7 @@ static int read_limits(long *minval, long *maxval)
regparse++; // Allow either \{...} or \{...\} regparse++; // Allow either \{...} or \{...\}
} }
if (*regparse != '}') { if (*regparse != '}') {
snprintf((char *)IObuff, IOSIZE, _("E554: Syntax error in %s{...}"), EMSG2_RET_FAIL(_("E554: Syntax error in %s{...}"), reg_magic == MAGIC_ALL);
reg_magic == MAGIC_ALL ? "" : "\\");
EMSG_RET_FAIL((char *)IObuff);
} }
/* /*