Mercurial > vim
diff src/if_mzsch.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 | 2ba09a55bee6 |
| children | dd725a8ab112 |
line wrap: on
line diff
--- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -672,14 +672,14 @@ mzscheme_runtime_link_init(char *sch_dll if (!hMzGC) { if (verbose) - EMSG2(_(e_loadlib), gc_dll); + semsg(_(e_loadlib), gc_dll); return FAIL; } if (!hMzSch) { if (verbose) - EMSG2(_(e_loadlib), sch_dll); + semsg(_(e_loadlib), sch_dll); return FAIL; } @@ -693,7 +693,7 @@ mzscheme_runtime_link_init(char *sch_dll FreeLibrary(hMzGC); hMzGC = 0; if (verbose) - EMSG2(_(e_loadfunc), thunk->name); + semsg(_(e_loadfunc), thunk->name); return FAIL; } } @@ -707,7 +707,7 @@ mzscheme_runtime_link_init(char *sch_dll FreeLibrary(hMzGC); hMzGC = 0; if (verbose) - EMSG2(_(e_loadfunc), thunk->name); + semsg(_(e_loadfunc), thunk->name); return FAIL; } } @@ -1260,13 +1260,13 @@ mzscheme_init(void) #ifdef DYNAMIC_MZSCHEME if (disabled || !mzscheme_enabled(TRUE)) { - EMSG(_("E815: Sorry, this command is disabled, the MzScheme libraries could not be loaded.")); + emsg(_("E815: Sorry, this command is disabled, the MzScheme libraries could not be loaded.")); return -1; } #endif if (load_base_module_failed || startup_mzscheme()) { - EMSG(_("E895: Sorry, this command is disabled, the MzScheme's racket/base module could not be loaded.")); + emsg(_("E895: Sorry, this command is disabled, the MzScheme's racket/base module could not be loaded.")); return -1; } initialized = TRUE; @@ -1572,7 +1572,7 @@ do_intrnl_output(char *mesg, int error) { *p = '\0'; if (error) - EMSG(prev); + emsg(prev); else MSG(prev); prev = p + 1; @@ -1580,7 +1580,7 @@ do_intrnl_output(char *mesg, int error) } if (error) - EMSG(prev); + emsg(prev); else MSG(prev); }