# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1114973368 0
# Node ID 2ce055c7db6575d354b405842c54750cacde0e8a
# Parent  f58aeabf21e719321eb4f463a7e161aa94e7eb7c
[not HAVE_X_TOOLKIT] (xmenu_show):
If user cancels the menu, quit unless FOR_CLICK.

diff -r f58aeabf21e7 -r 2ce055c7db65 src/xmenu.c
--- a/src/xmenu.c	Sun May 01 18:48:26 2005 +0000
+++ b/src/xmenu.c	Sun May 01 18:49:28 2005 +0000
@@ -2889,6 +2889,9 @@
 	    }
 	}
     }
+  else if (!for_click)
+    /* Make "Cancel" equivalent to C-g.  */
+    Fsignal (Qquit, Qnil);
 
   return Qnil;
 }
@@ -3519,8 +3522,8 @@
       entry = Qnil;
       break;
     case XM_NO_SELECT:
-      /* Make "Cancel" equivalent to C-g unless this menu was popped up by
-         a mouse press.  */
+      /* Make "Cancel" equivalent to C-g unless FOR_CLICK (which means
+	 the menu was invoked with a mouse event as POSITION).  */
       if (! for_click)
         Fsignal (Qquit, Qnil);
       entry = Qnil;