Fix previous rmail-output-read-file-name change

[gnu-emacs] / lisp / help-macro.el

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 0bd6f3c4798328d0b7bfb4808a85912c700cb96b..112c72778bc2086a92e8c5db1cbe17ece621b63f 100644 (file)
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -184,9 +184,12 @@ and then returns."
                             (when config
                               (set-window-configuration config)
                               (setq config nil))
-                            ;; `defn' must make sure that its frame is
-                            ;; selected, so we won't iconify it below.
-                            (call-interactively defn)
+                            ;; Temporarily rebind `minor-mode-map-alist'
+                            ;; to `new-minor-mode-map-alist' (Bug#10454).
+                            (let ((minor-mode-map-alist new-minor-mode-map-alist))
+                              ;; `defn' must make sure that its frame is
+                              ;; selected, so we won't iconify it below.
+                              (call-interactively defn))
                             (when new-frame
                               ;; Do not iconify the selected frame.
                               (unless (eq new-frame (selected-frame))