2 files changed, 17 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9570c0ce3c7..c65e65de431 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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'.
diff --git a/src/w32fns.c b/src/w32fns.c
index 795e7208569..bc310da0d2f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -47,6 +47,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "systime.h"
 #include "termhooks.h"
 #include "w32heap.h"
+#include "w32.h"
 
 #include "bitmaps/gray.xbm"
 
@@ -6333,6 +6334,7 @@ an integer representing a ShowWindow flag:
      Lisp_Object operation, document, parameters, show_flag;
 {
   Lisp_Object current_dir;
+  char *errstr;
 
   CHECK_STRING (document);
 
@@ -6353,7 +6355,17 @@ an integer representing a ShowWindow flag:
                            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