X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b90caf50d04d2c51742054bb6b0e836f6d425203..7cef3569a3d872ea5be07a529b68910bf1d8b790:/lisp/help-macro.el

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 802eb54916..112c72778b 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -1,12 +1,12 @@
 ;;; help-macro.el --- makes command line help such as help-for-help
 
-;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Lynn Slater <lrs@indetech.com>
 ;; Maintainer: FSF
 ;; Created: Mon Oct  1 11:42:39 1990
 ;; Adapted-By: ESR
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -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))
@@ -201,5 +204,4 @@ and then returns."
 
 (provide 'help-macro)
 
-;; arch-tag: 59fee949-1686-485a-8a05-83418073e257
 ;;; help-macro.el ends here