aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman1998-06-13 05:59:46 +0000
committerRichard M. Stallman1998-06-13 05:59:46 +0000
commit4b08b7ed056226e8b49a7f2ec2233d0492d933fe (patch)
tree6a1f0bf0822abb2e0a7477407791ebc65423795c /lisp
parentc5c5a6f8d1967178ba9bfc4ce2ca63fb4ee04774 (diff)
downloademacs-4b08b7ed056226e8b49a7f2ec2233d0492d933fe.tar.gz
emacs-4b08b7ed056226e8b49a7f2ec2233d0492d933fe.zip
(help-map): C-h 4 i runs info-other-window.
(describe-key, describe-key-briefly): Don't discard up event after down event.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/help.el17
1 files changed, 1 insertions, 16 deletions
diff --git a/lisp/help.el b/lisp/help.el
index b4d2cf5f4a6..afe7f49e220 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -66,6 +66,7 @@
66(define-key help-map "F" 'view-emacs-FAQ) 66(define-key help-map "F" 'view-emacs-FAQ)
67 67
68(define-key help-map "i" 'info) 68(define-key help-map "i" 'info)
69(define-key help-map "4i" 'info-other-window)
69(define-key help-map "\C-f" 'Info-goto-emacs-command-node) 70(define-key help-map "\C-f" 'Info-goto-emacs-command-node)
70(define-key help-map "\C-k" 'Info-goto-emacs-key-command-node) 71(define-key help-map "\C-k" 'Info-goto-emacs-key-command-node)
71(define-key help-map "\C-i" 'info-lookup-symbol) 72(define-key help-map "\C-i" 'info-lookup-symbol)
@@ -214,14 +215,6 @@ With arg, you are asked to choose which language."
214 "Print the name of the function KEY invokes. KEY is a string. 215 "Print the name of the function KEY invokes. KEY is a string.
215If INSERT (the prefix arg) is non-nil, insert the message in the buffer." 216If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
216 (interactive "kDescribe key briefly: \nP") 217 (interactive "kDescribe key briefly: \nP")
217 ;; If this key seq ends with a down event, discard the
218 ;; following click or drag event. Otherwise that would
219 ;; erase the message.
220 (let ((type (aref key (1- (length key)))))
221 (if (listp type) (setq type (car type)))
222 (and (symbolp type)
223 (memq 'down (event-modifiers type))
224 (read-event)))
225 (save-excursion 218 (save-excursion
226 (let ((modifiers (event-modifiers (aref key 0))) 219 (let ((modifiers (event-modifiers (aref key 0)))
227 (standard-output (if insert (current-buffer) t)) 220 (standard-output (if insert (current-buffer) t))
@@ -305,14 +298,6 @@ If FUNCTION is nil, applies `message' to it, thus printing it."
305(defun describe-key (key) 298(defun describe-key (key)
306 "Display documentation of the function invoked by KEY. KEY is a string." 299 "Display documentation of the function invoked by KEY. KEY is a string."
307 (interactive "kDescribe key: ") 300 (interactive "kDescribe key: ")
308 ;; If this key seq ends with a down event, discard the
309 ;; following click or drag event. Otherwise that would
310 ;; erase the message.
311 (let ((type (aref key (1- (length key)))))
312 (if (listp type) (setq type (car type)))
313 (and (symbolp type)
314 (memq 'down (event-modifiers type))
315 (read-event)))
316 (save-excursion 301 (save-excursion
317 (let ((modifiers (event-modifiers (aref key 0))) 302 (let ((modifiers (event-modifiers (aref key 0)))
318 window position) 303 window position)