diff options
| author | Paul Eggert | 2012-09-04 10:34:54 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-04 10:34:54 -0700 |
| commit | 1088b9226e7dac7314dab52ef0696a5f540900cd (patch) | |
| tree | bfae7d26f4b411f5c6a0ef33cfcd0c526619ee56 /src/window.c | |
| parent | 30934d334e8a67c8992d910428758d5b93e0f04f (diff) | |
| download | emacs-1088b9226e7dac7314dab52ef0696a5f540900cd.tar.gz emacs-1088b9226e7dac7314dab52ef0696a5f540900cd.zip | |
Simplify redefinition of 'abort' (Bug#12316).
Do not try to redefine the 'abort' function. Instead, redo
the code so that it calls 'emacs_abort' rather than 'abort'.
This removes the need for the NO_ABORT configure-time macro
and makes it easier to change the abort code to do a backtrace.
* configure.ac (NO_ABRT): Remove.
* admin/CPP-DEFINES (NO_ABORT): Remove.
* nt/inc/ms-w32.h (w32_abort) [HAVE_NTGUI]: Remove.
* src/.gdbinit: Just stop at emacs_abort, not at w32_abort or abort.
* src/emacs.c (abort) [!DOS_NT && !NO_ABORT]:
Remove; sysdep.c's emacs_abort now takes its place.
* src/lisp.h (emacs_abort): New decl. All calls from Emacs code to
'abort' changed to use 'emacs_abort'.
* src/msdos.c (dos_abort) [defined abort]: Remove; not used.
(abort) [!defined abort]: Rename to ...
(emacs_abort): ... new name.
* src/sysdep.c (emacs_abort) [!HAVE_NTGUI]: New function, taking
the place of the old 'abort' in emacs.c.
* src/w32.c, src/w32fns.c (abort): Do not #undef.
* src/w32.c (emacs_abort): Rename from w32_abort.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c index 38124cb13a9..08608e0d451 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -386,7 +386,7 @@ the first window of that frame. */) | |||
| 386 | else if (! NILP (XWINDOW (window)->vchild)) | 386 | else if (! NILP (XWINDOW (window)->vchild)) |
| 387 | window = XWINDOW (window)->vchild; | 387 | window = XWINDOW (window)->vchild; |
| 388 | else | 388 | else |
| 389 | abort (); | 389 | emacs_abort (); |
| 390 | } | 390 | } |
| 391 | 391 | ||
| 392 | return window; | 392 | return window; |
| @@ -1289,7 +1289,7 @@ If they are in the windows's left or right marginal areas, `left-margin'\n\ | |||
| 1289 | return Qnil; | 1289 | return Qnil; |
| 1290 | 1290 | ||
| 1291 | default: | 1291 | default: |
| 1292 | abort (); | 1292 | emacs_abort (); |
| 1293 | } | 1293 | } |
| 1294 | } | 1294 | } |
| 1295 | 1295 | ||
| @@ -1948,7 +1948,7 @@ unshow_buffer (register struct window *w) | |||
| 1948 | buf = w->buffer; | 1948 | buf = w->buffer; |
| 1949 | b = XBUFFER (buf); | 1949 | b = XBUFFER (buf); |
| 1950 | if (b != XMARKER (w->pointm)->buffer) | 1950 | if (b != XMARKER (w->pointm)->buffer) |
| 1951 | abort (); | 1951 | emacs_abort (); |
| 1952 | 1952 | ||
| 1953 | #if 0 | 1953 | #if 0 |
| 1954 | if (w == XWINDOW (selected_window) | 1954 | if (w == XWINDOW (selected_window) |
| @@ -2669,7 +2669,7 @@ window_loop (enum window_loop type, Lisp_Object obj, int mini, Lisp_Object frame | |||
| 2669 | case CHECK_ALL_WINDOWS: | 2669 | case CHECK_ALL_WINDOWS: |
| 2670 | if (! NILP (w->buffer) | 2670 | if (! NILP (w->buffer) |
| 2671 | && NILP (BVAR (XBUFFER (w->buffer), name))) | 2671 | && NILP (BVAR (XBUFFER (w->buffer), name))) |
| 2672 | abort (); | 2672 | emacs_abort (); |
| 2673 | break; | 2673 | break; |
| 2674 | 2674 | ||
| 2675 | case WINDOW_LOOP_UNUSED: | 2675 | case WINDOW_LOOP_UNUSED: |