aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-12 06:44:06 -04:00
Code Activity

patch 8.1.0743: giving error messages is not flexible

Browse Source 
Problem:    Giving error messages is not flexible.
Solution:   Add semsg().  Change argument from "char_u *" to "char *", also
            for msg() and get rid of most MSG macros. (Ozaki Kiichi, closes
            #3302)  Also make emsg() accept a "char *" argument.  Get rid of
            an enormous number of type casts.
This commit is contained in:
Bram Moolenaar
2019-01-13 23:38:42 +01:00
parent 05500ece62
commit f9e3e09fdc
95 changed files with 1963 additions and 2018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mark.c
View File

@@ -606,7 +606,7 @@ check_mark(pos_T *pos)
{
if (pos == NULL)
{
EMSG(_(e_umark));
emsg(_(e_umark));
return FAIL;
}
if (pos->lnum <= 0)
@@ -614,12 +614,12 @@ check_mark(pos_T *pos)
/* lnum is negative if mark is in another file can can't get that
* file, error message already give then. */
if (pos->lnum == 0)
EMSG(_(e_marknotset));
emsg(_(e_marknotset));
return FAIL;
}
if (pos->lnum > curbuf->b_ml.ml_line_count)
{
EMSG(_(e_markinval));
emsg(_(e_markinval));
return FAIL;
}
return OK;
@@ -763,7 +763,7 @@ show_one_mark(
if (arg == NULL)
MSG(_("No marks set"));
else
EMSG2(_("E283: No marks matching \"%s\""), arg);
semsg(_("E283: No marks matching \"%s\""), arg);
}
}
/* don't output anything if 'q' typed at --more-- prompt */
@@ -815,9 +815,9 @@ ex_delmarks(exarg_T *eap)
/* clear all marks */
clrallmarks(curbuf);
else if (eap->forceit)
EMSG(_(e_invarg));
emsg(_(e_invarg));
else if (*eap->arg == NUL)
EMSG(_(e_argreq));
emsg(_(e_argreq));
else
{
/* clear specified marks only */
@@ -837,7 +837,7 @@ ex_delmarks(exarg_T *eap)
: ASCII_ISUPPER(p[2])))
|| to < from)
{
EMSG2(_(e_invarg2), p);
semsg(_(e_invarg2), p);
return;
}
p += 2;
@@ -875,7 +875,7 @@ ex_delmarks(exarg_T *eap)
case '<': curbuf->b_visual.vi_start.lnum = 0; break;
case '>': curbuf->b_visual.vi_end.lnum = 0; break;
case ' ': break;
default: EMSG2(_(e_invarg2), p);
default: semsg(_(e_invarg2), p);
return;
}
}