2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c85c23e720..09e3736df70 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-09  Romain Francoise  <romain@orebokech.com>
+
+        * comint.el (comint-insert-input): Delete obsolete comment.
+        Examine input field without moving point.
+
 2006-12-08  Kevin Rodgers  <ihs_4664@yahoo.com>
 
         * files.el (insert-file-1): Compare file size to
diff --git a/lisp/comint.el b/lisp/comint.el
index 191807af847..948057c6bc2 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -804,11 +804,10 @@ buffer.  The hook `comint-exec-hook' is run after each exec."
 
 (defun comint-insert-input (event)
   "In a Comint buffer, set the current input to the previous input at point."
-  ;; This doesn't use "e" because it is supposed to work
-  ;; for events without parameters.
   (interactive "e")
-  (mouse-set-point event)
-  (let ((pos (point)))
+  ;; Note: be careful not to move point in this function, it would
+  ;; defeat `mouse-yank-at-point' in case we fall back to a yank.
+  (let ((pos (posn-point (event-end event))))
     (if (not (eq (field-at-pos pos) 'input))
         ;; No input at POS, fall back to the global definition.
         (let* ((keys (this-command-keys))