aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2017-08-09 20:15:46 +0300
committerEli Zaretskii2017-08-09 20:15:46 +0300
commit7fc27ea70bc7dc24776b2c098ac970f2f21e37fb (patch)
tree6506847574eda46651ac325d03a000fb80fd437c /src
parentda4438e14f1c55808937872b6d651a807404daa2 (diff)
downloademacs-7fc27ea70bc7dc24776b2c098ac970f2f21e37fb.tar.gz
emacs-7fc27ea70bc7dc24776b2c098ac970f2f21e37fb.zip
Fix crashing emacs-module tests on MS-Windows
* src/w32fns.c (syms_of_w32fns) <w32-disable-abort-dialog>: New variable. (emacs_abort): If w32-disable-abort-dialog is non-nil, abort right away, without displaying the Abort dialog, which waits for the user. * test/src/emacs-module-tests.el (module--test-assertion): Run the inferior Emacs with the w32 abort dialog disabled. Expect the status of the aborted Emacs sub-process to be 3 on MS-Windows and 2 on MS-DOS.
Diffstat (limited to 'src')
-rw-r--r--src/w32fns.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index 457599fce0e..bf3c1d5d303 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -10708,6 +10708,11 @@ default value t means to add the width of one canonical character of the
10708tip frame. */); 10708tip frame. */);
10709 Vw32_tooltip_extra_pixels = Qt; 10709 Vw32_tooltip_extra_pixels = Qt;
10710 10710
10711 DEFVAR_BOOL ("w32-disable-abort-dialog",
10712 w32_disable_abort_dialog,
10713 doc: /* Non-nil means don't display the abort dialog when aborting. */);
10714 w32_disable_abort_dialog = 0;
10715
10711#if 0 /* TODO: Port to W32 */ 10716#if 0 /* TODO: Port to W32 */
10712 defsubr (&Sx_change_window_property); 10717 defsubr (&Sx_change_window_property);
10713 defsubr (&Sx_delete_window_property); 10718 defsubr (&Sx_delete_window_property);
@@ -10902,6 +10907,9 @@ w32_backtrace (void **buffer, int limit)
10902void 10907void
10903emacs_abort (void) 10908emacs_abort (void)
10904{ 10909{
10910 if (w32_disable_abort_dialog)
10911 abort ();
10912
10905 int button; 10913 int button;
10906 button = MessageBox (NULL, 10914 button = MessageBox (NULL,
10907 "A fatal error has occurred!\n\n" 10915 "A fatal error has occurred!\n\n"