Mercurial > emacs
changeset 108305:8bf1951b8dc0
Fix bug #6126.
w32fns.c: Include w32.h.
(Fw32_shell_execute): Decode the error message before passing it to `error'.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 07 May 2010 20:14:26 +0300 |
| parents | 8b307cedcd04 (current diff) 36d25edeedb5 (diff) |
| children | 8ceadb47c51e |
| files | |
| diffstat | 2 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri May 07 20:04:15 2010 +0300 +++ b/src/ChangeLog Fri May 07 20:14:26 2010 +0300 @@ -1,5 +1,9 @@ 2010-05-07 Eli Zaretskii <eliz@gnu.org> + * w32fns.c: Include w32.h. + (Fw32_shell_execute): Decode the error message before passing it + to `error'. (Bug#6126) + * msdos.c (dos_set_window_size): * w16select.c (Fx_selection_exists_p): Use `Fsymbol_value (foo)' instead of `XSYMBOL (foo)->value'.
--- a/src/w32fns.c Fri May 07 20:04:15 2010 +0300 +++ b/src/w32fns.c Fri May 07 20:14:26 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