aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Marshall1995-01-17 10:33:24 +0000
committerSimon Marshall1995-01-17 10:33:24 +0000
commiteb6c110ad403c11f282b47a209b2c5fb3c244860 (patch)
tree9d4e91f8151fdd01a8fd306c25d10edf0a896cde
parent1908c565548bf4c72153ffaf9ef382e50164386f (diff)
downloademacs-eb6c110ad403c11f282b47a209b2c5fb3c244860.tar.gz
emacs-eb6c110ad403c11f282b47a209b2c5fb3c244860.zip
Make sure the event read by comint-dynamic-list-completions isn't
something like a switch-frame event before running mouse-choose-completion.
-rw-r--r--lisp/comint.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/comint.el b/lisp/comint.el
index c2e090f0fca..926226cd585 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -3,7 +3,7 @@
3;; Copyright (C) 1988, 1990, 1992, 1993, 1994 Free Software Foundation, Inc. 3;; Copyright (C) 1988, 1990, 1992, 1993, 1994 Free Software Foundation, Inc.
4 4
5;; Author: Olin Shivers <shivers@cs.cmu.edu> 5;; Author: Olin Shivers <shivers@cs.cmu.edu>
6;; Adapted-by: Simon Marshall <s.marshall@dcs.hull.ac.uk> 6;; Adapted-by: Simon Marshall <simon@gnu.ai.mit.edu>
7;; Keywords: processes 7;; Keywords: processes
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
@@ -27,7 +27,7 @@
27;;; Please send me bug reports, bug fixes, and extensions, so that I can 27;;; Please send me bug reports, bug fixes, and extensions, so that I can
28;;; merge them into the master source. 28;;; merge them into the master source.
29;;; - Olin Shivers (shivers@cs.cmu.edu) 29;;; - Olin Shivers (shivers@cs.cmu.edu)
30;;; - Simon Marshall (s.marshall@dcs.hull.ac.uk) 30;;; - Simon Marshall (simon@gnu.ai.mit.edu)
31 31
32;;; This file defines a general command-interpreter-in-a-buffer package 32;;; This file defines a general command-interpreter-in-a-buffer package
33;;; (comint mode). The idea is that you can build specific process-in-a-buffer 33;;; (comint mode). The idea is that you can build specific process-in-a-buffer
@@ -2002,7 +2002,7 @@ Typing SPC flushes the help buffer."
2002 (set-buffer (get-buffer "*Completions*")) 2002 (set-buffer (get-buffer "*Completions*"))
2003 (setq key (read-key-sequence nil) 2003 (setq key (read-key-sequence nil)
2004 first (aref key 0)) 2004 first (aref key 0))
2005 (and (consp first) 2005 (and (consp first) (consp (event-start first))
2006 (eq (window-buffer (posn-window (event-start first))) 2006 (eq (window-buffer (posn-window (event-start first)))
2007 (get-buffer "*Completions*")) 2007 (get-buffer "*Completions*"))
2008 (eq (key-binding key) 'mouse-choose-completion))) 2008 (eq (key-binding key) 'mouse-choose-completion)))