Mercurial > vim
diff src/os_win32.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 | de63593896b3 |
| children | ba876ced4f1f |
line wrap: on
line diff
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -633,7 +633,7 @@ dyn_libintl_init(void) if (p_verbose > 0) { verbose_enter(); - EMSG2(_(e_loadlib), GETTEXT_DLL); + semsg(_(e_loadlib), GETTEXT_DLL); verbose_leave(); } return 0; @@ -648,7 +648,7 @@ dyn_libintl_init(void) if (p_verbose > 0) { verbose_enter(); - EMSG2(_(e_loadfunc), libintl_entry[i].name); + semsg(_(e_loadfunc), libintl_entry[i].name); verbose_leave(); } return 0; @@ -5182,7 +5182,7 @@ mch_call_shell( { x = -1; #ifdef FEAT_GUI_W32 - EMSG(_("E371: Command not found")); + emsg(_("E371: Command not found")); #endif } @@ -5260,7 +5260,7 @@ mch_call_shell( #endif ) { - smsg((char_u *)_("shell returned %d"), x); + smsg(_("shell returned %d"), x); msg_putchar('\n'); } #ifdef FEAT_TITLE @@ -5489,7 +5489,7 @@ mch_job_start(char *cmd, job_T *job, job &saAttr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL); if (ifd[0] == INVALID_HANDLE_VALUE) { - EMSG2(_(e_notopen), fname); + semsg(_(e_notopen), fname); goto failed; } } @@ -5507,7 +5507,7 @@ mch_job_start(char *cmd, job_T *job, job &saAttr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL); if (ofd[1] == INVALID_HANDLE_VALUE) { - EMSG2(_(e_notopen), fname); + semsg(_(e_notopen), fname); goto failed; } } @@ -5525,7 +5525,7 @@ mch_job_start(char *cmd, job_T *job, job &saAttr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL); if (efd[1] == INVALID_HANDLE_VALUE) { - EMSG2(_(e_notopen), fname); + semsg(_(e_notopen), fname); goto failed; } }