In make-help-screen make original minor-mode-map-alist temporarily visible.

* help-macro.el (make-help-screen): Temporarily restore original binding
for minor-mode-map-alist (Bug#10454).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab813e219227376817fe269e891acda939fa31cd..71211ca9af9bb218c74c7ff2752dc06d3cff54e0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-20  Martin Rudalics  <rudalics@gmx.at>
+
+       * help-macro.el (make-help-screen): Temporarily restore original
+       binding for minor-mode-map-alist (Bug#10454).
+
 2012-01-19  Julien Danjou  <julien@danjou.info>
 
        * color.el (color-name-to-rgb): Use the white color to find the max

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))