Mercurial > emacs
changeset 108496:49f3d201fdd0
Backport from trunk: Fix bug #6126.
makefile.w32-in ($(BLD)/w32fns.$(O)): Depend on $(SRC)/w32.h.
w32fns.c: Include w32.h.
(Fw32_shell_execute): Decode the error message before passing it
to `error'.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Tue, 11 May 2010 20:23:52 +0300 |
| parents | ecbac408fa45 |
| children | f35b8e7b8a1f |
| files | src/ChangeLog src/makefile.w32-in src/w32fns.c |
| diffstat | 3 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue May 11 08:48:29 2010 -0700 +++ b/src/ChangeLog Tue May 11 20:23:52 2010 +0300 @@ -1,3 +1,11 @@ +2010-05-11 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in ($(BLD)/w32fns.$(O)): Depend on $(SRC)/w32.h. + + * w32fns.c: Include w32.h. + (Fw32_shell_execute): Decode the error message before passing it + to `error'. (Bug#6126) + 2010-05-11 Karel Klic <kklic@redhat.com> * ftfont.c: Fix incorrect parentheses of #if condition for
--- a/src/makefile.w32-in Tue May 11 08:48:29 2010 -0700 +++ b/src/makefile.w32-in Tue May 11 20:23:52 2010 +0300 @@ -1564,6 +1564,7 @@ $(SRC)/keyboard.h \ $(SRC)/systime.h \ $(SRC)/termhooks.h \ + $(SRC)/w32.h \ $(SRC)/w32font.h \ $(SRC)/w32gui.h \ $(SRC)/w32heap.h \
--- a/src/w32fns.c Tue May 11 08:48:29 2010 -0700 +++ b/src/w32fns.c Tue May 11 20:23:52 2010 +0300 @@ -47,6 +47,7 @@ #include "systime.h" #include "termhooks.h" #include "w32heap.h" +#include "w32.h" #include "bitmaps/gray.xbm" @@ -6333,6 +6334,7 @@ Lisp_Object operation, document, parameters, show_flag; { Lisp_Object current_dir; + char *errstr; CHECK_STRING (document); @@ -6353,7 +6355,17 @@ XINT (show_flag) : SW_SHOWDEFAULT)) > 32) return Qt; - error ("ShellExecute failed: %s", w32_strerror (0)); + errstr = w32_strerror (0); + /* The error string might be encoded in the locale's encoding. */ + if (!NILP (Vlocale_coding_system)) + { + Lisp_Object decoded = + code_convert_string_norecord (make_unibyte_string (errstr, + strlen (errstr)), + Vlocale_coding_system, 0); + errstr = (char *)SDATA (decoded); + } + error ("ShellExecute failed: %s", errstr); } /* Lookup virtual keycode from string representing the name of a