Mercurial > vim
diff src/if_python3.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 | 1d2b5c016f17 |
children | 7fad90423bd2 |
line wrap: on
line diff
--- a/src/if_python3.c +++ b/src/if_python3.c @@ -634,7 +634,7 @@ py3_runtime_link_init(char *libname, int if (python_loaded()) { if (verbose) - EMSG(_("E837: This Vim cannot execute :py3 after using :python")); + emsg(_("E837: This Vim cannot execute :py3 after using :python")); return FAIL; } # endif @@ -646,7 +646,7 @@ py3_runtime_link_init(char *libname, int if (!hinstPy3) { if (verbose) - EMSG2(_(e_loadlib), libname); + semsg(_(e_loadlib), libname); return FAIL; } @@ -658,7 +658,7 @@ py3_runtime_link_init(char *libname, int close_dll(hinstPy3); hinstPy3 = 0; if (verbose) - EMSG2(_(e_loadfunc), py3_funcname_table[i].name); + semsg(_(e_loadfunc), py3_funcname_table[i].name); return FAIL; } } @@ -693,7 +693,7 @@ py3_runtime_link_init(char *libname, int close_dll(hinstPy3); hinstPy3 = 0; if (verbose) - EMSG2(_(e_loadfunc), "PyUnicode_UCSX_*"); + semsg(_(e_loadfunc), "PyUnicode_UCSX_*"); return FAIL; } @@ -864,7 +864,7 @@ Python3_Init(void) #ifdef DYNAMIC_PYTHON3 if (!python3_enabled(TRUE)) { - EMSG(_("E263: Sorry, this command is disabled, the Python library could not be loaded.")); + emsg(_("E263: Sorry, this command is disabled, the Python library could not be loaded.")); goto fail; } #endif