mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 15:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-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
            vim/vim#3302)  Also make emsg() accept a "char *" argument.  Get rid of
            an enormous number of type casts.
f9e3e09fdc
This commit is contained in:
James McCoy
2021-10-18 09:08:46 -04:00
parent 684640f551
commit efa924f66b
75 changed files with 1697 additions and 1741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/mark.c
View File

@@ -564,19 +564,19 @@ static void fmarks_check_one(xfmark_T *fm, char_u *name, buf_T *buf)
int check_mark(pos_T *pos)
{
if (pos == NULL) {
EMSG(_(e_umark));
emsg(_(e_umark));
return FAIL;
}
if (pos->lnum <= 0) {
// 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;
@@ -713,7 +713,7 @@ static void show_one_mark(int c, char_u *arg, pos_T *p, char_u *name_arg, int cu
if (arg == NULL) {
MSG(_("No marks set"));
} else {
EMSG2(_("E283: No marks matching \"%s\""), arg);
semsg(_("E283: No marks matching \"%s\""), arg);
}
}
} else if (!got_int
@@ -762,9 +762,9 @@ void 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
for (p = eap->arg; *p != NUL; ++p) {
@@ -779,7 +779,7 @@ void ex_delmarks(exarg_T *eap)
: (digit ? ascii_isdigit(p[2])
: ASCII_ISUPPER(p[2])))
|| to < from) {
EMSG2(_(e_invarg2), p);
semsg(_(e_invarg2), p);
return;
}
p += 2;
@@ -821,7 +821,7 @@ void ex_delmarks(exarg_T *eap)
case ' ':
break;
default:
EMSG2(_(e_invarg2), p);
semsg(_(e_invarg2), p);
return;
}
}