From e2c00a47192925f865cf07ce567d11df8ff7d94b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 31 Jul 2000 15:35:08 +0000 Subject: [PATCH] (widget-choose): Use display-mouse-p instead of window-system. (widget-choice-mouse-down-action): Use display-popup-menus-p instead of window-system. --- lisp/wid-edit.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index a4de1d35e2c..cd92824049a 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -176,7 +176,7 @@ mouse event, and the number of elements in items is less than `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 @@ when he invoked the menu." ;; 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))) -- 2.39.2