Mercurial > emacs

diff lisp/wid-edit.el @ 30539:bb2f9fca15c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(widget-choose): Use display-mouse-p instead of window-system. (widget-choice-mouse-down-action): Use display-popup-menus-p instead of window-system.
author Eli Zaretskii <eliz@gnu.org>
date Mon, 31 Jul 2000 15:35:08 +0000
parents e99b2e89fa59
children 7e7ba448ad10
line wrap: on
line diff
--- a/lisp/wid-edit.el	Mon Jul 31 15:34:07 2000 +0000
+++ b/lisp/wid-edit.el	Mon Jul 31 15:35:08 2000 +0000
@@ -176,7 +176,7 @@
 `widget-menu-max-size', a popup menu will be used, otherwise the
 minibuffer."
   (cond ((and (< (length items) widget-menu-max-size)
-	      event (fboundp 'x-popup-menu) window-system)
+	      event (fboundp 'x-popup-menu) (display-mouse-p))
 	 ;; We are in Emacs-19, pressed by the mouse
 	 (x-popup-menu event
 		       (list title (cons "" items))))
@@ -1818,7 +1818,7 @@
   ;; Return non-nil if we need a menu.
   (let ((args (widget-get widget :args))
 	(old (widget-get widget :choice)))
-    (cond ((not window-system)
+    (cond ((not (display-popup-menus-p))
 	   ;; No place to pop up a menu.
 	   nil)
 	  ((not (or (fboundp 'x-popup-menu) (fboundp 'popup-menu)))