summaryrefslogtreecommitdiff
path: root/lisp/help.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-08-05 15:49:28 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-08-05 15:49:28 +0200
commit0bbcd89cf52c23e872b5b94d3e2f8f4161e2bf6e (patch)
treefcabe899c69e557e95c625633e747334786a0b74 /lisp/help.el
parent6c1d0d53b34d9350d55ebbd83ea56aa751a55f1b (diff)
downloademacs-0bbcd89cf52c23e872b5b94d3e2f8f4161e2bf6e.tar.gz
Revert "Make `view-lossage' output of chars read from `read-char' more logical"
This reverts commit 1abf76877847226daa5ab7e07000ac1d4aba3478. This change apparently led to problems with kmacro.
Diffstat (limited to 'lisp/help.el')
-rw-r--r--lisp/help.el34
1 files changed, 12 insertions, 22 deletions
diff --git a/lisp/help.el b/lisp/help.el
index ba76d267571..039d0c44e4f 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -465,28 +465,18 @@ To record all your input, use `open-dribble-file'."
(help-setup-xref (list #'view-lossage)
(called-interactively-p 'interactive))
(with-help-window (help-buffer)
- (with-current-buffer standard-output
- (let ((prev-command nil))
- (mapc
- (lambda (key)
- (cond
- ((and (consp key) (null (car key)))
- (princ (format ";; %s\n"
- (setq prev-command
- (if (symbolp (cdr key))
- (cdr key)
- "anonymous-command")))))
- ((eq key 'end-of-command)
- (unless (bolp)
- (princ (format ";; <during %s>\n" (or prev-command
- "unknown command")))))
- ((or (integerp key) (symbolp key) (listp key))
- (princ (single-key-description key))
- (princ " "))
- (t
- (prin1 key)
- (princ " "))))
- (recent-keys 'include-cmds))))
+ (princ " ")
+ (princ (mapconcat (lambda (key)
+ (cond
+ ((and (consp key) (null (car key)))
+ (format ";; %s\n" (if (symbolp (cdr key)) (cdr key)
+ "anonymous-command")))
+ ((or (integerp key) (symbolp key) (listp key))
+ (single-key-description key))
+ (t
+ (prin1-to-string key nil))))
+ (recent-keys 'include-cmds)
+ " "))
(with-current-buffer standard-output
(goto-char (point-min))
(let ((comment-start ";; ")