[Emacs-diffs] Changes to emacs/lisp/comint.el,v

[Romain Francoise]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Romain Francoise <rfrancoise>   06/12/09 11:14:36

Index: comint.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/comint.el,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -b -r1.350 -r1.351
--- comint.el   28 Nov 2006 02:19:20 -0000      1.350
+++ comint.el   9 Dec 2006 11:14:34 -0000       1.351
@@ -804,11 +804,10 @@
 
 (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))