(comint-insert-input): Obey mouse-yank-at-point.

diff --git a/lisp/comint.el b/lisp/comint.el
index ccd02db39cf3329eee257c824381f413208b9671..feb0bb83de30f769b14a73626fa2b1beb81dd006 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1,7 +1,7 @@
 ;;; comint.el --- general command interpreter in a window stuff
 
 ;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;     Simon Marshall <simon@gnu.org>
@@ -791,14 +791,16 @@ 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))
-  (if event (mouse-set-point event))
   (let ((pos (point)))
-    (if (not (eq (get-char-property pos 'field) 'input))
+    (if event (mouse-set-point 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

diff --git a/src/ChangeLog b/src/ChangeLog
index f0b648b6ebb54f8ec73a935e17419dcfe79a7a8d..22f2056a51ee70fad6aa6ec71847bf1f96770842 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,12 +1,23 @@
+2005-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * alloc.c (make_number): The arg can be bigger than `int'.
+       * lisp.h (make_number): Make prototype more precise.
+
+       * process.c, dired.c (Vfile_name_coding_system)
+       (Vdefault_file_name_coding_system):
+       * callproc.c (Vdoc_file_name, Vfile_name_coding_system)
+       (Vdefault_file_name_coding_system): Remove unused declarations.
+
 2005-03-24  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xmenu.c (create_and_show_popup_menu): Just remove menu and return
        if it failed to pop up (Gnome "show pointer on ctrl" option makes
        menus fail to pop up).
 
-2005-03-24  Stefan  <monnier@iro.umontreal.ca>
+2005-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * xdisp.c (get_next_display_element): Also use `\ ' & `\-' for latin-9.
+       Just prepend a backslash without replacing the NBSP by an SPC.
 
 2005-03-22  Kim F. Storm  <storm@cua.dk>