bug#11732: Follow-up to bug#11732

[Masayuki Hatta <mhatta@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 688 bytes --]

Hi,

All you need is patches I attached, "diff" or "diff2" (not both).

Best regards,
MH
2018年6月28日(木) 17:04 martin rudalics <rudalics@gmx.at>:
>
>  > Martin, could you perhaps look into this?
>
> I'm afraid I won't be of much help in this matter.  IIUC there is a
> patch I have to apply first and that patch breaks interaction with
> dialog boxes on Windows in some way.  Which one is the patch I have to
> apply?
>
> martin



-- 
Masayuki Hatta
Associate Professor, Faculty of Economics and Management, Surugadai
University, Japan

http://about.me/mhatta

mhatta@gnu.org  / mhatta@debian.org / mhatta@opensource.jp /
hatta.masayuki@surugadai.ac.jp

[-- Attachment #2: diff --]
[-- Type: application/octet-stream, Size: 492 bytes --]

diff -urN emacs-26.1.orig/src/w32fns.c emacs-26.1/src/w32fns.c
--- emacs-26.1.orig/src/w32fns.c	2018-06-22 21:19:49.476879400 +0900
+++ emacs-26.1/src/w32fns.c	2018-06-26 18:00:54.780661600 +0900
@@ -4551,7 +4551,7 @@
 	 dialog boxes, such as the file selection dialog or font
 	 selection dialog.  So something else is needed to fix the
 	 former without breaking the latter.  See bug#11732.  */
-      break;
+      goto dflt;
 
     case WM_IME_ENDCOMPOSITION:
       ignore_ime_char = 0;

[-- Attachment #3: diff2 --]
[-- Type: application/octet-stream, Size: 470 bytes --]

diff -urN emacs-26.1.orig/src/w32fns.c emacs-26.1/src/w32fns.c
--- emacs-26.1.orig/src/w32fns.c	2018-06-22 21:19:49.476879400 +0900
+++ emacs-26.1/src/w32fns.c	2018-06-28 17:55:48.237802900 +0900
@@ -4544,6 +4544,7 @@
 
 	  set_ime_composition_window_fn (context, &form);
 	  release_ime_context_fn (hwnd, context);
+	  goto dflt;
 	}
       /* We should "goto dflt" here to pass WM_IME_STARTCOMPOSITION to
 	 DefWindowProc, so that the composition window will actually