HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge trunk
[bpt/emacs.git]
/
lisp
/
help-macro.el
diff --git
a/lisp/help-macro.el
b/lisp/help-macro.el
index
2e0f7fa
..
0600484
100644
(file)
--- a/
lisp/help-macro.el
+++ b/
lisp/help-macro.el
@@
-1,7
+1,6
@@
;;; help-macro.el --- makes command line help such as help-for-help
;;; 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, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc.
;; Author: Lynn Slater <lrs@indetech.com>
;; Maintainer: FSF
;; Author: Lynn Slater <lrs@indetech.com>
;; Maintainer: FSF
@@
-70,7
+69,6
@@
(require 'backquote)
(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
(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
@@
-185,9
+183,12
@@
and then returns."
(when config
(set-window-configuration config)
(setq config nil))
(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))
(when new-frame
;; Do not iconify the selected frame.
(unless (eq new-frame (selected-frame))
@@
-202,5
+203,4
@@
and then returns."
(provide 'help-macro)
(provide 'help-macro)
-;; arch-tag: 59fee949-1686-485a-8a05-83418073e257
;;; help-macro.el ends here
;;; help-macro.el ends here