Merge from origin/emacs-26

a427de9 (origin/emacs-26) Fix bug #11732
3a04e15 Improve documentation of 'emacs-lock-mode'
9d6ca5a * lisp/imenu.el (imenu-generic-expression): Doc fix.  (Bug#32...
fdd7e7d Improve indexing of 'eval-defun' in ELisp manual
10af989 Fix (length CIRCULAR) documentation
271d1f7 Tramp editorials
4abf94f Clarify and improve doc strings of 'eval-last-sexp' and friends
6cfc7a7 Automate upload of Emacs manuals to gnu.org
b73cde5 Fix MH-E mail composition with GNU Mailutils (SF#485)
0dce5e5 Speed up 'replace-buffer-contents' some more
00fdce0 * doc/emacs/docstyle.texi: Avoid messing up the html output.

Conflicts:
	admin/make-tarball.txt

1 files changed, 7 insertions, 7 deletions

diff --git a/src/w32fns.c b/src/w32fns.c
index 7f7e1a404ce..760801cd1db 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4550,13 +4550,13 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	  set_ime_composition_window_fn (context, &form);
 	  release_ime_context_fn (hwnd, context);
 	}
-      /* We should "goto dflt" here to pass WM_IME_STARTCOMPOSITION to
-	 DefWindowProc, so that the composition window will actually
-	 be displayed.  But doing so causes trouble with displaying
-	 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;
+      /* FIXME: somehow "goto dflt" here instead of "break" causes
+	 popup dialogs, such as the ones shown by File->Open File and
+	 w32-select-font, to become hidden behind their parent frame,
+	 when focus-follows-mouse is in effect.  See bug#11732.  But
+	 if we don't "goto dflt", users of IME cannot type text
+	 supported by the input method...  */
+      goto dflt;
 
     case WM_IME_ENDCOMPOSITION:
       ignore_ime_char = 0;