aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03: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

62
src/buffer.c
View File

@@ -162,10 +162,10 @@ open_buffer(
*/
if (curbuf == NULL)
{
EMSG(_("E82: Cannot allocate any buffer, exiting..."));
emsg(_("E82: Cannot allocate any buffer, exiting..."));
getout(2);
}
EMSG(_("E83: Cannot allocate buffer, using other one..."));
emsg(_("E83: Cannot allocate buffer, using other one..."));
enter_buffer(curbuf);
#ifdef FEAT_SYN_HL
if (old_tw != curbuf->b_p_tw)
@@ -396,7 +396,7 @@ buf_hashtab_add(buf_T *buf)
{
sprintf((char *)buf->b_key, "%x", buf->b_fnum);
if (hash_add(&buf_hashtab, buf->b_key) == FAIL)
EMSG(_("E931: Buffer cannot be registered"));
emsg(_("E931: Buffer cannot be registered"));
}
static void
@@ -430,7 +430,7 @@ can_unload_buffer(buf_T *buf)
}
}
if (!can_unload)
EMSG(_("E937: Attempt to delete a buffer that is in use"));
emsg(_("E937: Attempt to delete a buffer that is in use"));
return can_unload;
}
@@ -548,7 +548,7 @@ close_buffer(
{
/* Autocommands deleted the buffer. */
aucmd_abort:
EMSG(_(e_auabort));
emsg(_(e_auabort));
return;
}
--buf->b_locked;
@@ -1115,7 +1115,7 @@ handle_swap_exists(bufref_T *old_curbuf)
*
* Returns error message or NULL
*/
char_u *
char *
do_bufdel(
int command,
char_u *arg, /* pointer to extra arguments */
@@ -1126,7 +1126,7 @@ do_bufdel(
{
int do_current = 0; /* delete current buffer? */
int deleted = 0; /* number of buffers deleted */
char_u *errormsg = NULL; /* return value */
char *errormsg = NULL; /* return value */
int bnr; /* buffer number */
char_u *p;
@@ -1139,7 +1139,7 @@ do_bufdel(
if (addr_count == 2)
{
if (*arg) /* both range and argument is not allowed */
return (char_u *)_(e_trailing);
return _(e_trailing);
bnr = start_bnr;
}
else /* addr_count == 1 */
@@ -1197,18 +1197,18 @@ do_bufdel(
STRCPY(IObuff, _("E516: No buffers were deleted"));
else
STRCPY(IObuff, _("E517: No buffers were wiped out"));
errormsg = IObuff;
errormsg = (char *)IObuff;
}
else if (deleted >= p_report)
{
if (command == DOBUF_UNLOAD)
smsg((char_u *)NGETTEXT("%d buffer unloaded",
smsg(NGETTEXT("%d buffer unloaded",
"%d buffers unloaded", deleted), deleted);
else if (command == DOBUF_DEL)
smsg((char_u *)NGETTEXT("%d buffer deleted",
smsg(NGETTEXT("%d buffer deleted",
"%d buffers deleted", deleted), deleted);
else
smsg((char_u *)NGETTEXT("%d buffer wiped out",
smsg(NGETTEXT("%d buffer wiped out",
"%d buffers wiped out", deleted), deleted);
}
}
@@ -1233,7 +1233,7 @@ empty_curbuf(
if (action == DOBUF_UNLOAD)
{
EMSG(_("E90: Cannot unload last buffer"));
emsg(_("E90: Cannot unload last buffer"));
return FAIL;
}
@@ -1307,7 +1307,7 @@ do_buffer(
}
if (!bufIsChanged(buf))
{
EMSG(_("E84: No modified buffer found"));
emsg(_("E84: No modified buffer found"));
return FAIL;
}
}
@@ -1346,7 +1346,7 @@ do_buffer(
if (bp == buf)
{
/* back where we started, didn't find anything. */
EMSG(_("E85: There is no listed buffer"));
emsg(_("E85: There is no listed buffer"));
return FAIL;
}
}
@@ -1358,12 +1358,12 @@ do_buffer(
{
/* don't warn when deleting */
if (!unload)
EMSGN(_(e_nobufnr), count);
semsg(_(e_nobufnr), count);
}
else if (dir == FORWARD)
EMSG(_("E87: Cannot go beyond last buffer"));
emsg(_("E87: Cannot go beyond last buffer"));
else
EMSG(_("E88: Cannot go before first buffer"));
emsg(_("E88: Cannot go before first buffer"));
return FAIL;
}
@@ -1407,7 +1407,7 @@ do_buffer(
else
#endif
{
EMSGN(_("E89: No write since last change for buffer %ld (add ! to override)"),
semsg(_("E89: No write since last change for buffer %ld (add ! to override)"),
buf->b_fnum);
return FAIL;
}
@@ -1832,10 +1832,10 @@ no_write_message(void)
{
#ifdef FEAT_TERMINAL
if (term_job_running(curbuf->b_term))
EMSG(_("E948: Job still running (add ! to end the job)"));
emsg(_("E948: Job still running (add ! to end the job)"));
else
#endif
EMSG(_("E37: No write since last change (add ! to override)"));
emsg(_("E37: No write since last change (add ! to override)"));
}
void
@@ -1843,10 +1843,10 @@ no_write_message_nobang(buf_T *buf UNUSED)
{
#ifdef FEAT_TERMINAL
if (term_job_running(buf->b_term))
EMSG(_("E948: Job still running"));
emsg(_("E948: Job still running"));
else
#endif
EMSG(_("E37: No write since last change"));
emsg(_("E37: No write since last change"));
}
/*
@@ -2057,7 +2057,7 @@ buflist_new(
buf->b_fnum = top_file_num++;
if (top_file_num < 0) /* wrap around (may cause duplicates) */
{
EMSG(_("W14: Warning: List of file names overflow"));
emsg(_("W14: Warning: List of file names overflow"));
if (emsg_silent == 0)
{
out_flush();
@@ -2281,9 +2281,9 @@ buflist_getfile(
if (buf == NULL)
{
if ((options & GETF_ALT) && n == 0)
EMSG(_(e_noalt));
emsg(_(e_noalt));
else
EMSGN(_("E92: Buffer %ld not found"), n);
semsg(_("E92: Buffer %ld not found"), n);
return FAIL;
}
@@ -2568,9 +2568,9 @@ buflist_findpat(
}
if (match == -2)
EMSG2(_("E93: More than one match for %s"), pattern);
semsg(_("E93: More than one match for %s"), pattern);
else if (match < 0)
EMSG2(_("E94: No matching buffer for %s"), pattern);
semsg(_("E94: No matching buffer for %s"), pattern);
return match;
}
@@ -3172,7 +3172,7 @@ setfname(
if (obuf->b_ml.ml_mfp != NULL) /* it's loaded, fail */
{
if (message)
EMSG(_("E95: Buffer with this name already exists"));
emsg(_("E95: Buffer with this name already exists"));
vim_free(ffname);
return FAIL;
}
@@ -3298,7 +3298,7 @@ getaltfname(
if (buflist_name_nr(0, &fname, &dummy) == FAIL)
{
if (errmsg)
EMSG(_(e_noalt));
emsg(_(e_noalt));
return NULL;
}
return fname;
@@ -5730,7 +5730,7 @@ bt_dontwrite_msg(buf_T *buf)
{
if (bt_dontwrite(buf))
{
EMSG(_("E382: Cannot write, 'buftype' option is set"));
emsg(_("E382: Cannot write, 'buftype' option is set"));
return TRUE;
}
return FALSE;