aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-01-09 10:08:51 +0000
committerEli Zaretskii2001-01-09 10:08:51 +0000
commitfb55ff106a38ac23766450dff67fb608871c87fa (patch)
tree93faefe644e61bb139dc20e8a0f6d4e6d8895930
parente6cddb1aa28852c4adeec420f5c9b54d703ba2e0 (diff)
downloademacs-fb55ff106a38ac23766450dff67fb608871c87fa.tar.gz
emacs-fb55ff106a38ac23766450dff67fb608871c87fa.zip
(widget-choose): Call display-popup-menus-p instead
of display-mouse-p.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/wid-edit.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17d3e25e4d4..01de1317729 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12001-01-09 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * wid-edit.el (widget-choose): Call display-popup-menus-p instead
4 of display-mouse-p.
5
12001-01-09 Kenichi Handa <handa@etl.go.jp> 62001-01-09 Kenichi Handa <handa@etl.go.jp>
2 7
3 * international/mule.el (make-coding-system): If the coding system 8 * international/mule.el (make-coding-system): If the coding system
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 52851524b8a..34d9fb75a9d 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -204,7 +204,7 @@ mouse event, and the number of elements in items is less than
204`widget-menu-max-size', a popup menu will be used, otherwise the 204`widget-menu-max-size', a popup menu will be used, otherwise the
205minibuffer." 205minibuffer."
206 (cond ((and (< (length items) widget-menu-max-size) 206 (cond ((and (< (length items) widget-menu-max-size)
207 event (display-mouse-p)) 207 event (display-popup-menus-p))
208 ;; Mouse click. 208 ;; Mouse click.
209 (x-popup-menu event 209 (x-popup-menu event
210 (list title (cons "" items)))) 210 (list title (cons "" items))))