2 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 78cfea5dff2..1a70edd2a07 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-03  Jason Rumney  <jasonr@gnu.org>
+
+        * w32menu.c (w32_menu_show, w32_dialog_show): Call Fsignal to quit
+        when no option selected.
+
 2006-08-03  Chong Yidong  <cyd@stupidchicken.com>
 
         * process.c: Revert last change.
diff --git a/src/w32menu.c b/src/w32menu.c
index 389e6c5b856..11af1d66b6f 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1994,6 +1994,9 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error)
             }
         }
     }
+  else if (!for_click)
+    /* Make "Cancel" equivalent to C-g.  */
+    Fsignal (Qquit, Qnil);
 
   return Qnil;
 }
@@ -2186,6 +2189,9 @@ w32_dialog_show (f, keymaps, title, header, error)
             }
         }
     }
+  else
+    /* Make "Cancel" equivalent to C-g.  */
+    Fsignal (Qquit, Qnil);
 
   return Qnil;
 }