diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-13 23:38:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-13 23:38:42 +0100 |
| commit | f9e3e09fdc93be9f0d47afbc6c7df1188c2a5a0d (patch) | |
| tree | a6b07005c19279a4f5d01be14f14861c2657fa95 /src/if_python.c | |
| parent | 05500ece6282407f9f7227aaf564e24147326863 (diff) | |
patch 8.1.0743: giving error messages is not flexiblev8.1.0743
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.
Diffstat (limited to 'src/if_python.c')
| -rw-r--r-- | src/if_python.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/if_python.c b/src/if_python.c index 73193822bf..68444aadb3 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -685,7 +685,7 @@ python_runtime_link_init(char *libname, int verbose) if (python3_loaded()) { if (verbose) - EMSG(_("E836: This Vim cannot execute :python after using :py3")); + emsg(_("E836: This Vim cannot execute :python after using :py3")); return FAIL; } #endif @@ -696,7 +696,7 @@ python_runtime_link_init(char *libname, int verbose) if (!hinstPython) { if (verbose) - EMSG2(_(e_loadlib), libname); + semsg(_(e_loadlib), libname); return FAIL; } @@ -708,7 +708,7 @@ python_runtime_link_init(char *libname, int verbose) close_dll(hinstPython); hinstPython = 0; if (verbose) - EMSG2(_(e_loadfunc), python_funcname_table[i].name); + semsg(_(e_loadfunc), python_funcname_table[i].name); return FAIL; } } @@ -725,7 +725,7 @@ python_runtime_link_init(char *libname, int verbose) close_dll(hinstPython); hinstPython = 0; if (verbose) - EMSG2(_(e_loadfunc), "PyUnicode_UCSX_*"); + semsg(_(e_loadfunc), "PyUnicode_UCSX_*"); return FAIL; } @@ -928,7 +928,7 @@ Python_Init(void) #ifdef DYNAMIC_PYTHON if (!python_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 @@ -960,7 +960,7 @@ Python_Init(void) site = PyImport_ImportModule("site"); if (site == NULL) { - EMSG(_("E887: Sorry, this command is disabled, the Python's site module could not be loaded.")); + emsg(_("E887: Sorry, this command is disabled, the Python's site module could not be loaded.")); goto fail; } Py_DECREF(site); @@ -1035,7 +1035,7 @@ DoPyCommand(const char *cmd, rangeinitializer init_range, runner run, void *arg) #ifndef PY_CAN_RECURSE if (recursive) { - EMSG(_("E659: Cannot invoke Python recursively")); + emsg(_("E659: Cannot invoke Python recursively")); return; } ++recursive; |