# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 951050089 0
# Node ID 097c2dd9367ad02e045dfb351371e8ce7f6c89ab
# Parent  e209690ccf0ac64b81b2aef2f0eddfc020d2409d
(display-mouse-p): Use variable xterm-mouse-mode and check for t-mouse
too.

diff -r e209690ccf0a -r 097c2dd9367a lisp/frame.el
--- a/lisp/frame.el	Sun Feb 20 12:22:14 2000 +0000
+++ b/lisp/frame.el	Sun Feb 20 12:34:49 2000 +0000
@@ -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 @@
      ((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.