X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/84eb0351d8be4811897c8cf62a69757ff5d14001..c194970e15b6d6efa07697679a25dfab3aa76442:/lisp/help-macro.el

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 8efb99d42d..0600484b6d 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -1,6 +1,6 @@
 ;;; help-macro.el --- makes command line help such as help-for-help
 
-;; Copyright (C) 1993-1994, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Lynn Slater <lrs@indetech.com>
 ;; Maintainer: FSF
@@ -69,7 +69,6 @@
 
 (require 'backquote)
 
-;;;###autoload
 (defcustom three-step-help nil
   "Non-nil means give more info about Help command in three steps.
 The three steps are simple prompt, prompt with all options, and
@@ -184,9 +183,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))