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.
diff --git a/src/os_win32.c b/src/os_win32.c
index c9f7d1c..919e071 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -633,7 +633,7 @@
if (p_verbose > 0)
{
verbose_enter();
- EMSG2(_(e_loadlib), GETTEXT_DLL);
+ semsg(_(e_loadlib), GETTEXT_DLL);
verbose_leave();
}
return 0;
@@ -648,7 +648,7 @@
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 @@
{
x = -1;
#ifdef FEAT_GUI_W32
- EMSG(_("E371: Command not found"));
+ emsg(_("E371: Command not found"));
#endif
}
@@ -5260,7 +5260,7 @@
#endif
)
{
- smsg((char_u *)_("shell returned %d"), x);
+ smsg(_("shell returned %d"), x);
msg_putchar('\n');
}
#ifdef FEAT_TITLE
@@ -5489,7 +5489,7 @@
&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 @@
&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 @@
&saAttr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL);
if (efd[1] == INVALID_HANDLE_VALUE)
{
- EMSG2(_(e_notopen), fname);
+ semsg(_(e_notopen), fname);
goto failed;
}
}