Mercurial > vim
diff src/gui_gtk_x11.c @ 15470:55ccc2d353bd v8.1.0743
patch 8.1.0743: giving error messages is not flexible
commit https://github.com/vim/vim/commit/f9e3e09fdc93be9f0d47afbc6c7df1188c2a5a0d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 13 23:38:42 2019 +0100
patch 8.1.0743: giving error messages is not flexible
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 13 Jan 2019 23:45:08 +0100 |
| parents | f2972ff144ab |
| children | d89c5b339c2a |
line wrap: on
line diff
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -1664,7 +1664,7 @@ gui_mch_early_init_check(int give_messag { gui.dying = TRUE; if (give_message) - EMSG(_((char *)e_opendisp)); + emsg(_((char *)e_opendisp)); return FAIL; } return OK; @@ -1710,7 +1710,7 @@ gui_mch_init_check(void) if (!gtk_init_check(&gui_argc, &gui_argv)) { gui.dying = TRUE; - EMSG(_((char *)e_opendisp)); + emsg(_((char *)e_opendisp)); return FAIL; } @@ -5247,7 +5247,7 @@ gui_mch_get_font(char_u *name, int repor if (font == NULL) { if (report_error) - EMSG2(_((char *)e_font), name); + semsg(_((char *)e_font), name); return NULL; } @@ -7138,7 +7138,7 @@ gui_mch_register_sign(char_u *signfile) { /* The error message is already translated and will be more * descriptive than anything we could possibly do ourselves. */ - EMSG2("E255: %s", message); + semsg("E255: %s", message); if (input_conv.vc_type != CONV_NONE) vim_free(message);