aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2005-06-12 10:41:05 +0000
committerEli Zaretskii2005-06-12 10:41:05 +0000
commitc52e16385d1a0a662df0df835f12e7e9b2c020a4 (patch)
tree81397b4c5ecb59ce481a4ca8eaf4bd6b3fd5b325 /src
parentf586d18e58c09c56635747d85adb6a104753cb87 (diff)
downloademacs-c52e16385d1a0a662df0df835f12e7e9b2c020a4.tar.gz
emacs-c52e16385d1a0a662df0df835f12e7e9b2c020a4.zip
(w32_abort): Use the MB_YESNO dialog instead of
MB_ABORTRETRYIGNORE. Never return, even if DebugBreak does.
Diffstat (limited to 'src')
-rw-r--r--src/w32fns.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index 0e9e4509373..7f625916926 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8894,24 +8894,25 @@ void globals_of_w32fns ()
8894 8894
8895#undef abort 8895#undef abort
8896 8896
8897void w32_abort (void) NO_RETURN;
8898
8897void 8899void
8898w32_abort() 8900w32_abort()
8899{ 8901{
8900 int button; 8902 int button;
8901 button = MessageBox (NULL, 8903 button = MessageBox (NULL,
8902 "A fatal error has occurred!\n\n" 8904 "A fatal error has occurred!\n\n"
8903 "Select Abort to exit, Retry to debug, Ignore to continue", 8905 "Would you like to attach a debugger?\n\n"
8906 "Select YES to debug, NO to abort Emacs",
8904 "Emacs Abort Dialog", 8907 "Emacs Abort Dialog",
8905 MB_ICONEXCLAMATION | MB_TASKMODAL 8908 MB_ICONEXCLAMATION | MB_TASKMODAL
8906 | MB_SETFOREGROUND | MB_ABORTRETRYIGNORE); 8909 | MB_SETFOREGROUND | MB_YESNO);
8907 switch (button) 8910 switch (button)
8908 { 8911 {
8909 case IDRETRY: 8912 case IDYES:
8910 DebugBreak (); 8913 DebugBreak ();
8911 break; 8914 exit (2); /* tell the compiler we will never return */
8912 case IDIGNORE: 8915 case IDNO:
8913 break;
8914 case IDABORT:
8915 default: 8916 default:
8916 abort (); 8917 abort ();
8917 break; 8918 break;