Mercurial > vim
diff src/ex_docmd.c @ 15543:dd725a8ab112 v8.1.0779
patch 8.1.0779: argument for message functions is inconsistent
commit https://github.com/vim/vim/commit/32526b3c1846025f0e655f41efd4e5428da16b6c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 19 17:43:09 2019 +0100
patch 8.1.0779: argument for message functions is inconsistent
Problem: Argument for message functions is inconsistent.
Solution: Make first argument to msg() "char *".
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 19 Jan 2019 17:45:07 +0100 |
parents | 41fbbcea0f1b |
children | d89c5b339c2a |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -562,7 +562,7 @@ do_exmode( ++hold_gui_events; #endif - MSG(_("Entering Ex mode. Type \"visual\" to go to Normal mode.")); + msg(_("Entering Ex mode. Type \"visual\" to go to Normal mode.")); while (exmode_active) { /* Check for a ":normal" command and no more characters left. */ @@ -1019,7 +1019,7 @@ do_cmdline( smsg(_("line %ld: %s"), (long)sourcing_lnum, cmdline_copy); if (msg_silent == 0) - msg_puts((char_u *)"\n"); /* don't overwrite this */ + msg_puts("\n"); /* don't overwrite this */ verbose_leave_scroll(); --no_wait_return; @@ -6043,7 +6043,7 @@ uc_list(char_u *name, size_t name_len) /* Put out the title first time */ if (!found) - MSG_PUTS_TITLE(_("\n Name Args Address Complete Definition")); + msg_puts_title(_("\n Name Args Address Complete Definition")); found = TRUE; msg_putchar('\n'); if (got_int) @@ -6150,7 +6150,7 @@ uc_list(char_u *name, size_t name_len) } if (!found) - MSG(_("No user-defined commands found")); + msg(_("No user-defined commands found")); } static char * @@ -7239,13 +7239,13 @@ ex_colorscheme(exarg_T *eap) } if (p != NULL) { - MSG(p); + msg((char *)p); vim_free(p); } else - MSG("default"); + msg("default"); #else - MSG(_("unknown")); + msg(_("unknown")); #endif } else if (load_colors(eap->arg) == FAIL) @@ -7256,7 +7256,7 @@ ex_colorscheme(exarg_T *eap) ex_highlight(exarg_T *eap) { if (*eap->arg == NUL && eap->cmd[2] == '!') - MSG(_("Greetings, Vim user!")); + msg(_("Greetings, Vim user!")); do_highlight(eap->arg, eap->forceit, FALSE); } @@ -7672,7 +7672,7 @@ ex_tabonly(exarg_T *eap) else # endif if (first_tabpage->tp_next == NULL) - MSG(_("Already only one tab page")); + msg(_("Already only one tab page")); else { tab_number = get_tabpage_arg(eap); @@ -8921,9 +8921,9 @@ ex_popup(exarg_T *eap) ex_swapname(exarg_T *eap UNUSED) { if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL) - MSG(_("No swap file")); + msg(_("No swap file")); else - msg(curbuf->b_ml.ml_mfp->mf_fname); + msg((char *)curbuf->b_ml.ml_mfp->mf_fname); } /* @@ -9221,7 +9221,7 @@ ex_pwd(exarg_T *eap UNUSED) #ifdef BACKSLASH_IN_FILENAME slash_adjust(NameBuff); #endif - msg(NameBuff); + msg((char *)NameBuff); } else emsg(_("E187: Unknown")); @@ -9402,7 +9402,7 @@ ex_winpos(exarg_T *eap) # endif { sprintf((char *)IObuff, _("Window position: X %d, Y %d"), x, y); - msg(IObuff); + msg((char *)IObuff); } else # endif