X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20..00afe3a454119390e78eaaa319a7d05e5e7723ae:/lisp/help-macro.el diff --git a/lisp/help-macro.el b/lisp/help-macro.el index 8efb99d42d..7897234415 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 ;; Maintainer: FSF @@ -69,6 +69,10 @@ (require 'backquote) +;; This needs to be autoloaded because it is used in the +;; make-help-screen macro. Using (bound-and-true-p three-step-help) +;; is not an acceptable alternative, because nothing loads help-macro +;; in a normal session, so any user customization would never be applied. ;;;###autoload (defcustom three-step-help nil "Non-nil means give more info about Help command in three steps. @@ -130,7 +134,7 @@ and then returns." (when (or (eq char ??) (eq char help-char) (memq char help-event-list)) (setq config (current-window-configuration)) - (switch-to-buffer-other-window "*Help*") + (pop-to-buffer " *Metahelp*" nil t) (and (fboundp 'make-frame) (not (eq (window-frame (selected-window)) prev-frame)) @@ -184,9 +188,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))