Patch 8.2.1633

[Bram Moolenaar]

Patch 8.2.1633
Problem: Some error messages are internal but do not use iemsg().
Solution: Use iemsg(). (Dominique Pellé, closes #6894)
Files: src/regexp.c, src/regexp_bt.c, src/regexp_nfa.c


*** ../vim-8.2.1632/src/regexp.c 2020-09-06 17:09:09.026021160 +0200
--- src/regexp.c 2020-09-07 18:43:37.593430217 +0200
***************
*** 2279,2285 ****
else if (*s == NUL) // we hit NUL.
{
if (copy)
! emsg(_(e_re_damg));
goto exit;
}
else
--- 2279,2285 ----
else if (*s == NUL) // we hit NUL.
{
if (copy)
! iemsg(_(e_re_damg));
goto exit;
}
else
*** ../vim-8.2.1632/src/regexp_bt.c 2020-06-12 22:59:07.270097188 +0200
--- src/regexp_bt.c 2020-09-07 18:43:37.597430207 +0200
***************
*** 2293,2299 ****
int flags;

if (expr == NULL)
! EMSG_RET_NULL(_(e_null));

init_class_tab();

--- 2293,2299 ----
int flags;

if (expr == NULL)
! IEMSG_RET_NULL(_(e_null));

init_class_tab();

***************
*** 2917,2923 ****
break;

default: // Oh dear. Called inappropriately.
! emsg(_(e_re_corr));
#ifdef DEBUG
printf("Called regrepeat with op code %d\n", OP(p));
#endif
--- 2917,2923 ----
break;

default: // Oh dear. Called inappropriately.
! iemsg(_(e_re_corr));
#ifdef DEBUG
printf("Called regrepeat with op code %d\n", OP(p));
#endif
***************
*** 4099,4105 ****
break;

default:
! emsg(_(e_re_corr));
#ifdef DEBUG
printf("Illegal op code %d\n", op);
#endif
--- 4099,4105 ----
break;

default:
! iemsg(_(e_re_corr));
#ifdef DEBUG
printf("Illegal op code %d\n", op);
#endif
***************
*** 4499,4505 ****
{
// We get here only if there's trouble -- normally "case END" is
// the terminating point.
! emsg(_(e_re_corr));
#ifdef DEBUG
printf("Premature EOL\n");
#endif
--- 4499,4505 ----
{
// We get here only if there's trouble -- normally "case END" is
// the terminating point.
! iemsg(_(e_re_corr));
#ifdef DEBUG
printf("Premature EOL\n");
#endif
***************
*** 4649,4655 ****
// Be paranoid...
if (prog == NULL || line == NULL)
{
! emsg(_(e_null));
goto theend;
}

--- 4649,4655 ----
// Be paranoid...
if (prog == NULL || line == NULL)
{
! iemsg(_(e_null));
goto theend;
}

*** ../vim-8.2.1632/src/regexp_nfa.c 2020-06-12 22:59:07.270097188 +0200
--- src/regexp_nfa.c 2020-09-07 18:43:37.597430207 +0200
***************
*** 7147,7153 ****
// Be paranoid...
if (prog == NULL || line == NULL)
{
! emsg(_(e_null));
goto theend;
}

--- 7147,7153 ----
// Be paranoid...
if (prog == NULL || line == NULL)
{
! iemsg(_(e_null));
goto theend;
}

*** ../vim-8.2.1632/src/version.c 2020-09-06 22:26:53.418275627 +0200
--- src/version.c 2020-09-07 18:44:54.285236814 +0200
***************
*** 756,757 ****
--- 756,759 ----
{ /* Add new patch number below this line */
+ /**/
+ 1633,
/**/

--
TALL KNIGHT: Firstly. You must get us another shrubbery!
OTHER KNIGHTS: More shrubberies! More shrubberies for the ex-Knights of Ni!
ARTHUR: Not another shrubbery -
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///