aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2016-02-03 18:11:10 +0200
committerEli Zaretskii2016-02-03 18:11:10 +0200
commit8784ebf3a9f94c64cd09149c4906a3f494a1251d (patch)
tree20eae511f7c9c099a9fb20ab24bef4b4bd53b9a9 /src
parent8b87ecb77dc8212e16be4ef8cb28fe2829f6877b (diff)
downloademacs-8784ebf3a9f94c64cd09149c4906a3f494a1251d.tar.gz
emacs-8784ebf3a9f94c64cd09149c4906a3f494a1251d.zip
Fix x-popup-menu on TTYs without a mouse
* src/menu.c (Fx_popup_menu): Be sure to initialize 'x' and 'y' for the TTY case without a mouse. (Bug#22538)
Diffstat (limited to 'src')
-rw-r--r--src/menu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/menu.c b/src/menu.c
index caae228a259..cbddef35754 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1236,6 +1236,9 @@ no quit occurs and `x-popup-menu' returns nil. */)
1236 { 1236 {
1237 /* Use the mouse's current position. */ 1237 /* Use the mouse's current position. */
1238 struct frame *new_f = SELECTED_FRAME (); 1238 struct frame *new_f = SELECTED_FRAME ();
1239
1240 XSETFASTINT (x, 0);
1241 XSETFASTINT (y, 0);
1239#ifdef HAVE_X_WINDOWS 1242#ifdef HAVE_X_WINDOWS
1240 if (FRAME_X_P (new_f)) 1243 if (FRAME_X_P (new_f))
1241 { 1244 {