(edit-and-eval-command): Elements of command-history are forms, not strings.

1 files changed, 9 insertions, 0 deletions

diff --git a/lisp/simple.el b/lisp/simple.el
index 090542e3cac..abf1020d21a 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -404,6 +404,15 @@ the minibuffer, then read and evaluate the result."
                                        (prin1-to-string command)
                                        read-expression-map t
                                        '(command-history . 1))))
+    ;; If command was added to command-history as a string,
+    ;; get rid of that.  We want only evallable expressions there.
+    (if (stringp (car command-history))
+        (setq command-history (cdr command-history)))
+
+    ;; If command to be redone does not match front of history,
+    ;; add it to the history.
+    (or (equal command (car command-history))
+        (setq command-history (cons command command-history)))
     (eval command)))
 
 (defun repeat-complex-command (arg)