diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2000-07-31 15:35:08 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2000-07-31 15:35:08 +0000 |
| commit | e2c00a47192925f865cf07ce567d11df8ff7d94b (patch) | |
| tree | 1804766257db0f089260383fe0d1cc10fab7e0b6 /lisp/wid-edit.el | |
| parent | fbebec273d7e0e303404885cf36f75f298cea482 (diff) | |
| download | emacs-e2c00a47192925f865cf07ce567d11df8ff7d94b.tar.gz | |
(widget-choose): Use display-mouse-p instead of window-system.
(widget-choice-mouse-down-action): Use display-popup-menus-p
instead of window-system.
Diffstat (limited to 'lisp/wid-edit.el')
| -rw-r--r-- | lisp/wid-edit.el | 4 |
1 files 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))) |