* lisp/help.el (view-lossage): Include the actual commands run.

* src/keyboard.c (command_loop_1): Record this-command in recent-keys.
(Frecent_keys): Rewrite. and add optional `include-cmds' arg.

2 files changed, 26 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 572de2ed950..94473f03b7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* help.el (view-lossage): Include the actual commands run.
+
 2014-11-10  Dmitry Gutov  <dgutov@yandex.ru>
 
 	* vc/vc-dir.el (vc-dir-hide-state): Also hide `ignored' items when
@@ -5,8 +9,8 @@
 
 2014-11-09  Eric Ludlam  <zappo@gnu.org>
 
-	* emacs-lisp/eieio-custom.el (eieio-customize-object): Set
-	eieio-cog (current group) to g, which is an improved form of input
+	* emacs-lisp/eieio-custom.el (eieio-customize-object):
+	Set eieio-cog (current group) to g, which is an improved form of input
 	group.
 
 2014-11-09  Juri Linkov  <juri@jurta.org>
@@ -14,8 +18,8 @@
 	* isearch.el (isearch-message-prefix): Show "Multi-file" and
 	"Multi-buffer" instead of "Multi".  (Bug#13592)
 
-	* misearch.el (multi-isearch-file-list): Autoload
-	multi-isearch-buffer-list and multi-isearch-file-list.
+	* misearch.el (multi-isearch-file-list):
+	Autoload multi-isearch-buffer-list and multi-isearch-file-list.
 	(multi-isearch-end): Reset multi-isearch-buffer-list and
 	multi-isearch-file-list to nil.
 
@@ -70,8 +74,8 @@
 2014-11-08  Alan Mackenzie  <acm@muc.de>
 
 	Fix wrong bound to c-font-lock-declarators.  Fixes bug #18948.
-	* progmodes/cc-fonts.el (c-font-lock-declarations): Pass
-	"(point-max)" as bound to c-font-lock-declarators, not "limit", as
+	* progmodes/cc-fonts.el (c-font-lock-declarations):
+	Pass "(point-max)" as bound to c-font-lock-declarators, not "limit", as
 	the buffer is sometimes narrowed to less than "limit" (e.g., in
 	the presence of macros).
 
diff --git a/lisp/help.el b/lisp/help.el
index 2da43d3ed48..eaee6d14736 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -448,25 +448,32 @@ is specified by the variable `message-log-max'."
   (info "(efaq)Packages that do not come with Emacs"))
 
 (defun view-lossage ()
-  "Display last 300 input keystrokes.
+  "Display last few input keystrokes and the commands run.
 
 To record all your input, use `open-dribble-file'."
   (interactive)
   (help-setup-xref (list #'view-lossage)
 		   (called-interactively-p 'interactive))
   (with-help-window (help-buffer)
+    (princ " ")
     (princ (mapconcat (lambda (key)
-			(if (or (integerp key) (symbolp key) (listp key))
-			    (single-key-description key)
-			  (prin1-to-string key nil)))
-		      (recent-keys)
+			(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))
-      (while (progn (move-to-column 50) (not (eobp)))
-        (when (search-forward " " nil t)
-          (delete-char -1))
-        (insert "\n"))
+      (while (not (eobp))
+	(move-to-column 50)
+	(unless (eolp)
+	  (fill-region (line-beginning-position) (line-end-position)))
+	(forward-line 1))
       ;; jidanni wants to see the last keystrokes immediately.
       (set-marker help-window-point-marker (point)))))