aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love <[email protected]>2000-02-20 12:34:49 +0000
committerDave Love <[email protected]>2000-02-20 12:34:49 +0000
commit7565ee9323a01cb603c34737d29f67d64bd22994 (patch)
tree900e22b69ea25d2b6b3fc709f5ecb2181458e2fb
parent0ae278818a7891c7166e568da2f575bb24b4267e (diff)
(display-mouse-p): Use variable xterm-mouse-mode and check for t-mouse
too.
-rw-r--r--lisp/frame.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index a9d4121949..394652d531 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1,6 +1,6 @@
;;; frame.el --- multi-frame management independent of window systems.
-;; Copyright (C) 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1996, 1997, 2000 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
@@ -803,7 +803,11 @@ frame's display)."
((memq frame-type '(x mac))
t) ;; We assume X and Mac *always* have a pointing device
(t
- (featurep 'xt-mouse)))))
+ (or (and (featurep 'xt-mouse)
+ xterm-mouse-mode)
+ ;; t-mouse is distributed with the GPM package. It doesn't have
+ ;; a toggle.
+ (featurep 't-mouse))))))
(defun display-popup-menus-p (&optional display)
"Return non-nil if popup menus are supported on DISPLAY.