Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-266
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-267
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-268
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-269
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-270
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-271
   Rename "field-at-point" to "field-at-pos"

 * emacs@sv.gnu.org/emacs--devo--0--patch-272
   (comint-insert-input): Remove redundant calls to setq and goto-char

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-556

1 files changed, 25 insertions, 21 deletions

diff --git a/lisp/comint.el b/lisp/comint.el
index 946085661fc..c7e5b3bdddd 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -802,27 +802,31 @@ buffer.  The hook `comint-exec-hook' is run after each exec."
   ;; This doesn't use "e" because it is supposed to work
   ;; for events without parameters.
   (interactive (list last-input-event))
-  (let ((pos (point)))
-    (if event (posn-set-point (event-end event)))
-    (if (not (eq (get-char-property (point) 'field) 'input))
-	;; No input at POS, fall back to the global definition.
-	(let* ((keys (this-command-keys))
-	       (last-key (and (vectorp keys) (aref keys (1- (length keys)))))
-	       (fun (and last-key (lookup-key global-map (vector last-key)))))
-	  (goto-char pos)
-	  (and fun (call-interactively fun)))
-      (setq pos (point))
-      ;; There's previous input at POS, insert it at the end of the buffer.
-      (goto-char (point-max))
-      ;; First delete any old unsent input at the end
-      (delete-region
-       (or (marker-position comint-accum-marker)
-	   (process-mark (get-buffer-process (current-buffer))))
-       (point))
-      ;; Insert the input at point
-      (insert (buffer-substring-no-properties
-	       (previous-single-char-property-change (1+ pos) 'field)
-	       (next-single-char-property-change pos 'field))))))
+  (when event
+    (posn-set-point (event-end event)))
+  (if comint-use-prompt-regexp
+      (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)))
+    (let ((pos (point)))
+      (if (not (eq (field-at-pos pos) 'input))
+	  ;; No input at POS, fall back to the global definition.
+	  (let* ((keys (this-command-keys))
+		 (last-key (and (vectorp keys) (aref keys (1- (length keys)))))
+		 (fun (and last-key (lookup-key global-map (vector last-key)))))
+	    (and fun (call-interactively fun)))
+	;; There's previous input at POS, insert it at the end of the buffer.
+	(goto-char (point-max))
+	;; First delete any old unsent input at the end
+	(delete-region
+	 (or (marker-position comint-accum-marker)
+	     (process-mark (get-buffer-process (current-buffer))))
+	 (point))
+	;; Insert the input at point
+	(insert (field-string-no-properties pos))))))
 
 
 ;; Input history processing in a buffer