[Emacs-diffs] /srv/bzr/emacs/trunk r100188: Fix bug #6126.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100188 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-07 20:14:26 +0300
message:
  Fix bug #6126.
  
   w32fns.c: Include w32.h.
   (Fw32_shell_execute): Decode the error message before passing it to `error'.
modified:
  src/ChangeLog
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-07 14:07:51 +0000
+++ b/src/ChangeLog     2010-05-07 17:08:31 +0000
@@ -1,5 +1,9 @@
 2010-05-07  Eli Zaretskii  <address@hidden>
 
+       * 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'.

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2010-03-31 09:08:40 +0000
+++ b/src/w32fns.c      2010-05-07 17:08:31 +0000
@@ -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