1 files changed, 12 insertions, 1 deletions

diff --git a/lisp/comint.el b/lisp/comint.el
index 26b0add8b76..2653728fa4e 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -653,7 +653,7 @@ Entry to this mode runs the hooks on `comint-mode-hook'."
   (make-local-variable 'comint-accum-marker)
   (setq comint-accum-marker (make-marker))
   (make-local-variable 'font-lock-defaults)
-  (setq font-lock-defaults '(nil))
+  (setq font-lock-defaults '(nil t))
   (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
   ;; This behavior is not useful in comint buffers, and is annoying
   (set (make-local-variable 'next-line-add-newlines) nil))
@@ -1920,6 +1920,17 @@ Calls `comint-get-old-input' to get old input."
       (goto-char (process-mark process))
       (insert input))))
 
+(defun comint-copy-old-input ()
+  "Insert after prompt old input at point as new input to be edited.
+Calls `comint-get-old-input' to get old input."
+  (interactive)
+  (let ((input (funcall comint-get-old-input))
+        (process (get-buffer-process (current-buffer))))
+    (if (not process)
+        (error "Current buffer has no process")
+      (goto-char (process-mark process))
+      (insert input))))
+
 (defun comint-skip-prompt ()
   "Skip past the text matching regexp `comint-prompt-regexp'.
 If this takes us past the end of the current line, don't skip at all."