aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/help.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-08-05 15:49:28 +0200
committerLars Ingebrigtsen2019-08-05 15:49:28 +0200
commit0bbcd89cf52c23e872b5b94d3e2f8f4161e2bf6e (patch)
treefcabe899c69e557e95c625633e747334786a0b74 /lisp/help.el
parent6c1d0d53b34d9350d55ebbd83ea56aa751a55f1b (diff)
downloademacs-0bbcd89cf52c23e872b5b94d3e2f8f4161e2bf6e.tar.gz
emacs-0bbcd89cf52c23e872b5b94d3e2f8f4161e2bf6e.zip
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'."
465 (help-setup-xref (list #'view-lossage) 465 (help-setup-xref (list #'view-lossage)
466 (called-interactively-p 'interactive)) 466 (called-interactively-p 'interactive))
467 (with-help-window (help-buffer) 467 (with-help-window (help-buffer)
468 (with-current-buffer standard-output 468 (princ " ")
469 (let ((prev-command nil)) 469 (princ (mapconcat (lambda (key)
470 (mapc 470 (cond
471 (lambda (key) 471 ((and (consp key) (null (car key)))
472 (cond 472 (format ";; %s\n" (if (symbolp (cdr key)) (cdr key)
473 ((and (consp key) (null (car key))) 473 "anonymous-command")))
474 (princ (format ";; %s\n" 474 ((or (integerp key) (symbolp key) (listp key))
475 (setq prev-command 475 (single-key-description key))
476 (if (symbolp (cdr key)) 476 (t
477 (cdr key) 477 (prin1-to-string key nil))))
478 "anonymous-command"))))) 478 (recent-keys 'include-cmds)
479 ((eq key 'end-of-command) 479 " "))
480 (unless (bolp)
481 (princ (format ";; <during %s>\n" (or prev-command
482 "unknown command")))))
483 ((or (integerp key) (symbolp key) (listp key))
484 (princ (single-key-description key))
485 (princ " "))
486 (t
487 (prin1 key)
488 (princ " "))))
489 (recent-keys 'include-cmds))))
490 (with-current-buffer standard-output 480 (with-current-buffer standard-output
491 (goto-char (point-min)) 481 (goto-char (point-min))
492 (let ((comment-start ";; ") 482 (let ((comment-start ";; ")