aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
authorPaul Eggert2012-09-04 10:34:54 -0700
committerPaul Eggert2012-09-04 10:34:54 -0700
commit1088b9226e7dac7314dab52ef0696a5f540900cd (patch)
treebfae7d26f4b411f5c6a0ef33cfcd0c526619ee56 /src/menu.c
parent30934d334e8a67c8992d910428758d5b93e0f04f (diff)
downloademacs-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/menu.c')
-rw-r--r--src/menu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/menu.c b/src/menu.c
index 20770537326..bfdc68ca118 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -733,7 +733,7 @@ digest_single_submenu (int start, int end, int top_level_items)
733 733
734 /* All items should be contained in panes. */ 734 /* All items should be contained in panes. */
735 if (panes_seen == 0) 735 if (panes_seen == 0)
736 abort (); 736 emacs_abort ();
737 737
738 item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME); 738 item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);
739 enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE); 739 enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);
@@ -807,7 +807,7 @@ digest_single_submenu (int start, int end, int top_level_items)
807 else if (EQ (type, QCtoggle)) 807 else if (EQ (type, QCtoggle))
808 wv->button_type = BUTTON_TYPE_TOGGLE; 808 wv->button_type = BUTTON_TYPE_TOGGLE;
809 else 809 else
810 abort (); 810 emacs_abort ();
811 811
812 wv->selected = !NILP (selected); 812 wv->selected = !NILP (selected);
813 if (! STRINGP (help)) 813 if (! STRINGP (help))