[Emacs-diffs] emacs/lisp ChangeLog comint.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/08/30 05:10:25

Modified files:
        lisp           : ChangeLog comint.el 

Log message:
        (comint-insert-input): Be careful to only set point if we
        don't delegate to some other command.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16055&r2=1.16056
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/comint.el?cvsroot=emacs&r1=1.390&r2=1.391

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16055
retrieving revision 1.16056
diff -u -b -r1.16055 -r1.16056
--- ChangeLog   30 Aug 2009 03:46:18 -0000      1.16055
+++ ChangeLog   30 Aug 2009 05:10:22 -0000      1.16056
@@ -1,5 +1,8 @@
 2009-08-30  Stefan Monnier  <address@hidden>
 
+       * comint.el (comint-insert-input): Be careful to only set point if we
+       don't delegate to some other command.
+
        * proced.el (proced-signal-list): Make it an alist.
        (proced-grammar-alist): Capitalize names.
        (proced-send-signal): Use a non-hidden buffer (since it's displayed).

Index: comint.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/comint.el,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -b -r1.390 -r1.391
--- comint.el   23 Jun 2009 07:25:15 -0000      1.390
+++ comint.el   30 Aug 2009 05:10:25 -0000      1.391
@@ -816,7 +816,9 @@
 If there is no previous input at point, run the command specified
 by the global keymap (usually `mouse-yank-at-click')."
   (interactive "e")
-  (mouse-set-point event)
+  ;; Don't set the mouse here, since it may otherwise change the behavior
+  ;; of the command on which we fallback if there's no field at point.
+  ;; (mouse-set-point event)
   (let ((pos (posn-point (event-end event)))
        field input)
     (with-selected-window (posn-window (event-end event))
@@ -833,6 +835,7 @@
               (fun (and last-key (lookup-key global-map (vector last-key)))))
          (and fun (not (eq fun 'comint-insert-input))
               (call-interactively fun)))
+      (with-selected-window (posn-window (event-end event))
       ;; Otherwise, insert the previous input.
       (goto-char (point-max))
       ;; First delete any old unsent input at the end
@@ -841,7 +844,7 @@
           (process-mark (get-buffer-process (current-buffer))))
        (point))
       ;; Insert the input at point
-      (insert input))))
+        (insert input)))))
 
 ;; Input history processing in a buffer
 ;; ===========================================================================