diff src/emacs.c @ 1346:01c57eb70ae9

[xemacs-hg @ 2003-03-09 02:27:27 by ben] To: xemacs-patches@xemacs.org i.c: Sleep between calls to check for I/O, since these calls are non-blocking. behavior.el: Allow other keywords for forward compatibility. cl-macs.el: Rewrite to eliminate byte-compiler warning when `return' is used without `finally'. cmdloop.el: Avoid truncated error messages for `end-of-file' and the like. cmdloop.el: Avoid char-int error after syncing. files.el: Eliminate byte-compile warnings. printer.el: Fix line-width calculations. #### This used to work. Someone's changes (perhaps by Michael Sperber?) seem to have messed something up. simple.el: Use new clear-left-side functions to avoid messages ending up on the same line as other output. xemacs.mak: Add override for info/ as well when separate source/build dirs. xemacs.mak: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. Makefile.in.in: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. alloc.c: Don't arbitrarily clear Vconfigure_info_directory since it messes up separate build/source dirs. console.c, console.h, device-msw.c, device.c: Add accidentally omitted msprinter console and data descriptions. print.c, console-msw.c: Add clear-left-side functionality to help keep stdio/stderr output from separate sources on separate lines. Generalize the different kinds of debugging output. Add dpa(). profile.c: Add better docs on Unix/Windows differences. regex.c: Fix problems with rel-alloc compilation caused by previous patch. emacs.c: Seg fault rather than abort on Cygwin, since gdb doesn't trap aborts properly. console-gtk-impl.h, console-gtk.h, console-msw.h, console-x-impl.h, console-x.h, dialog-gtk.c, dialog-x.c, event-msw.c, frame-gtk.c, frame-x.c, frameslots.h, glyphs-gtk.c, glyphs-x.c, gui-gtk.c, gui-x.c, inline.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, scrollbar-gtk.c, scrollbar-x.c, ui-gtk.c: Delete popup-data object. Delete menubar_data field from frames, since its usage is frame-specific. Delete menubar-msw.h, gui-x.h, gui-gtk.h. Clean up handling of lwlib callback data GCPRO'ing and add missing GCPRO recomputation in widget code.
author ben
date Sun, 09 Mar 2003 02:27:46 +0000
parents 4542b72c005e
children 9fc738581a9d
line wrap: on
line diff
--- a/src/emacs.c	Sat Mar 08 22:52:26 2003 +0000
+++ b/src/emacs.c	Sun Mar 09 02:27:46 2003 +0000
@@ -3702,8 +3702,8 @@
      were in the middle of doing something */
   /* debugging_breakpoint (); */
 #if !defined (ASSERTIONS_DONT_ABORT)
-#ifdef _MSC_VER
-  /* Calling abort() directly just seems to exit, in a way we can't
+#if defined (_MSC_VER) || defined (CYGWIN)
+  /* In VC++, calling abort() directly just seems to exit, in a way we can't
      trap. (#### The docs say it does raise (SIGABRT), which we should be
      able to trap.  Perhaps we're messing up somewhere?  Or perhaps MS is
      messed up.)
@@ -3720,12 +3720,14 @@
      software exception ..." without the obvious "OK to terminate", "Cancel
      to debug"; instead, you just get OK/Cancel, which in fact do those
      same things. */
+  /* In Cygwin, abort() doesn't get trapped properly in gdb but seg faults
+     do, so we resort to the same trick. */
   * ((int *) 0) = 666;
   /* RaiseException (STATUS_ASSERTION_FAILURE, EXCEPTION_NONCONTINUABLE, 0,
 	             0); */
 #else
   really_abort ();
-#endif /* _MSC_VER */
+#endif /* defined (_MSC_VER) || defined (CYGWIN) */
 #endif /* !defined (ASSERTIONS_DONT_ABORT) */
   inhibit_non_essential_printing_operations = 0;
   in_assert_failed = 0;