From 0de4dad447c6481938f324e42a0b88e8aa653fe4 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 24 Mar 2005 21:24:09 +0000 Subject: [PATCH] (comint-insert-input): Obey mouse-yank-at-point. --- lisp/comint.el | 8 +++++--- src/ChangeLog | 13 ++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/lisp/comint.el b/lisp/comint.el index ccd02db39cf..feb0bb83de3 100644 --- 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 ;; Simon Marshall @@ -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 f0b648b6ebb..22f2056a51e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,12 +1,23 @@ +2005-03-24 Stefan Monnier + + * 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,Ad(Brv * 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 +2005-03-24 Stefan Monnier * 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 -- 2.39.2