bug#5629: 23.1; W32 MessageBox encoding tiny fix

bug#5629: 23.1; W32 MessageBox encoding tiny fix

[Yamashita Koichi]

Hi. When I drag & drop large file with non-ascii name,
Emacs shows "really open?" dialog box contains
raw UTF-8 filename.

Please take this fix if no problem.

Thanks.


--- emacs-23.1-orig/src/w32menu.c	2009-06-21 13:38:18.000000000 +0900
+++ emacs-23.1/src/w32menu.c	2010-02-23 18:21:57.724100000 +0900
@@ -1508,7 +1508,7 @@
   Lisp_Object lispy_answer = Qnil, temp = XCAR (contents);
 
   if (STRINGP (temp))
-    text = SDATA (temp);
+    text = SDATA (ENCODE_SYSTEM (temp));
   else
     text = "";



In GNU Emacs 23.1.1 (i386-mingw-nt6.0.6002)
 of 2010-02-23 on ALBINA
Windowing system distributor `Microsoft Corp.', version 6.0.6002
configured using `configure --with-gcc (4.4) --cflags -I/progra~1/gnuwin32/include -D_UNICODE -DRECONVERSION -DWINVER=0x0400 --ldflags -L/progra~1/gnuwin32/lib'

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: JPN
  value of $XMODIFIERS: nil
  locale-coding-system: cp932
  default-enable-multibyte-characters: t

Major mode: Diff

Minor modes in effect:
  diff-auto-refine-mode: t
  show-paren-mode: t
  global-auto-revert-mode: t
  char-code-mode: t
  tool-bar-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  global-auto-composition-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t
  abbrev-mode: t

Recent input:
<help-echo> <help-echo> <help-echo> <help-echo> <help-echo> 
q <drag-n-drop> <help-echo> <next> <help-echo> <prior> 
<help-echo> <help-echo> <drag-n-drop> C-s e n c o d 
e _ s y s C-s C-s <return> <help-echo> <help-echo> 
<help-echo> <help-echo> <help-echo> C-x 5 2 <switch-frame> 
C-x C-f <tab> <tab> e m a c s - b z r / s r c / w 3 
2 m e n <tab> <backspace> <backspace> <backspace> <backspace> 
<backspace> <backspace> <backspace> <backspace> <backspace> 
<backspace> t r u n k / s r c / w 3 2 - m e n u . c 
<return> C-x C-f <return> C-s w 3 2 m e n <return> 
<return> M-g 1 5 0 8 <return> C-s m e s s a g e b o 
x C-r <return> C-r C-r C-r C-r C-r C-s C-s C-s C-s 
<return> <help-echo> <help-echo> <help-echo> <help-echo> 
<switch-frame> <switch-frame> <help-echo> <switch-frame> 
<switch-frame> <help-echo> <help-echo> <help-echo> 
<switch-frame> <help-echo> <help-echo> <help-echo> 
M-x r e p o <tab> r t <tab> <return>

Recent messages:
For information about GNU Emacs and the GNU system, type C-h C-a.
Parsing archive file...done.
Mark saved where search started
Making completion list...
Loading vc-bzr...done
(New file)
Mark saved where search started
Mark set
Mark saved where search started [2 times]
Making completion list...

bug#5629: 23.1; W32 MessageBox encoding tiny fix

[Jason Rumney]

Yamashita Koichi <ko1.ymst@gmail.com> writes:

> Hi. When I drag & drop large file with non-ascii name,
> Emacs shows "really open?" dialog box contains
> raw UTF-8 filename.

I've changed this now to use Unicode if possible, otherwise falling back
on your patch to encode the message appropriately for the locale.

Thanks