aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
authorEli Zaretskii2013-09-21 17:53:04 +0300
committerEli Zaretskii2013-09-21 17:53:04 +0300
commitf0177f86f745ef86357214b110f9d98e4ed63b7a (patch)
tree85f8cbb3a930a39ea84bb02637279b7a783d37eb /src/menu.c
parente11a3bd1d1848d0a3a2ac21a48360eb628127ed9 (diff)
downloademacs-f0177f86f745ef86357214b110f9d98e4ed63b7a.tar.gz
emacs-f0177f86f745ef86357214b110f9d98e4ed63b7a.zip
Fix infinite loop in menu input due to block_input.
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/menu.c b/src/menu.c
index cf6ceb58e7f..bbd0e70fe04 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1328,7 +1328,6 @@ no quit occurs and `x-popup-menu' returns nil. */)
1328#endif 1328#endif
1329 1329
1330 /* Display them in a menu. */ 1330 /* Display them in a menu. */
1331 block_input ();
1332 1331
1333 /* FIXME: Use a terminal hook! */ 1332 /* FIXME: Use a terminal hook! */
1334#if defined HAVE_NTGUI 1333#if defined HAVE_NTGUI
@@ -1358,8 +1357,6 @@ no quit occurs and `x-popup-menu' returns nil. */)
1358 selection = tty_menu_show (f, xpos, ypos, for_click, 1357 selection = tty_menu_show (f, xpos, ypos, for_click,
1359 keymaps, title, &error_name); 1358 keymaps, title, &error_name);
1360 1359
1361 unblock_input ();
1362
1363#ifdef HAVE_NS 1360#ifdef HAVE_NS
1364 unbind_to (specpdl_count, Qnil); 1361 unbind_to (specpdl_count, Qnil);
1365#else 1362#else