12:33 a.m.
Vin -- this combines various patches; it includes everything I needed in
order to get 21.4 to compile correctly under VC++ 7 and under Cygwin. It
supersedes both my previous patch to config.inc.samp and the patch to
xemacs.mak that you were ambivalent about (I include only the first part of
that patch, necessary to get makeinfo to work correctly).
ben
ChangeLog addition:
2005-01-29 Ben Wing <ben(a)xemacs.org>
* configure.in (AC_INIT_NOTICE):
* configure.in (XE_COMPUTE_RUNPATH):
Copy LDAP fixes from 21.5.
Port Marcus Crestani's patches of 2004-11-12:
* Makefile.in.in (install-arch-dep): Fix installation for Cygwin.
* configure:
* configure.in: Make pdump default for Cygwin.
lisp/ChangeLog addition:
2005-01-29 Ben Wing <ben(a)xemacs.org>
* shadow.el (find-emacs-lisp-shadows):
Add custom-defines to list of ignored files.
nt/ChangeLog addition:
2005-01-29 Ben Wing <ben(a)xemacs.org>
* xemacs.mak:
* xemacs.mak (USE_PORTABLE_DUMPER):
Enable portable dumper just in case it's not specified in config.inc.
* xemacs.mak:
* xemacs.mak (INCLUDES):
Put our own directories first in case of conflict (e.g. config.h
in compface).
* xemacs.mak ($(BLDLIB_SRC)/minitar.exe):
* xemacs.mak (LIB_SRC_TOOLS):
Use MSVCRT to avoid link problems.
* xemacs.mak ({$(MANDIR)}.texi{$(INFODIR)}.info):
Use filename only when calling makeinfo, or it chokes on index
generation.
2005-01-28 Ben Wing <ben(a)xemacs.org>
* config.inc.samp:
* config.inc.samp (PNG_DIR):
* config.inc.samp (MAKEINFO):
Update directory locations to correspond to current optional-libs.exe
and Cygwin makeinfo. Update GTK comment. Enable TIFF and COMPFACE
since we can now compile with them.
src/ChangeLog addition:
2005-01-25 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in:
* Makefile.in.in (%.o):
Don't compile executable as Windows (-mwindows) under Cygwin.
Semi-recent changes to Cygwin's executable-startup handling make
it impossible to access the TTY this way.
Don't use special linker file under Cygwin (cygwin.sc) except
when non-PDUMP (even in this case it is highly questionable); you
get errors like
1 [main] temacs 1364 fhandler_console::fixup_after_exec: error opening input console
handle after exec, errno 13, Win32 error 5
5820 [main] temacs 1364 fhandler_console::fixup_after_exec: error opening output
console handle after exec, errno 13, Win32 error 5
2005-01-29 Ben Wing <ben(a)xemacs.org>
Port this: 2003-08-14 Stephen J. Turnbull <stephen(a)xemacs.org>
* mule-charset.c (get_unallocated_leading_byte): Compiler quietus.
2005-01-29 Ben Wing <ben(a)xemacs.org>
* bytecode.c (optimize_compiled_function):
* print.c (FROB):
* print.c (long_to_string):
Add casts to avoid warning.
* glyphs-eimage.c:
Some really nasty hacks to allow TIFF and JPEG to both be compiled.
#### The better solution is to move the TIFF and JPEG code to
different files.
* glyphs-msw.c (mswindows_xbm_instantiate):
Define __STDC__ to avoid problems with compface.h.
* EmacsFrame.c (EmacsFrameRecomputeCellSize):
* EmacsShell-sub.c:
* EmacsShell-sub.c (ABORT):
* EmacsShell-sub.c (SuperClassRootGeometryManager):
* EmacsShell-sub.c (RootGeometryManager):
* EmacsShell.c:
* EmacsShell.c (ABORT):
* EmacsShell.c (EmacsShellUpdateSizeHints):
* alloc.c (free_lcrecord):
* alloca.c (i00afunc):
* buffer.c (delete_from_buffer_alist):
* buffer.c (MARKED_SLOT):
* bytecode.c (execute_rare_opcode):
* bytecode.c (optimize_byte_code):
* bytecode.c (Ffetch_bytecode):
* chartab.c (char_table_type_to_symbol):
* chartab.c (Freset_char_table):
* chartab.c (decode_char_table_range):
* chartab.c (Fget_range_char_table):
* chartab.c (check_valid_char_table_value):
* chartab.c (map_char_table):
* chartab.c (slow_map_char_table_fun):
* chartab.c (chartab_instantiate):
* cm.c (cmcheckmagic):
* console-msw.c (DHEADER):
* console.c (MARKED_SLOT):
* data.c (finish_marking_weak_lists):
* data.c (encode_weak_list_type):
* debug.h (DASSERT):
* device-gtk.c (gtk_init_device):
* device-msw.c (mswindows_get_default_margin):
* device-tty.c (tty_init_device):
* device-x.c (get_device_from_display):
* device-x.c (x_get_visual_depth):
* doprnt.c (parse_doprnt_spec):
* doprnt.c (get_doprnt_args):
* dumper.c (pdump_get_indirect_count):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_register_object):
* dumper.c (pdump_register_struct):
* dumper.c (pdump_dump_data):
* dumper.c (pdump_reloc_one):
* elhash.c (print_hash_table):
* elhash.c (make_standard_lisp_hash_table):
* elhash.c (hash_table_instantiate):
* emacs.c:
* emacs.c (Fforce_debugging_signal):
* emacs.c (sort_args):
* emacs.c (main):
* emacs.c (assert_failed):
* eval.c (throw_or_bomb_out):
* eval.c (signal_1):
* eval.c (Fsignal):
* event-Xt.c:
* event-Xt.c (emacs_Xt_mapping_action):
* event-Xt.c (Xt_process_to_emacs_event):
* event-msw.c:
* event-stream.c (check_event_stream_ok):
* event-stream.c (Fadd_timeout):
* event-stream.c (Fadd_async_timeout):
* event-stream.c (Fdiscard_input):
* event-stream.c (execute_internal_event):
* event-stream.c (Frecent_keys):
* event-stream.c (extract_this_command_keys_nth_mouse_event):
* event-stream.c (lookup_command_event):
* event-unixoid.c (poll_fds_for_input):
* events.c:
* events.c (mark_event):
* events.c (event_equal):
* events.c (event_hash):
* events.c (Fmake_event):
* events.c (Fdeallocate_event):
* events.c (event_chain_find_previous):
* events.c (event_to_character):
* events.c (format_event_object):
* events.c (Fevent_type):
* events.c (event_pixel_translation):
* events.c (Fevent_properties):
* extents.c (extent_in_region_p):
* extents.c (print_extent):
* extents.c (process_extents_for_insertion_mapper):
* extents.c (report_extent_modification_mapper):
* extents.c (glyph_layout_to_symbol):
* faces.c (face_validate):
* file-coding.c (eol_type_to_symbol):
* file-coding.c (subsidiary_coding_system):
* file-coding.c (Fcoding_system_type):
* file-coding.c (Fcoding_system_property):
* file-coding.c (mule_decode):
* file-coding.c (mule_encode):
* file-coding.c (encode_coding_ucs4):
* file-coding.c (encode_coding_utf8):
* file-coding.c (parse_iso2022_esc):
* file-coding.c (encode_coding_iso2022):
* fileio.c:
* fns.c (concat):
* fns.c (Fsubseq):
* fns.c (mapcar1):
* fns.c (Fbase64_encode_region):
* fns.c (Fbase64_encode_string):
* fns.c (Fbase64_decode_region):
* fns.c (Fbase64_decode_string):
* font-lock.c (find_context):
* font-lock.c (context_to_symbol):
* frame-gtk.c (gtk_set_frame_pointer):
* frame-gtk.c (gtk_update_frame_external_traits):
* frame-x.c (x_wm_mark_shell_size_user_specified):
* frame-x.c (x_wm_mark_shell_position_user_specified):
* frame-x.c (x_wm_set_shell_iconic_p):
* frame-x.c (x_wm_set_cell_size):
* frame-x.c (x_wm_set_variable_size):
* frame-x.c (x_wm_store_class_hints):
* frame-x.c (x_wm_maybe_store_wm_command):
* frame-x.c (x_initialize_frame_size):
* frame-x.c (x_update_frame_external_traits):
* frame.c:
* frame.c (delete_frame_internal):
* frame.c (mouse_pixel_position_1):
* frame.c (change_frame_size_1):
* free-hook.c (check_free):
* free-hook.c (check_realloc):
* free-hook.c (note_block_input):
* free-hook.c (log_gcpro):
* gccache-gtk.c (gc_cache_lookup):
* glyphs-eimage.c (tiff_memory_write):
* glyphs-gtk.c (gtk_finalize_image_instance):
* glyphs-gtk.c (init_image_instance_from_gdk_pixmap):
* glyphs-gtk.c (init_image_instance_from_xbm_inline):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_unmap_subwindow):
* glyphs-gtk.c (gtk_map_subwindow):
* glyphs-gtk.c (gtk_button_redisplay):
* glyphs-msw.c:
* glyphs-msw.c (init_image_instance_from_xbm_inline):
* glyphs-x.c (init_image_instance_from_xbm_inline):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs.c (get_image_instantiator_governing_domain):
* glyphs.c (print_image_instance):
* glyphs.c (image_instance_equal):
* glyphs.c (image_instance_hash):
* glyphs.c (encode_image_instance_type):
* glyphs.c (make_image_instance_1):
* glyphs.c (inherit_instantiate):
* glyphs.c (image_instantiate):
* glyphs.c (allocate_glyph):
* glyphs.c (Fglyph_type):
* glyphs.c (redisplay_subwindow):
* glyphs.c (display_table_entry):
* gtk-glue.c (xemacs_list_to_gtklist):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-glue.c (xemacs_list_to_array):
* gutter.c (SET_GUTTER_WAS_VISIBLE_FLAG):
* gutter.c (gutter_was_visible):
* gutter.c (get_gutter_coords):
* input-method-xlib.c (get_XIM_input):
* insdel.c (bufpos_to_bytind_func):
* insdel.c (bytind_to_bufpos_func):
* insdel.c (move_gap):
* intl.c (x_get_composed_input):
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_delete_inverse_internal):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (accessible_keymaps_mapper_1):
* keymap.c (where_is_recursive_mapper):
* lisp.h:
* lisp.h (ABORT):
* lread.c (read_atom):
* lstream.c (Lstream_delete):
* lstream.c (make_lisp_buffer_stream_1):
* macros.c (pop_kbd_macro_event):
* malloc.c (malloc):
* malloc.c (free):
* marker.c (bi_marker_position):
* marker.c (set_bi_marker_position):
* menubar-gtk.c (menu_descriptor_to_widget_1):
* menubar-msw.c (prune_menubar):
* menubar-x.c (set_frame_menubar):
* mule-charset.c (get_unallocated_leading_byte):
* mule-charset.h (CHAR_LEADING_BYTE):
* native-gtk-toolbar.c (SET_TOOLBAR_WAS_VISIBLE_FLAG):
* nt.c (init_environment):
* nt.c (generate_inode_val):
* ntproc.c (delete_child):
* ntproc.c (_sys_read_ahead):
* ntproc.c (create_child):
* objects.c (color_instantiate):
* objects.c (font_instantiate):
* objects.c (face_boolean_instantiate):
* print.c (printing_major_badness):
* process-nt.c (nt_send_process):
* process-unix.c (unix_send_process):
* process.c (get_process):
* ralloc.c (obtain):
* ralloc.c (relinquish):
* ralloc.c (relocate_blocs):
* ralloc.c (resize_bloc):
* ralloc.c (r_alloc_free):
* ralloc.c (r_re_alloc):
* ralloc.c (r_alloc_thaw):
* ralloc.c (init_ralloc):
* ralloc.c (Free_Addr_Block):
* ralloc.c (r_alloc):
* redisplay-gtk.c (gtk_output_display_block):
* redisplay-msw.c (mswindows_output_display_block):
* redisplay-output.c (get_next_display_block):
* redisplay-output.c (get_cursor_size_and_location):
* redisplay-output.c (redisplay_output_layout):
* redisplay-output.c (redisplay_clear_region):
* redisplay-tty.c (tty_output_display_block):
* redisplay-x.c (x_output_display_block):
* redisplay.c (add_propagation_runes):
* redisplay.c (add_glyph_rune):
* redisplay.c (create_text_block):
* redisplay.c (add_margin_runes):
* redisplay.c (create_left_glyph_block):
* redisplay.c (create_right_glyph_block):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (redisplay_frame):
* redisplay.c (point_in_line_start_cache):
* regex.c:
* regex.c (ABORT):
* regex.c (re_compile_fastmap):
* regex.c (re_match_2_internal):
* regex.c (regerror):
* scrollbar-gtk.c (gtk_scrollbar_loop):
* scrollbar-gtk.c (scrollbar_cb):
* scrollbar-gtk.c (gtk_update_frame_scrollbars):
* scrollbar-msw.c (mswindows_handle_scrollbar_event):
* scrollbar-x.c (x_update_scrollbar_instance_status):
* scrollbar-x.c (x_scrollbar_loop):
* scrollbar-x.c (x_update_frame_scrollbars):
* search.c (search_command):
* search.c (Fmatch_data):
* select-x.c (motif_clipboard_cb):
* signal.c (interrupt_signal):
* specifier.c (specifier_add_spec):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (specifier_instance):
* specifier.h:
* specifier.h (struct specifier_methods):
* strftime.c (add_num_time_t):
* sunplay.c (init_device):
* symbols.c (Fsetplist):
* symbols.c (do_symval_forwarding):
* symbols.c (store_symval_forwarding):
* symbols.c (Fset):
* symbols.c (Fbuilt_in_variable_type):
* symbols.c (decode_magic_handler_type):
* symbols.c (handler_type_from_function_symbol):
* syntax.c (update_syntax_cache):
* sysdep.c (init_baud_rate):
* toolbar-gtk.c (SET_TOOLBAR_WAS_VISIBLE_FLAG):
* toolbar-msw.c (SET_TOOLBAR_WAS_VISIBLE_FLAG):
* toolbar-x.c (SET_TOOLBAR_WAS_VISIBLE_FLAG):
* toolbar.c (get_toolbar_coords):
* ui-gtk.c (build_gtk_boxed):
* ui-gtk.c (describe_gtk_arg):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (lisp_to_gtk_type):
* ui-gtk.c (lisp_to_gtk_ret_type):
* ui-gtk.c (lisp_to_flag):
* unexnt.c (read_in_bss):
* unexnt.c (map_in_heap):
* window.c (real_window):
* window.c (window_display_lines):
* window.c (window_display_buffer):
* window.c (set_window_display_buffer):
* window.c (window_modeline_height):
* window.c (unshow_buffer):
* window.c (window_loop):
* window.c (Fget_lru_window):
* window.c (Fsplit_window):
* window.c (Fset_window_configuration):
* window.c (saved_window_index):
* xgccache.c (gc_cache_lookup):
abort() -> ABORT(). Eliminate preprocessor games with abort()
since it creates huge problems in VC7, solvable only by including
massive amounts of files in every compile (and not worth it).
* sysdep.c:
* sysproc.h:
Inclusion of process.h does not need to be before lisp.h any more.
Move later and remove comment about abort().
latest-stable source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: src/xgccache.c src/window.c src/unexnt.c src/ui-gtk.c src/toolbar.c
src/toolbar-x.c src/toolbar-msw.c src/toolbar-gtk.c src/sysdep.c src/syntax.c
src/symbols.c src/sunplay.c src/strftime.c src/specifier.h src/specifier.c src/signal.c
src/select-x.c src/search.c src/scrollbar-x.c src/scrollbar-msw.c src/scrollbar-gtk.c
src/regex.c src/redisplay.c src/redisplay-x.c src/redisplay-tty.c src/redisplay-output.c
src/redisplay-msw.c src/redisplay-gtk.c src/ralloc.c src/process.c src/process-unix.c
src/process-nt.c src/print.c src/objects.c src/ntproc.c src/nt.c src/native-gtk-toolbar.c
src/mule-charset.h src/mule-charset.c src/menubar-x.c src/menubar-msw.c src/menubar-gtk.c
src/marker.c src/malloc.c src/macros.c src/lstream.c src/lread.c src/lisp.h src/keymap.c
src/intl.c src/insdel.c src/input-method-xlib.c src/gutter.c src/gtk-glue.c src/glyphs.c
src/glyphs-x.c src/glyphs-msw.c src/glyphs-gtk.c src/glyphs-eimage.c src/gccache-gtk.c
src/free-hook.c src/frame.c src/f!
rame-x.c src/frame-gtk.c src/font-lock.c src/fns.c src/fileio.c src/file-coding.c
src/faces.c src/extents.c src/events.c src/event-unixoid.c src/event-stream.c
src/event-msw.c src/event-Xt.c src/eval.c src/emacs.c src/elhash.c src/dumper.c
src/doprnt.c src/device-x.c src/device-tty.c src/device-msw.c src/device-gtk.c src/debug.h
src/data.c src/console.c src/console-msw.c src/cm.c src/chartab.c src/bytecode.c
src/buffer.c src/alloca.c src/alloc.c src/Makefile.in.in src/EmacsShell.c
src/EmacsShell-sub.c src/EmacsFrame.c nt/xemacs.mak nt/config.inc.samp nt/Emacs.ad.h
lisp/shadow.el configure.in Makefile.in.in
cvs server: Diffing .
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v
retrieving revision 1.2.2.6
diff -u -p -r1.2.2.6 Makefile.in.in
--- Makefile.in.in 2005/01/23 16:22:36 1.2.2.6
+++ Makefile.in.in 2005/01/30 00:26:04
＠＠ -435,11 +435,13 ＠＠ install-arch-dep: mkdir
${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
-chmod 0755 ${bindir}/${PROGNAME}
#else
- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
- -chmod 0755 ${bindir}/${PROGNAME}-${version}
# ifdef CYGWIN
+ ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}.exe
+ -chmod 0755 ${bindir}/${PROGNAME}-${version}.exe
cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S}
${PROGNAME}-${version}.exe ./${PROGNAME}
# else
+ ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
+ -chmod 0755 ${bindir}/${PROGNAME}-${version}
cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}
./${PROGNAME}
# endif /* CYGWIN */
#endif /* WIN32_NATIVE */
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v
retrieving revision 1.151.2.30
diff -u -p -r1.151.2.30 configure.in
--- configure.in 2005/01/23 16:22:57 1.151.2.30
+++ configure.in 2005/01/30 00:26:08
＠＠ -6,7 +6,7 ＠＠ define([AC_INIT_NOTICE],
#### Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 Free Software
Foundation, Inc.
#### Copyright (C) 1993-1995 Board of Trustees, University of Illinois.
#### Copyright (C) 1996, 1997 Sun Microsystems, Inc.
-#### Copyright (C) 1995, 1996 Ben Wing.
+#### Copyright (C) 1995, 1996, 2005 Ben Wing.
#### Copyright (C) 2000, 2001 Martin Buchholz.
#### Copyright (C) 1998, 1999 J. Kean Johnston.
＠＠ -1589,6 +1589,7 ＠＠ if test -z "$pdump"; then
case "$opsys" in
linux* ) pdump=yes ;; dnl glibc 2.3.1 seems to hose unexec
darwin ) pdump=yes ;; dnl No "native" working dumper available
+ cygwin* ) pdump=yes ;; dnl unexec is broken
*) pdump=no ;;
esac
fi
＠＠ -3208,28 +3209,32 ＠＠ AC_CHECKING(for LDAP)
test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) }
test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) }
if test "$with_ldap" != "no"; then
- AC_CHECK_LIB(ldap, ldap_search, with_ldap_nolber=yes, with_ldap_nolber=no)
- test "$with_ldap_nolber" = "no" && { AC_CHECK_LIB(ldap,
ldap_open, with_ldap_lber=yes, with_ldap_lber=no, -llber) }
- test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" =
"no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_krb=yes,
with_ldap_krb=no, -llber -lkrb) }
- test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" =
"no" -a "$with_ldap_krb" = "no" && {
AC_CHECK_LIB(ldap, ldap_open, with_ldap_krbdes=yes, with_ldap_krbdes=no, -llber -lkrb
-ldes) }
- test -z "$with_ldap" -a \( "$with_ldap_lber" = "yes" -o
"$with_ldap_nolber" = "yes" -o "$with_ldap_krb" =
"yes" -o "$with_ldap_krbdes" = "yes" \) &&
with_ldap=yes
+ AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes)
+ dnl Check for other libraries we need to link with to get the main routines.
+ test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap,
ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) }
+ test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap,
ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) }
+ test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap,
ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], ,
-llber -lkrb -ldes) }
+ dnl Recently, we need -lber even though the main routines are elsewhere,
+ dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on. So just
+ dnl check for that (it's a variable not a fun but that doesn't seem to
+ dnl matter in these checks) and stick in -lber if so. Can't hurt (even to
+ dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who
+ dnl #### understands LDAP needs to fix this properly.
+ test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber,
ber_pvt_opt_on, with_ldap_lber=yes) }
fi
if test "$with_ldap" = "yes"; then
AC_DEFINE(HAVE_LDAP)
XE_ADD_OBJS(eldap.o)
- if test "$with_ldap_nolber" = "yes" ; then
- XE_PREPEND(-lldap, LIBS)
- else
- if test "$with_ldap_krb" = "yes" ; then
- XE_PREPEND(-lkrb, LIBS)
- fi
- if test "$with_ldap_krbdes" = "yes" ; then
- XE_PREPEND(-ldes, LIBS)
- XE_PREPEND(-lkrb, LIBS)
- fi
+ if test "$with_ldap_des" = "yes" ; then
+ XE_PREPEND(-ldes, LIBS)
+ fi
+ if test "$with_ldap_krb" = "yes" ; then
+ XE_PREPEND(-lkrb, LIBS)
+ fi
+ if test "$with_ldap_lber" = "yes" ; then
XE_PREPEND(-llber, LIBS)
- XE_PREPEND(-lldap, LIBS)
fi
+ XE_PREPEND(-lldap, LIBS)
AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
fi
cvs server: Diffing dynodump
cvs server: Diffing dynodump/i386
cvs server: Diffing dynodump/ppc
cvs server: Diffing dynodump/sparc
cvs server: Diffing etc
cvs server: Diffing etc/custom
cvs server: Diffing etc/custom/example-themes
cvs server: Diffing etc/eos
cvs server: Diffing etc/idd
cvs server: Diffing etc/photos
cvs server: Diffing etc/sparcworks
cvs server: Diffing etc/tests
cvs server: Diffing etc/tests/external-widget
cvs server: Diffing etc/toolbar
cvs server: Diffing info
cvs server: Diffing lib-src
Index: lisp/shadow.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/shadow.el,v
retrieving revision 1.5
diff -u -p -r1.5 shadow.el
--- lisp/shadow.el 2001/04/12 18:21:35 1.5
+++ lisp/shadow.el 2005/01/30 00:26:13
＠＠ -114,6 +114,7 ＠＠ See the documentation for `list-load-pat
'("subdirs"
"auto-autoloads"
"custom-load"
+ "custom-defines"
"dumped-lisp"
"_pkg"
"lpath")))
cvs server: Diffing lisp/mule
cvs server: Diffing lisp/term
cvs server: Diffing lock
cvs server: Diffing lwlib
cvs server: Diffing man
cvs server: Diffing man/internals
cvs server: Diffing man/lispref
cvs server: Diffing man/new-users-guide
cvs server: Diffing man/xemacs
cvs server: Diffing modules
cvs server: Diffing modules/base64
cvs server: Diffing modules/ldap
cvs server: Diffing modules/sample
cvs server: Diffing modules/zlib
cvs server: Diffing netinstall
cvs server: Diffing nt
Index: nt/Emacs.ad.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/Emacs.ad.h,v
retrieving revision 1.1
diff -u -p -r1.1 Emacs.ad.h
--- nt/Emacs.ad.h 1997/02/24 00:49:23 1.1
+++ nt/Emacs.ad.h 2005/01/30 00:26:14
＠＠ -1,83 +1,83 ＠＠
-(String) "Emacs.modeline*attributeForeground: Black",
-(String) "Emacs.modeline*attributeBackground: Gray75",
-(String) "Emacs.text-cursor*attributeBackground: Red3",
-(String) "*menubar*Foreground: Gray30",
-(String) "*menubar*Background: Gray75",
-(String) "*menubar*buttonForeground: Blue",
-(String) "*XlwMenu*selectColor: ForestGreen",
-(String) "*XmToggleButton*selectColor: ForestGreen",
-(String) "*popup*Foreground: Black",
-(String) "*popup*Background: Gray75",
-(String) "*dialog*Foreground: Black",
-(String) "*dialog*Background: #A5C0C1",
-(String) "*dialog*XmTextField*Background: WhiteSmoke",
-(String) "*dialog*XmText*Background: WhiteSmoke",
-(String) "*dialog*XmList*Background: WhiteSmoke",
-(String) "*dialog*Command*Background: WhiteSmoke",
-(String) "*XlwScrollBar*Foreground: Gray30",
-(String) "*XlwScrollBar*Background: Gray75",
-(String) "*XmScrollBar*Foreground: Gray30",
-(String) "*XmScrollBar*Background: Gray75",
-(String) "*topToolBarShadowColor: Gray90",
-(String) "*bottomToolBarShadowColor: Gray40",
-(String) "*backgroundToolBarColor: Gray75",
-(String) "*toolBarShadowThickness: 2",
-(String) "*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String) "*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String)
"*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String)
"*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String) "*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String) "*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String) "*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*",
-(String) "*dialog*button1.accelerators:#override\
-<KeyPress>Return: ArmAndActivate()\\n\
-<KeyPress>KP_Enter: ArmAndActivate()\\n\
-Ctrl<KeyPress>m: ArmAndActivate()\\n",
-(String) "*XmTextField*translations: #override\\n\
- !<Key>osfBackSpace: delete-previous-character()\\n\
- !<Key>osfDelete: delete-previous-character()\\n\
- !Ctrl<Key>h: delete-previous-character()\\n\
- !Ctrl<Key>d: delete-next-character()\\n\
- !Meta<Key>osfDelete: delete-previous-word()\\n\
- !Meta<Key>osfBackSpace: delete-previous-word()\\n\
- !Meta<Key>d: delete-next-word()\\n\
- !Ctrl<Key>k: delete-to-end-of-line()\\n\
- !Ctrl<Key>g: process-cancel()\\n\
- !Ctrl<Key>b: backward-character()\\n\
- !<Key>osfLeft: backward-character()\\n\
- !Ctrl<Key>f: forward-character()\\n\
- !<Key>osfRight: forward-character()\\n\
- !Meta<Key>b: backward-word()\\n\
- !Meta<Key>osfLeft: backward-word()\\n\
- !Meta<Key>f: forward-word()\\n\
- !Meta<Key>osfRight: forward-word()\\n\
- !Ctrl<Key>e: end-of-line()\\n\
- !Ctrl<Key>a: beginning-of-line()\\n\
- !Ctrl<Key>w: cut-clipboard()\\n\
- !Meta<Key>w: copy-clipboard()\\n\
- <Btn2Up>: copy-primary()\\n",
-(String) "*dialog*XmPushButton*translations:#override\\n\
- <Btn1Down>: Arm()\\n\
- <Btn1Down>,<Btn1Up>: Activate()\
- Disarm()\\n\
- <Btn1Down>(2+): MultiArm()\\n\
- <Btn1Up>(2+): MultiActivate()\\n\
- <Btn1Up>: Activate()\
- Disarm()\\n\
- <Key>osfSelect: ArmAndActivate()\\n\
- <Key>osfActivate: ArmAndActivate()\\n\
- <Key>osfHelp: Help()\\n\
- ~Shift ~Meta ~Alt <Key>Return: ArmAndActivate()\\n\
- <EnterWindow>: Enter()\\n\
- <LeaveWindow>: Leave()\\n",
-(String) "*ximStyles: XIMPreeditPosition|XIMStatusArea\
- XIMPreeditPosition|XIMStatusNothing\
- XIMPreeditPosition|XIMStatusNone\
- XIMPreeditNothing|XIMStatusArea\
- XIMPreeditNothing|XIMStatusNothing\
- XIMPreeditNothing|XIMStatusNone\
- XIMPreeditNone|XIMStatusArea\
- XIMPreeditNone|XIMStatusNothing\
- XIMPreeditNone|XIMStatusNone",
-(String) "*EmacsFrame.ximForeground: black",
-(String) "*EmacsFrame.ximBackground: white",
+(String) "Emacs.modeline*attributeForeground: Black",
+(String) "Emacs.modeline*attributeBackground: Gray75",
+(String) "Emacs.text-cursor*attributeBackground: Red3",
+(String) "*menubar*Foreground: Gray30",
+(String) "*menubar*Background: Gray75",
+(String) "*menubar*buttonForeground: Blue",
+(String) "*XlwMenu*selectColor: ForestGreen",
+(String) "*XmToggleButton*selectColor: ForestGreen",
+(String) "*popup*Foreground: Black",
+(String) "*popup*Background: Gray75",
+(String) "*dialog*Foreground: Black",
+(String) "*dialog*Background: #A5C0C1",
+(String) "*dialog*XmTextField*Background: WhiteSmoke",
+(String) "*dialog*XmText*Background: WhiteSmoke",
+(String) "*dialog*XmList*Background: WhiteSmoke",
+(String) "*dialog*Command*Background: WhiteSmoke",
+(String) "*XlwScrollBar*Foreground: Gray30",
+(String) "*XlwScrollBar*Background: Gray75",
+(String) "*XmScrollBar*Foreground: Gray30",
+(String) "*XmScrollBar*Background: Gray75",
+(String) "*topToolBarShadowColor: Gray90",
+(String) "*bottomToolBarShadowColor: Gray40",
+(String) "*backgroundToolBarColor: Gray75",
+(String) "*toolBarShadowThickness: 2",
+(String) "*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String) "*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String)
"*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String)
"*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String) "*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String) "*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String) "*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*",
+(String) "*dialog*button1.accelerators:#override\
+<KeyPress>Return: ArmAndActivate()\\n\
+<KeyPress>KP_Enter: ArmAndActivate()\\n\
+Ctrl<KeyPress>m: ArmAndActivate()\\n",
+(String) "*XmTextField*translations: #override\\n\
+ !<Key>osfBackSpace: delete-previous-character()\\n\
+ !<Key>osfDelete: delete-previous-character()\\n\
+ !Ctrl<Key>h: delete-previous-character()\\n\
+ !Ctrl<Key>d: delete-next-character()\\n\
+ !Meta<Key>osfDelete: delete-previous-word()\\n\
+ !Meta<Key>osfBackSpace: delete-previous-word()\\n\
+ !Meta<Key>d: delete-next-word()\\n\
+ !Ctrl<Key>k: delete-to-end-of-line()\\n\
+ !Ctrl<Key>g: process-cancel()\\n\
+ !Ctrl<Key>b: backward-character()\\n\
+ !<Key>osfLeft: backward-character()\\n\
+ !Ctrl<Key>f: forward-character()\\n\
+ !<Key>osfRight: forward-character()\\n\
+ !Meta<Key>b: backward-word()\\n\
+ !Meta<Key>osfLeft: backward-word()\\n\
+ !Meta<Key>f: forward-word()\\n\
+ !Meta<Key>osfRight: forward-word()\\n\
+ !Ctrl<Key>e: end-of-line()\\n\
+ !Ctrl<Key>a: beginning-of-line()\\n\
+ !Ctrl<Key>w: cut-clipboard()\\n\
+ !Meta<Key>w: copy-clipboard()\\n\
+ <Btn2Up>: copy-primary()\\n",
+(String) "*dialog*XmPushButton*translations:#override\\n\
+ <Btn1Down>: Arm()\\n\
+ <Btn1Down>,<Btn1Up>: Activate()\
+ Disarm()\\n\
+ <Btn1Down>(2+): MultiArm()\\n\
+ <Btn1Up>(2+): MultiActivate()\\n\
+ <Btn1Up>: Activate()\
+ Disarm()\\n\
+ <Key>osfSelect: ArmAndActivate()\\n\
+ <Key>osfActivate: ArmAndActivate()\\n\
+ <Key>osfHelp: Help()\\n\
+ ~Shift ~Meta ~Alt <Key>Return: ArmAndActivate()\\n\
+ <EnterWindow>: Enter()\\n\
+ <LeaveWindow>: Leave()\\n",
+(String) "*ximStyles: XIMPreeditPosition|XIMStatusArea\
+ XIMPreeditPosition|XIMStatusNothing\
+ XIMPreeditPosition|XIMStatusNone\
+ XIMPreeditNothing|XIMStatusArea\
+ XIMPreeditNothing|XIMStatusNothing\
+ XIMPreeditNothing|XIMStatusNone\
+ XIMPreeditNone|XIMStatusArea\
+ XIMPreeditNone|XIMStatusNothing\
+ XIMPreeditNone|XIMStatusNone",
+(String) "*EmacsFrame.ximForeground: black",
+(String) "*EmacsFrame.ximBackground: white",
Index: nt/config.inc.samp
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/config.inc.samp,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 config.inc.samp
--- nt/config.inc.samp 2002/08/20 11:36:14 1.2.2.2
+++ nt/config.inc.samp 2005/01/30 00:26:14
＠＠ -18,47 +18,65 ＠＠ HAVE_MS_WINDOWS=1
HAVE_X_WINDOWS=0
X11_DIR=
-# GTK support. Do NOT set this to 1; as of xemacs-21.2-b44
-# gtk-xemacs is not supported on MSWindows (mingw or msvc).
-# Yes, we know that gtk has been ported to native MSWindows
-# but XEmacs is not yet ready to use that port.
+# GTK support. Do NOT set this to 1; gtk-xemacs is not supported on
+# MSWindows (mingw or msvc). Yes, we know that gtk has been ported to
+# native MSWindows but XEmacs is not yet ready to use that port.
HAVE_GTK=0
GTK_DIR=
############################################################################
+# Compiled-in features: graphics formats #
+############################################################################
+
+# Directory under which the optional libraries are placed. To make your
+# life easy, just grab http://ftp.xemacs.org/aux/optional-libs.exe
+# (a self-installing .ZIP) and unzip them into an appropriate directory
+# (by default, c:\src). This gets you precompiled versions of all of
+# the libraries below.
+OPTIONAL_LIBRARY_DIR=c:\src
# Set this to enable XPM support (virtually mandatory), and specify
-# the directory containing xpm.
+# the directory containing xpm. Get the library from
+# http://ftp.xemacs.org/aux/xpm-3.4k.tar.gz.
HAVE_XPM=1
-XPM_DIR=c:\src\xpm-3.4k
+XPM_DIR=$(OPTIONAL_LIBRARY_DIR)\xpm-3.4k
-# Set this to enable GIF support.
+# Set this to enable GIF support (built-in).
HAVE_GIF=1
# Set this to enable PNG support (virtually mandatory), and specify
-# the directories containing png and zlib.
+# the directories containing png and zlib. Get the latest version from
+# ftp://ftp.uu.net/graphics/png/. NOTE: In order to compile libpng,
+# you will have to rename the zlib directory to just `zlib'. We don't
+# do that here so we can preserve the version number, like for the other
+# libraries.
HAVE_PNG=1
-PNG_DIR=c:\src\libpng-1.0.9
-ZLIB_DIR=c:\src\zlib
-
-# Set this to enable TIFF support, and specify the directory containing tiff.
-HAVE_TIFF=0
-TIFF_DIR=
+PNG_DIR=$(OPTIONAL_LIBRARY_DIR)\libpng-1.2.8
+ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib-1.2.1
-# Set this to enable JPEG support, and specify the directory containing jpeg.
+# Set this to enable JPEG support (useful, but not necessary), and specify
+# the directory containing jpeg. Get the latest version from
+# ftp://ftp.uu.net/graphics/jpeg/.
HAVE_JPEG=1
-JPEG_DIR=c:\src\jpeg-6b
+JPEG_DIR=$(OPTIONAL_LIBRARY_DIR)\jpeg-6b
-# Set this to enable XFace support, and specify the directory containing
-# compface.
-HAVE_XFACE=0
-COMPFACE_DIR=
+# Set this to enable TIFF support (not very important), and specify the
+# directory containing tiff. Get the latest version from
+# ftp://ftp.uu.net/graphics/tiff/.
+HAVE_TIFF=1
+TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-v3.5.7
+
+# Set this to enable XFace support (not very important), and specify the
+# directory containing compface. Get the library from
+# http://ftp.xemacs.org/aux/compface-1.5-1.tar.gz.
+HAVE_XFACE=1
+COMPFACE_DIR=$(OPTIONAL_LIBRARY_DIR)\compface-1.5.1
############################################################################
# Set this to specify the location of makeinfo. (If not set, XEmacs will
# attempt to use its built-in texinfo support when building info files.)
-MAKEINFO=c:\src\texinfo-4.0\makeinfo\makeinfo.exe
+MAKEINFO=c:\cygwin\bin\makeinfo.exe
############################################################################
Index: nt/xemacs.mak
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v
retrieving revision 1.58.2.11
diff -u -p -r1.58.2.11 xemacs.mak
--- nt/xemacs.mak 2003/12/13 21:43:11 1.58.2.11
+++ nt/xemacs.mak 2005/01/30 00:26:14
＠＠ -1,6 +1,6 ＠＠
# Makefile for Microsoft NMAKE
# Copyright (C) 1995 Board of Trustees, University of Illinois.
-# Copyright (C) 1995, 1996, 2000 Ben Wing.
+# Copyright (C) 1995, 1996, 2000, 2005 Ben Wing.
# Copyright (C) 1995 Sun Microsystems, Inc.
# Copyright (C) 1998 Free Software Foundation, Inc.
#
＠＠ -177,12 +177,17 ＠＠ USE_UNION_TYPE=0
USE_MINITAR=$(HAVE_ZLIB)
!endif
!if !defined(USE_PORTABLE_DUMPER)
-USE_PORTABLE_DUMPER=0
+USE_PORTABLE_DUMPER=1
!endif
# A little bit of adhockery. Default to use system malloc and
# DLL version of the C runtime library when using portable
# dumping. These are the optimal settings.
+#
+# NOTE: The various graphics libraries are generally compiled to use
+# MSVCRT.DLL (the same that we use in USE_CRTDLL, more or less), so using
+# this is a good thing.
+
!if !defined(USE_SYSTEM_MALLOC)
USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER)
!endif
＠＠ -480,7 +485,7 ＠＠ PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREF
# Generic variables
-INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(NT)\inc -I$(SRC) -I$(LWLIB_SRCDIR)
+INCLUDES=$(X_INCLUDES) -I$(NT)\inc -I$(SRC) $(MSW_INCLUDES) -I$(LWLIB_SRCDIR)
DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) $(UNION_DEFINES) \
$(DUMPER_DEFINES) $(MALLOC_DEFINES) $(QUICK_DEFINES) \
＠＠ -560,7 +565,7 ＠＠ $(LIB_SRC)/winclient.exe: $(LIB_SRC)/win
cd $(NT)
$(LIB_SRC)/minitar.exe : $(NT)/minitar.c
- $(CCV) $(CFLAGS_NO_LIB) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) -Fe$＠ $**
$(ZLIB_DIR)\zlib.lib -link -incremental:no
+ $(CCV) $(CFLAGS_NO_LIB) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) -MD -Fe$＠ $**
$(ZLIB_DIR)\zlib.lib -link -incremental:no
LIB_SRC_TOOLS = \
$(LIB_SRC)/etags.exe \
＠＠ -1175,7 +1180,7 ＠＠ INFO_FILES= \
{$(MANDIR)}.texi{$(INFODIR)}.info:
cd $(MANDIR)
- $(MAKEINFO) $**
+ $(MAKEINFO) $(**F)
XEMACS_SRCS = \
$(MANDIR)\xemacs\abbrevs.texi \
cvs server: Diffing nt/installer
cvs server: Diffing nt/installer/Wise
cvs server: Diffing src
Index: src/EmacsFrame.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrame.c,v
retrieving revision 1.17.2.3
diff -u -p -r1.17.2.3 EmacsFrame.c
--- src/EmacsFrame.c 2003/07/31 04:40:38 1.17.2.3
+++ src/EmacsFrame.c 2005/01/30 00:26:18
＠＠ -642,7 +642,7 ＠＠ EmacsFrameRecomputeCellSize (Widget w)
struct frame *f = ew->emacs_frame.frame;
if (! XtIsSubclass (w, emacsFrameClass))
- abort ();
+ ABORT ();
default_face_height_and_width (make_frame (f), &ch, &cw);
if (FRAME_X_TOP_LEVEL_FRAME_P (f))
Index: src/EmacsShell-sub.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsShell-sub.c,v
retrieving revision 1.5.2.1
diff -u -p -r1.5.2.1 EmacsShell-sub.c
--- src/EmacsShell-sub.c 2003/02/15 18:57:28 1.5.2.1
+++ src/EmacsShell-sub.c 2005/01/30 00:26:19
＠＠ -90,6 +90,8 ＠＠ Boston, MA 02111-1307, USA. */
#include <X11/VendorP.h>
#include "EmacsShellP.h"
+#define ABORT abort
+
#if defined (DEFINE_TOP_LEVEL_EMACS_SHELL)
#define EMACS_SHELL_WIDGET TopLevelEmacsShellWidget
#define SUPERCLASS_WIDGET_CLASS topLevelShellWidgetClass
＠＠ -286,7 +288,7 ＠＠ SuperClassRootGeometryManager (Widget gw
}
if (!gcer)
- abort ();
+ ABORT ();
/* call it to actually make the geometry request */
scer = (ShellClassExtensionRec *) gcer;
＠＠ -304,7 +306,7 ＠＠ RootGeometryManager (Widget gw,
XtGeometryResult result;
if (reentrant)
- abort ();
+ ABORT ();
reentrant++;
#ifdef DEBUG_GEOMETRY_MANAGEMENT
Index: src/EmacsShell.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsShell.c,v
retrieving revision 1.2
diff -u -p -r1.2 EmacsShell.c
--- src/EmacsShell.c 2001/04/12 18:23:22 1.2
+++ src/EmacsShell.c 2005/01/30 00:26:19
＠＠ -34,6 +34,8 ＠＠ Boston, MA 02111-1307, USA. */
#include "EmacsShell.h"
#include "ExternalShell.h"
+#define ABORT abort
+
#if 0 /* Not currently used */
/* The root_geometry_manager() method in Shell.c is fucked up with regard
＠＠ -156,10 +158,10 ＠＠ EmacsShellUpdateSizeHints (Widget gw)
TopLevelEmacsShellUpdateSizeHints (gw);
#ifdef EXTERNAL_WIDGET
else if (XtIsSubclass (gw, externalShellWidgetClass))
- /* do what ??? Don't abort! */;
+ /* do what ??? Don't ABORT! */;
#endif
else if (XtIsSubclass (gw, transientEmacsShellWidgetClass))
TransientEmacsShellUpdateSizeHints (gw);
else
- abort ();
+ ABORT ();
}
Index: src/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v
retrieving revision 1.84.2.5
diff -u -p -r1.84.2.5 Makefile.in.in
--- src/Makefile.in.in 2005/01/11 02:02:36 1.84.2.5
+++ src/Makefile.in.in 2005/01/30 00:26:19
＠＠ -151,13 +151,14 ＠＠ profile_objs=profile.o
cppflags = $(CPPFLAGS) -Demacs -I. $(c_switch_all)
cflags = $(CFLAGS) $(cppflags)
-#if defined (WIN32_NATIVE) || defined (CYGWIN)
+#if defined (WIN32_NATIVE)
ldflags = $(LDFLAGS) -mwindows -e _mainCRTStartup $(ld_switch_all)
$(ld_dynamic_link_flags)
-# if defined (CYGWIN)
-ldflags += -Wl,--script=s/cygwin.sc
-# endif
#else
ldflags = $(LDFLAGS) $(ld_switch_all) $(ld_dynamic_link_flags)
+#endif
+
+#if defined (CYGWIN) && !defined (PDUMP)
+ldflags += -Wl,--script=s/cygwin.sc
#endif
#ifdef SOLARIS2
Index: src/alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.50.2.4
diff -u -p -r1.50.2.4 alloc.c
--- src/alloc.c 2003/01/03 09:59:42 1.50.2.4
+++ src/alloc.c 2005/01/30 00:26:20
＠＠ -412,7 +412,7 ＠＠ free_lcrecord (struct lcrecord_header *l
break;
}
else if (next == 0)
- abort ();
+ ABORT ();
else
header = next;
}
Index: src/alloca.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloca.c,v
retrieving revision 1.5
diff -u -p -r1.5 alloca.c
--- src/alloca.c 2001/04/12 18:23:25 1.5
+++ src/alloca.c 2005/01/30 00:26:20
＠＠ -387,7 +387,7 ＠＠ i00afunc (long *address)
a fatal error if "trailer" is null. */
if (trailer == 0)
- abort ();
+ ABORT ();
/* Discard segments that do not contain our argument address. */
＠＠ -396,7 +396,7 ＠＠ i00afunc (long *address)
block = (long *) trailer->this_address;
size = trailer->this_size;
if (block == 0 || size == 0)
- abort ();
+ ABORT ();
trailer = (struct stk_trailer *) trailer->link;
if ((block <= address) && (address < (block + size)))
break;
＠＠ -415,7 +415,7 ＠＠ i00afunc (long *address)
do
{
if (trailer->this_size <= 0)
- abort ();
+ ABORT ();
result += trailer->this_size;
trailer = (struct stk_trailer *) trailer->link;
}
Index: src/buffer.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/buffer.c,v
retrieving revision 1.41.2.7
diff -u -p -r1.41.2.7 buffer.c
--- src/buffer.c 2004/09/23 03:03:41 1.41.2.7
+++ src/buffer.c 2005/01/30 00:26:21
＠＠ -522,7 +522,7 ＠＠ delete_from_buffer_alist (Lisp_Object bu
Lisp_Object cons = Frassq (buf, Vbuffer_alist);
Lisp_Object frmcons, devcons, concons;
if (NILP (cons))
- return; /* abort() ? */
+ return; /* ABORT() ? */
Vbuffer_alist = delq_no_quit (cons, Vbuffer_alist);
FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
＠＠ -3051,7 +3051,7 ＠＠ handled:
if ((XINT (buffer_local_flags.slot) != -2 && \
XINT (buffer_local_flags.slot) != -3) \
!= !(NILP (XBUFFER (Vbuffer_local_symbols)->slot))) \
- abort ()
+ ABORT ()
#include "bufslots.h"
#undef MARKED_SLOT
Index: src/bytecode.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/bytecode.c,v
retrieving revision 1.14.2.1
diff -u -p -r1.14.2.1 bytecode.c
--- src/bytecode.c 2002/08/20 11:36:39 1.14.2.1
+++ src/bytecode.c 2005/01/30 00:26:21
＠＠ -1476,7 +1476,7 ＠＠ execute_rare_opcode (Lisp_Object *stack_
}
default:
- abort();
+ ABORT();
break;
}
return stack_ptr;
＠＠ -1859,7 +1859,7 ＠＠ optimize_byte_code (/* in */
break;
default:
- abort();
+ ABORT();
break;
}
}
＠＠ -1893,7 +1893,8 ＠＠ optimize_compiled_function (Lisp_Object
program = alloca_array (Opbyte, 1 + 2 * XSTRING_LENGTH (f->instructions));
optimize_byte_code (f->instructions, f->constants,
program, &program_length, &varbind_count);
- f->specpdl_depth = XINT (Flength (f->arglist)) + varbind_count;
+ f->specpdl_depth = (unsigned short) (XINT (Flength (f->arglist)) +
+ varbind_count);
f->instructions =
make_opaque (program, program_length * sizeof (Opbyte));
}
＠＠ -2357,7 +2358,7 ＠＠ If the byte code for compiled function F
f->constants = XCDR (tem);
return function;
}
- abort ();
+ ABORT ();
return Qnil; /* not reached */
}
Index: src/chartab.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/chartab.c,v
retrieving revision 1.14
diff -u -p -r1.14 chartab.c
--- src/chartab.c 2001/04/12 18:23:27 1.14
+++ src/chartab.c 2005/01/30 00:26:22
＠＠ -187,7 +187,7 ＠＠ char_table_type_to_symbol (enum char_tab
{
switch (type)
{
- default: abort();
+ default: ABORT();
case CHAR_TABLE_TYPE_GENERIC: return Qgeneric;
case CHAR_TABLE_TYPE_SYNTAX: return Qsyntax;
case CHAR_TABLE_TYPE_DISPLAY: return Qdisplay;
＠＠ -586,7 +586,7 ＠＠ Reset CHAR-TABLE to its default state.
break;
default:
- abort ();
+ ABORT ();
}
return Qnil;
＠＠ -755,7 +755,7 ＠＠ decode_char_table_range (Lisp_Object ran
check_int_range (outrange->row, 32, 127);
break;
default:
- abort ();
+ ABORT ();
}
}
else
＠＠ -940,7 +940,7 ＠＠ If there is more than one value, return
#endif /* not MULE */
default:
- abort ();
+ ABORT ();
}
return Qnil; /* not reached */
＠＠ -990,7 +990,7 ＠＠ check_valid_char_table_value (Lisp_Objec
break;
default:
- abort ();
+ ABORT ();
}
return 0; /* not reached */
＠＠ -1389,7 +1389,7 ＠＠ map_char_table (Lisp_Char_Table *ct,
}
default:
- abort ();
+ ABORT ();
}
return 0;
＠＠ -1429,7 +1429,7 ＠＠ slow_map_char_table_fun (struct chartab_
ranjarg = make_char (range->ch);
break;
default:
- abort ();
+ ABORT ();
}
closure->retval = call2 (closure->function, ranjarg, val);
＠＠ -1552,7 +1552,7 ＠＠ chartab_instantiate (Lisp_Object data)
Fput_char_table (make_char (i), val, chartab);
}
else
- abort ();
+ ABORT ();
}
else
Fput_char_table (range, val, chartab);
Index: src/cm.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/cm.c,v
retrieving revision 1.5
diff -u -p -r1.5 cm.c
--- src/cm.c 2001/04/12 18:23:28 1.5
+++ src/cm.c 2005/01/30 00:26:22
＠＠ -99,7 +99,7 ＠＠ cmcheckmagic (void)
if (curX == FrameCols)
{
if (!MagicWrap || curY >= FrameRows - 1)
- abort ();
+ ABORT ();
if (termscript)
putc ('\r', termscript);
putchar ('\r');
Index: src/console-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-msw.c,v
retrieving revision 1.5
diff -u -p -r1.5 console-msw.c
--- src/console-msw.c 2001/04/12 18:23:29 1.5
+++ src/console-msw.c 2005/01/30 00:26:22
＠＠ -272,7 +272,7 ＠＠ This function can be used as the STREAM
/*
* Random helper functions for debugging.
* Intended for use in the MSVC "Watch" window which doesn't like
- * the aborts that the error_check_foo() functions can make.
+ * the ABORTs that the error_check_foo() functions can make.
*/
struct lrecord_header *DHEADER (Lisp_Object obj);
struct lrecord_header *
Index: src/console.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console.c,v
retrieving revision 1.19.2.1
diff -u -p -r1.19.2.1 console.c
--- src/console.c 2005/01/23 16:23:04 1.19.2.1
+++ src/console.c 2005/01/30 00:26:22
＠＠ -1465,7 +1465,7 ＠＠ buffer's local map, and the minor mode k
if ((XINT (console_local_flags.slot) != -2 && \
XINT (console_local_flags.slot) != -3) \
!= !(NILP (XCONSOLE (Vconsole_local_symbols)->slot))) \
- abort ()
+ ABORT ()
#include "conslots.h"
#undef MARKED_SLOT
}
Index: src/data.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/data.c,v
retrieving revision 1.27.2.2
diff -u -p -r1.27.2.2 data.c
--- src/data.c 2004/04/20 02:56:33 1.27.2.2
+++ src/data.c 2005/01/30 00:26:23
＠＠ -1769,7 +1769,7 ＠＠ finish_marking_weak_lists (void)
break;
default:
- abort ();
+ ABORT ();
}
if (need_to_mark_elem && ! marked_p (elem))
＠＠ -1925,7 +1925,7 ＠＠ encode_weak_list_type (enum weak_list_ty
case WEAK_LIST_VALUE_ASSOC: return Qvalue_assoc;
case WEAK_LIST_FULL_ASSOC: return Qfull_assoc;
default:
- abort ();
+ ABORT ();
}
return Qnil; /* not reached */
Index: src/debug.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/debug.h,v
retrieving revision 1.3
diff -u -p -r1.3 debug.h
--- src/debug.h 2001/04/12 18:23:32 1.3
+++ src/debug.h 2005/01/30 00:26:23
＠＠ -66,7 +66,7 ＠＠ extern struct debug_classes active_debug
stderr_out ("Assertion failed in %s at line %d\n", \
__FILE__, __LINE__); \
else \
- abort (); \
+ ABORT (); \
} \
} \
} while (0)
Index: src/device-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-gtk.c,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 device-gtk.c
--- src/device-gtk.c 2002/04/30 16:06:28 1.2.2.2
+++ src/device-gtk.c 2005/01/30 00:26:23
＠＠ -198,7 +198,7 ＠＠ gtk_init_device (struct device *d, Lisp_
XSETDEVICE (device, d);
/* gtk_init() and even gtk_check_init() are so brain dead that
- getting an empty argv array causes them to abort. */
+ getting an empty argv array causes them to ABORT. */
if (NILP (Vgtk_initial_argv_list))
{
signal_simple_error ("gtk-initial-argv-list must be set before creating Gtk
devices", Vgtk_initial_argv_list);
Index: src/device-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-msw.c,v
retrieving revision 1.24.2.4
diff -u -p -r1.24.2.4 device-msw.c
--- src/device-msw.c 2002/08/20 11:36:45 1.24.2.4
+++ src/device-msw.c 2005/01/30 00:26:23
＠＠ -804,7 +804,7 ＠＠ mswindows_get_default_margin (Lisp_Objec
if (EQ (prop, Qright_margin)) return 1440;
if (EQ (prop, Qtop_margin)) return 720;
if (EQ (prop, Qbottom_margin)) return 720;
- abort ();
+ ABORT ();
return 0;
}
Index: src/device-tty.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-tty.c,v
retrieving revision 1.10
diff -u -p -r1.10 device-tty.c
--- src/device-tty.c 2001/04/12 18:23:33 1.10
+++ src/device-tty.c 2005/01/30 00:26:24
＠＠ -86,7 +86,7 ＠＠ tty_init_device (struct device *d, Lisp_
case TTY_INIT_SUCCESS:
break;
default:
- abort ();
+ ABORT ();
}
init_one_device (d);
Index: src/device-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-x.c,v
retrieving revision 1.36.2.2
diff -u -p -r1.36.2.2 device-x.c
--- src/device-x.c 2004/01/31 03:35:54 1.36.2.2
+++ src/device-x.c 2005/01/30 00:26:24
＠＠ -141,7 +141,7 ＠＠ get_device_from_display (Display *dpy)
(STRINGP (Vinvocation_name) ?
(char *) XSTRING_DATA (Vinvocation_name) : FALLBACK_RESOURCE_NAME),
DisplayString (dpy) ? DisplayString (dpy) : "???");
- abort();
+ ABORT();
}
#undef FALLBACK_RESOURCE_NAME
＠＠ -420,7 +420,7 ＠＠ x_get_visual_depth (Display *dpy, Visual
vi_in.visualid = XVisualIDFromVisual (visual);
vi_out = XGetVisualInfo (dpy, /*VisualScreenMask|*/VisualIDMask,
&vi_in, &out_count);
- if (! vi_out) abort ();
+ if (! vi_out) ABORT ();
d = vi_out [0].depth;
XFree ((char *) vi_out);
return d;
Index: src/doprnt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/doprnt.c,v
retrieving revision 1.12.2.1
diff -u -p -r1.12.2.1 doprnt.c
--- src/doprnt.c 2002/08/20 11:36:49 1.12.2.1
+++ src/doprnt.c 2005/01/30 00:26:24
＠＠ -222,7 +222,7 ＠＠ parse_doprnt_spec (const Bufbyte *format
case ' ': spec.space_flag = 1; break;
case '#': spec.number_flag = 1; break;
case '0': spec.zero_flag = 1; break;
- default: abort ();
+ default: ABORT ();
}
NEXT_ASCII_BYTE (ch);
}
＠＠ -383,7 +383,7 ＠＠ get_doprnt_args (printf_spec_dynarr *spe
arg.d = va_arg (vargs, double);
else if (strchr (string_converters, ch))
arg.bp = va_arg (vargs, Bufbyte *);
- else abort ();
+ else ABORT ();
Dynarr_add (args, arg);
}
Index: src/dumper.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dumper.c,v
retrieving revision 1.2.2.4
diff -u -p -r1.2.2.4 dumper.c
--- src/dumper.c 2003/03/20 03:53:37 1.2.2.4
+++ src/dumper.c 2005/01/30 00:26:25
＠＠ -440,7 +440,7 ＠＠ pdump_get_indirect_count (EMACS_INT code
stderr_out ("Unsupported count type : %d (line = %d, code=%ld)\n",
idesc[line].type, line, (long)code);
pdump_backtrace ();
- abort ();
+ ABORT ();
}
count += delta;
return count;
＠＠ -540,7 +540,7 ＠＠ pdump_register_sub (const void *data, co
default:
stderr_out ("Unsupported dump type : %d\n", desc[pos].type);
pdump_backtrace ();
- abort ();
+ ABORT ();
};
}
}
＠＠ -569,7 +569,7 ＠＠ pdump_register_object (Lisp_Object obj)
if (me>65536)
{
stderr_out ("Backtrace overflow, loop ?\n");
- abort ();
+ ABORT ();
}
backtrace[me].obj = objh;
backtrace[me].position = 0;
＠＠ -604,7 +604,7 ＠＠ pdump_register_struct (const void *data,
if (me>65536)
{
stderr_out ("Backtrace overflow, loop ?\n");
- abort ();
+ ABORT ();
}
backtrace[me].obj = 0;
backtrace[me].position = 0;
＠＠ -717,7 +717,7 ＠＠ pdump_dump_data (pdump_entry_list_elt *e
}
default:
stderr_out ("Unsupported dump type : %d\n", desc[pos].type);
- abort ();
+ ABORT ();
}
}
}
＠＠ -795,7 +795,7 ＠＠ pdump_reloc_one (void *data, EMACS_INT d
}
default:
stderr_out ("Unsupported dump type : %d\n", desc[pos].type);
- abort ();
+ ABORT ();
};
}
}
Index: src/elhash.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/elhash.c,v
retrieving revision 1.15.2.1
diff -u -p -r1.15.2.1 elhash.c
--- src/elhash.c 2003/10/23 02:03:57 1.15.2.1
+++ src/elhash.c 2005/01/30 00:26:25
＠＠ -336,7 +336,7 ＠＠ print_hash_table (Lisp_Object obj, Lisp_
else if (ht->test_function == lisp_object_eql_equal)
DO_NOTHING;
else
- abort ();
+ ABORT ();
if (ht->count || !print_readably)
{
＠＠ -461,7 +461,7 ＠＠ make_standard_lisp_hash_table (enum hash
break;
default:
- abort ();
+ ABORT ();
}
return make_general_lisp_hash_table (hash_function, test_function,
＠＠ -730,7 +730,7 ＠＠ hash_table_instantiate (Lisp_Object plis
else if (EQ (key, Qdata)) data = value;
else if (EQ (key, Qtype))/*obsolete*/ weakness = value;
else
- abort ();
+ ABORT ();
}
/* Create the hash table. */
Index: src/emacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v
retrieving revision 1.97.2.8
diff -u -p -r1.97.2.8 emacs.c
--- src/emacs.c 2004/06/13 20:19:39 1.97.2.8
+++ src/emacs.c 2005/01/30 00:26:26
＠＠ -560,7 +560,7 ＠＠ DEFUN ("force-debugging-signal", Fforce_
Cause XEmacs to enter the debugger.
On some systems, there may be no way to do this gracefully; if so,
nothing happens unless ABORT is non-nil, in which case XEmacs will
-abort() -- a sure-fire way to immediately get back to the debugger,
+ABORT() -- a sure-fire way to immediately get back to the debugger,
but also a sure-fire way to kill XEmacs (and dump core on Unix
systems)!
*/
＠＠ -568,7 +568,7 ＠＠ systems)!
{
debugging_breakpoint ();
if (!NILP (abort_))
- abort ();
+ ABORT ();
return Qnil;
}
＠＠ -2656,7 +2656,7 ＠＠ sort_args (int argc, char **argv)
}
if (best < 0)
- abort ();
+ ABORT ();
/* Copy the highest priority remaining option, with its args, to NEW_ARGV. */
new_argv[to++] = argv[best];
＠＠ -2821,7 +2821,7 ＠＠ main (int argc, char **argv, char **envp
{
#ifdef DOUG_LEA_MALLOC
if (mallopt (M_MMAP_MAX, 0) != 1)
- abort();
+ ABORT();
#endif
run_temacs_argc = 0;
if (! SETJMP (run_temacs_catch))
＠＠ -2868,7 +2868,7 ＠＠ main (int argc, char **argv, char **envp
if (rc != 0)
{
stderr_out ("malloc_set_state failed, rc = %d\n", rc);
- abort ();
+ ABORT ();
}
#if 0
free (malloc_state_ptr);
＠＠ -2879,7 +2879,7 ＠＠ main (int argc, char **argv, char **envp
(defined(__GLIBC__) && __GLIBC_MINOR__ < 1 && !defined(MULE)) ||
\
defined(DEBUG_DOUG_LEA_MALLOC)
if(mallopt (M_MMAP_MAX, 0) != 1)
- abort();
+ ABORT();
#endif
#ifdef REL_ALLOC
r_alloc_reinit ();
＠＠ -3368,8 +3368,6 ＠＠ static const char *assert_failed_expr;
#undef fprintf
#endif
-#undef abort /* avoid infinite #define loop... */
-
#if defined (WIN32_NATIVE) && defined (DEBUG_XEMACS)
#define enter_debugger() DebugBreak ()
#else
＠＠ -3426,7 +3424,7 ＠＠ assert_failed (const char *file, int lin
enter_debugger ();
#if !defined (ASSERTIONS_DONT_ABORT)
- abort ();
+ abort (); /* The real abort(), this time */
#endif
inhibit_non_essential_printing_operations = 0;
in_assert_failed = 0;
Index: src/eval.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/eval.c,v
retrieving revision 1.37.2.2
diff -u -p -r1.37.2.2 eval.c
--- src/eval.c 2002/08/20 11:36:57 1.37.2.2
+++ src/eval.c 2005/01/30 00:26:27
＠＠ -1408,7 +1408,7 ＠＠ throw_or_bomb_out (Lisp_Object tag, Lisp
#ifdef DEFEND_AGAINST_THROW_RECURSION
/* die if we recurse more than is reasonable */
if (++throw_level > 20)
- abort();
+ ABORT();
#endif
/* If bomb_out_p is t, this is being called from Fsignal as a
＠＠ -1877,13 +1877,13 ＠＠ signal_1 (Lisp_Object sig, Lisp_Object d
/* let's not use stderr_out() here, because that does a bunch of
things that might not be safe yet. */
fprintf (stderr, "Error before initialization is complete!\n");
- abort ();
+ ABORT ();
}
if (gc_in_progress || in_display)
/* This is one of many reasons why you can't run lisp code from redisplay.
There is no sensible way to handle errors there. */
- abort ();
+ ABORT ();
conditions = Fget (sig, Qerror_conditions, Qnil);
＠＠ -2048,7 +2048,7 ＠＠ user invokes the "return from signal" op
warn_when_safe_lispobj (Vcurrent_warning_class, Qwarning,
Fcons (error_symbol, data));
Fthrow (Qunbound_suspended_errors_tag, Qnil);
- abort (); /* Better not get here! */
+ ABORT (); /* Better not get here! */
}
RETURN_UNGCPRO (signal_1 (error_symbol, data));
}
Index: src/event-Xt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-Xt.c,v
retrieving revision 1.47.2.3
diff -u -p -r1.47.2.3 event-Xt.c
--- src/event-Xt.c 2002/12/12 06:21:32 1.47.2.3
+++ src/event-Xt.c 2005/01/30 00:26:28
＠＠ -868,7 +868,7 ＠＠ emacs_Xt_mapping_action (Widget w, XEven
case MappingKeyboard: x_reset_key_mapping (d); break;
case MappingModifier: x_reset_modifier_mapping (d); break;
case MappingPointer: /* Do something here? */ break;
- default: abort();
+ default: ABORT();
}
}
＠＠ -2380,7 +2380,7 ＠＠ Xt_process_to_emacs_event (Lisp_Event *e
return;
}
}
- abort ();
+ ABORT ();
}
static void
＠＠ -3173,7 +3173,7 ＠＠ XtConvertArgRec Const colorConvertArgs[]
/* JH: We use this because I think there's a possibility this
is called before the device is properly set up, in which case
- I don't want to abort. */
+ I don't want to ABORT. */
extern struct device *get_device_from_display_1 (Display *dpy);
static
Index: src/event-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-msw.c,v
retrieving revision 1.47.2.9
diff -u -p -r1.47.2.9 event-msw.c
--- src/event-msw.c 2003/10/24 03:49:57 1.47.2.9
+++ src/event-msw.c 2005/01/30 00:26:30
＠＠ -1074,7 +1074,7 ＠＠ mswindows_dequeue_dispatch_event (void)
* Timeout event matches if interval_id is equal to that of the given event.
* Keypress event matches if logical AND between modifiers bitmask of the
* event in the queue and that of the given event is non-zero.
- * For all other event types, this function aborts.
+ * For all other event types, this function ABORTs.
*/
Lisp_Object
Index: src/event-stream.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-stream.c,v
retrieving revision 1.49.2.7
diff -u -p -r1.49.2.7 event-stream.c
--- src/event-stream.c 2004/04/20 02:56:33 1.49.2.7
+++ src/event-stream.c 2005/01/30 00:26:32
＠＠ -423,7 +423,7 ＠＠ check_event_stream_ok (enum event_stream
case EVENT_STREAM_READ:
error ("Can't read events in -batch mode");
default:
- abort ();
+ ABORT ();
}
}
else if (!event_stream)
＠＠ -1387,7 +1387,7 ＠＠ is a race condition. That's why the RES
Lisp_Object lid;
id = event_stream_generate_wakeup (msecs, msecs2, function, object, 0);
lid = make_int (id);
- if (id != XINT (lid)) abort ();
+ if (id != XINT (lid)) ABORT ();
return lid;
}
＠＠ -1466,7 +1466,7 ＠＠ is a race condition. That's why the RES
Lisp_Object lid;
id = event_stream_generate_wakeup (msecs, msecs2, function, object, 1);
lid = make_int (id);
- if (id != XINT (lid)) abort ();
+ if (id != XINT (lid)) ABORT ();
return lid;
}
＠＠ -2466,7 +2466,7 ＠＠ A user event is a key press, button pres
}
if (!NILP (command_event_queue) || !NILP (command_event_queue_tail))
- abort ();
+ ABORT ();
/* Now tack our chain of events back on to the front of the queue.
Actually, since the queue is now drained, we can just replace it.
＠＠ -3041,7 +3041,7 ＠＠ execute_internal_event (Lisp_Object even
return;
}
default:
- abort ();
+ ABORT ();
}
}
＠＠ -3409,7 +3409,7 ＠＠ modify them.
Lisp_Object e = XVECTOR_DATA (Vrecent_keys_ring)[j];
if (NILP (e))
- abort ();
+ ABORT ();
XVECTOR_DATA (val)[i] = Fcopy_event (e, Qnil);
if (++j >= recent_keys_ring_size)
j = 0;
＠＠ -3553,7 +3553,7 ＠＠ extract_this_command_keys_nth_mouse_even
{
if (!n)
{
- /* must copy to avoid an abort() in next_event_internal() */
+ /* must copy to avoid an ABORT() in next_event_internal() */
if (!NILP (XEVENT_NEXT (event)))
return Fcopy_event (event, Qnil);
else
＠＠ -3684,7 +3684,7 ＠＠ lookup_command_event (struct command_bui
|| e->event_type == button_release_event)
e->event.button.modifiers |= XEMACS_MOD_META;
else
- abort ();
+ ABORT ();
{
int tckn = event_chain_count (Vthis_command_keys);
Index: src/event-unixoid.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-unixoid.c,v
retrieving revision 1.10
diff -u -p -r1.10 event-unixoid.c
--- src/event-unixoid.c 2001/04/12 18:23:42 1.10
+++ src/event-unixoid.c 2005/01/30 00:26:32
＠＠ -223,7 +223,7 ＠＠ poll_fds_for_input (SELECT_TYPE mask)
return retval;
if (errno != EINTR)
{
- /* Something went seriously wrong; don't abort since maybe
+ /* Something went seriously wrong; don't ABORT since maybe
the TTY just died at the wrong time. */
stderr_out ("xemacs: select failed: errno = %d\n", errno);
return 0;
Index: src/events.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/events.c,v
retrieving revision 1.42.2.1
diff -u -p -r1.42.2.1 events.c
--- src/events.c 2004/04/20 02:56:34 1.42.2.1
+++ src/events.c 2005/01/30 00:26:32
＠＠ -31,7 +31,7 ＠＠ Boston, MA 02111-1307, USA. */
#include "device.h"
#include "console-x.h" /* for x_event_name prototype */
#include "console-gtk.h" /* for gtk_event_name prototype */
-#include "extents.h" /* Just for the EXTENTP abort check... */
+#include "extents.h" /* Just for the EXTENTP ABORT check... */
#include "events.h"
#include "frame.h"
#include "glyphs.h"
＠＠ -125,7 +125,7 ＠＠ mark_event (Lisp_Object obj)
case dead_event:
break;
default:
- abort ();
+ ABORT ();
}
mark_object (event->channel);
return event->next;
＠＠ -219,7 +219,7 ＠＠ event_equal (Lisp_Object obj1, Lisp_Obje
/* if (e1->timestamp != e2->timestamp) return 0; */
switch (e1->event_type)
{
- default: abort ();
+ default: ABORT ();
case process_event:
return EQ (e1->event.process.process, e2->event.process.process);
＠＠ -291,7 +291,7 ＠＠ event_equal (Lisp_Object obj1, Lisp_Obje
&e2->event.magic.underlying_mswindows_event,
sizeof (union magic_data)));
#endif
- abort ();
+ ABORT ();
return 1; /* not reached */
}
＠＠ -361,7 +361,7 ＠＠ event_hash (Lisp_Object obj, int depth)
if (CONSOLE_MSWINDOWS_P (con))
return HASH2 (hash, e->event.magic.underlying_mswindows_event);
#endif
- abort ();
+ ABORT ();
return 0;
}
＠＠ -370,7 +370,7 ＠＠ event_hash (Lisp_Object obj, int depth)
return hash;
default:
- abort ();
+ ABORT ();
}
return 0; /* unreached */
＠＠ -686,7 +686,7 ＠＠ WARNING: the event object returned may b
e->event.misc.y = coord_y;
break;
default:
- abort();
+ ABORT();
}
}
＠＠ -747,18 +747,18 ＠＠ that it is safe to do so.
if (EQ (event, Vlast_command_event) ||
EQ (event, Vlast_input_event) ||
EQ (event, Vunread_command_event))
- abort ();
+ ABORT ();
len = XVECTOR_LENGTH (Vthis_command_keys);
for (i = 0; i < len; i++)
if (EQ (event, XVECTOR_DATA (Vthis_command_keys) [i]))
- abort ();
+ ABORT ();
if (!NILP (Vrecent_keys_ring))
{
int recent_ring_len = XVECTOR_LENGTH (Vrecent_keys_ring);
for (i = 0; i < recent_ring_len; i++)
if (EQ (event, XVECTOR_DATA (Vrecent_keys_ring) [i]))
- abort ();
+ ABORT ();
}
}
#endif /* 0 */
＠＠ -825,7 +825,7 ＠＠ deallocate_event_chain (Lisp_Object even
/* Return the last event in a chain.
NOTE: You cannot pass nil as a value here! The routine will
- abort if you do. */
+ ABORT if you do. */
Lisp_Object
event_chain_tail (Lisp_Object event_chain)
＠＠ -912,7 +912,7 ＠＠ event_chain_count (Lisp_Object event_cha
return n;
}
-/* Find the event before EVENT in an event chain. This aborts
+/* Find the event before EVENT in an event chain. This ABORTs
if the event is not in the chain. */
Lisp_Object
＠＠ -928,7 +928,7 ＠＠ event_chain_find_previous (Lisp_Object e
event_chain = XEVENT_NEXT (event_chain);
}
- abort ();
+ ABORT ();
return Qnil;
}
＠＠ -1082,7 +1082,7 ＠＠ event_to_character (Lisp_Event *event,
if (CHAR_OR_CHAR_INTP (event->event.key.keysym))
c = XCHAR_OR_CHAR_INT (event->event.key.keysym);
else if (!SYMBOLP (event->event.key.keysym))
- abort ();
+ ABORT ();
else if (allow_non_ascii && !NILP (Vcharacter_set_property)
/* Allow window-system-specific extensibility of
keysym->code mapping */
＠＠ -1307,7 +1307,7 ＠＠ format_event_object (char *buf, Lisp_Eve
case empty_event: strcpy (buf, "empty"); return;
case dead_event: strcpy (buf, "DEAD-EVENT"); return;
default:
- abort ();
+ ABORT ();
return;
}
#define modprint1(x) do { strcpy (buf, (x)); buf += sizeof (x)-1; } while (0)
＠＠ -1359,7 +1359,7 ＠＠ format_event_object (char *buf, Lisp_Eve
}
}
else
- abort ();
+ ABORT ();
if (mouse_p)
strncpy (buf, "up", 4);
}
＠＠ -1465,7 +1465,7 ＠＠ empty The event has been allocated but
return Qempty;
default:
- abort ();
+ ABORT ();
return Qnil;
}
}
＠＠ -1858,9 +1858,9 ＠＠ event_pixel_translation (Lisp_Object eve
|| TOOLBAR_BUTTONP (ret_obj1)
#endif
))
- abort ();
+ ABORT ();
if (!NILP (ret_obj2) && !(EXTENTP (ret_obj2) || CONSP (ret_obj2)))
- abort ();
+ ABORT ();
if (char_x)
*char_x = ret_x;
＠＠ -2211,7 +2211,7 ＠＠ This is in the form of a property list (
switch (e->event_type)
{
- default: abort ();
+ default: ABORT ();
case process_event:
props = cons3 (Qprocess, e->event.process.process, props);
Index: src/extents.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/extents.c,v
retrieving revision 1.31.2.3
diff -u -p -r1.31.2.3 extents.c
--- src/extents.c 2002/10/31 15:07:45 1.31.2.3
+++ src/extents.c 2005/01/30 00:26:34
＠＠ -1860,7 +1860,7 ＠＠ extent_in_region_p (EXTENT extent, Bytin
case ME_ALL_EXTENTS_OPEN: start_open = 1, end_open = 1; break;
case ME_ALL_EXTENTS_CLOSED_OPEN: start_open = 0, end_open = 1; break;
case ME_ALL_EXTENTS_OPEN_CLOSED: start_open = 1, end_open = 0; break;
- default: abort(); return 0;
+ default: ABORT(); return 0;
}
start = buffer_or_string_bytind_to_startind (obj, from,
＠＠ -1895,7 +1895,7 ＠＠ extent_in_region_p (EXTENT extent, Bytin
retval = (start <= exs && exs <= end) || (start <= exe && exe
<= end);
break;
default:
- abort(); return 0;
+ ABORT(); return 0;
}
return flags & ME_NEGATE_IN_REGION ? !retval : retval;
}
＠＠ -3005,7 +3005,7 ＠＠ print_extent (Lisp_Object obj, Lisp_Obje
Lisp_Object obj2 = Qnil;
/* Destroyed extents have 't' in the object field, causing
- extent_object() to abort (maybe). */
+ extent_object() to ABORT (maybe). */
if (EXTENT_LIVE_P (XEXTENT (obj)))
obj2 = extent_object (XEXTENT (obj));
＠＠ -4577,10 +4577,10 ＠＠ process_extents_for_insertion_mapper (EX
#ifdef ERROR_CHECK_EXTENTS
if (extent_start (extent) > indice &&
extent_start (extent) < indice + closure->length)
- abort ();
+ ABORT ();
if (extent_end (extent) > indice &&
extent_end (extent) < indice + closure->length)
- abort ();
+ ABORT ();
#endif
/* The extent-adjustment code adjusted the extent's endpoints as if
＠＠ -4738,7 +4738,7 ＠＠ report_extent_modification_mapper (EXTEN
unbind_to (closure.speccount, Qnil). This is because
map_extents_bytind() unbinds before, and with a smaller
speccount. The additional unbind_to() in
- report_extent_modification() would cause XEmacs to abort. */
+ report_extent_modification() would cause XEmacs to ABORT. */
if (closure->speccount == -1)
{
closure->speccount = specpdl_depth ();
＠＠ -5064,7 +5064,7 ＠＠ glyph_layout_to_symbol (glyph_layout lay
case GL_INSIDE_MARGIN: return Qinside_margin;
case GL_WHITESPACE: return Qwhitespace;
default:
- abort ();
+ ABORT ();
return Qnil; /* unreached */
}
}
Index: src/faces.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/faces.c,v
retrieving revision 1.28
diff -u -p -r1.28 faces.c
--- src/faces.c 2001/04/12 18:23:43 1.28
+++ src/faces.c 2005/01/30 00:26:34
＠＠ -322,7 +322,7 ＠＠ face_validate (Lisp_Object data, Error_b
if (EQ (keyw, Qname))
name_seen = 1;
else
- abort ();
+ ABORT ();
}
if (!name_seen)
Index: src/file-coding.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v
retrieving revision 1.13.2.1
diff -u -p -r1.13.2.1 file-coding.c
--- src/file-coding.c 2002/10/31 15:07:50 1.13.2.1
+++ src/file-coding.c 2005/01/30 00:26:36
＠＠ -433,7 +433,7 ＠＠ eol_type_to_symbol (eol_type_t type)
{
switch (type)
{
- default: abort ();
+ default: ABORT ();
case EOL_LF: return Qlf;
case EOL_CRLF: return Qcrlf;
case EOL_CR: return Qcr;
＠＠ -1222,7 +1222,7 ＠＠ subsidiary_coding_system (Lisp_Object co
case EOL_LF: new_coding_system = CODING_SYSTEM_EOL_LF (cs); break;
case EOL_CR: new_coding_system = CODING_SYSTEM_EOL_CR (cs); break;
case EOL_CRLF: new_coding_system = CODING_SYSTEM_EOL_CRLF (cs); break;
- default: abort (); return Qnil;
+ default: ABORT (); return Qnil;
}
return NILP (new_coding_system) ? coding_system : new_coding_system;
＠＠ -1260,7 +1260,7 ＠＠ Return the type of CODING-SYSTEM.
{
switch (XCODING_SYSTEM_TYPE (Fget_coding_system (coding_system)))
{
- default: abort ();
+ default: ABORT ();
case CODESYS_AUTODETECT: return Qundecided;
#ifdef MULE
case CODESYS_SHIFT_JIS: return Qshift_jis;
＠＠ -1336,7 +1336,7 ＠＠ Return the PROP property of CODING-SYSTE
break;
#endif /* MULE */
default:
- abort ();
+ ABORT ();
}
}
＠＠ -1404,7 +1404,7 ＠＠ Return the PROP property of CODING-SYSTE
unparse_charset_conversion_specs
(XCODING_SYSTEM (coding_system)->iso2022.output_conv);
else
- abort ();
+ ABORT ();
}
else if (type == CODESYS_CCL)
{
＠＠ -1413,11 +1413,11 ＠＠ Return the PROP property of CODING-SYSTE
else if (EQ (prop, Qencode))
return XCODING_SYSTEM_CCL_ENCODE (coding_system);
else
- abort ();
+ ABORT ();
}
#endif /* MULE */
else
- abort ();
+ ABORT ();
return Qnil; /* not reached */
}
＠＠ -2457,7 +2457,7 ＠＠ mule_decode (Lstream *decoding, const Ex
break;
#endif /* MULE */
default:
- abort ();
+ ABORT ();
}
}
＠＠ -2872,7 +2872,7 ＠＠ mule_encode (Lstream *encoding, const Bu
break;
#endif /* MULE */
default:
- abort ();
+ ABORT ();
}
}
＠＠ -3768,7 +3768,7 ＠＠ encode_coding_ucs4 (Lstream *encoding, c
}
break;
default:
- abort ();
+ ABORT ();
}
}
}
＠＠ -4061,7 +4061,7 ＠＠ encode_coding_utf8 (Lstream *encoding, c
}
break;
default:
- abort ();
+ ABORT ();
}
}
}
＠＠ -4609,7 +4609,7 ＠＠ parse_iso2022_esc (Lisp_Object codesys,
else
{
/* Can this ever be reached? -slb */
- abort();
+ ABORT();
return 0;
}
＠＠ -5400,7 +5400,7 ＠＠ encode_coding_iso2022 (Lstream *encoding
break;
default:
- abort ();
+ ABORT ();
}
}
char_boundary = 0;
＠＠ -5483,7 +5483,7 ＠＠ encode_coding_iso2022 (Lstream *encoding
}
break;
default:
- abort ();
+ ABORT ();
}
}
}
Index: src/fileio.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/fileio.c,v
retrieving revision 1.66.2.6
diff -u -p -r1.66.2.6 fileio.c
--- src/fileio.c 2004/06/23 01:54:46 1.66.2.6
+++ src/fileio.c 2005/01/30 00:26:37
＠＠ -3928,7 +3928,7 ＠＠ do_auto_save_unwind_2 (Lisp_Object old_a
and if so, tries to avoid touching lisp objects.
The only time that Fdo_auto_save() is called while GC is in progress
- is if we're going down, as a result of an abort() or a kill signal.
+ is if we're going down, as a result of an ABORT() or a kill signal.
It's fairly important that we generate autosave files in that case!
*/
Index: src/fns.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/fns.c,v
retrieving revision 1.33.2.3
diff -u -p -r1.33.2.3 fns.c
--- src/fns.c 2004/04/20 02:56:34 1.33.2.3
+++ src/fns.c 2005/01/30 00:26:38
＠＠ -712,7 +712,7 ＠＠ concat (int nargs, Lisp_Object *args,
break;
default:
val = Qnil;
- abort ();
+ ABORT ();
}
}
＠＠ -1001,7 +1001,7 ＠＠ are copied to the new string.
}
else
{
- abort (); /* unreachable, since Flength (sequence) did not get
+ ABORT (); /* unreachable, since Flength (sequence) did not get
an error */
return Qnil;
}
＠＠ -3020,7 +3020,7 ＠＠ mapcar1 (size_t leni, Lisp_Object *vals,
}
}
else
- abort (); /* unreachable, since Flength (sequence) did not get an error */
+ ABORT (); /* unreachable, since Flength (sequence) did not get an error */
if (vals)
UNGCPRO;
＠＠ -3637,7 +3637,7 ＠＠ into shorter lines.
encoded_length = base64_encode_1 (XLSTREAM (input), encoded,
NILP (no_line_break));
if (encoded_length > allength)
- abort ();
+ ABORT ();
Lstream_delete (XLSTREAM (input));
/* Now we have encoded the region, so we insert the new contents
＠＠ -3679,7 +3679,7 ＠＠ into shorter lines.
encoded_length = base64_encode_1 (XLSTREAM (input), encoded,
NILP (no_line_break));
if (encoded_length > allength)
- abort ();
+ ABORT ();
Lstream_delete (XLSTREAM (input));
result = make_string (encoded, encoded_length);
XMALLOC_UNBIND (encoded, allength, speccount);
＠＠ -3712,7 +3712,7 ＠＠ Characters out of the base64 alphabet ar
XMALLOC_OR_ALLOCA (decoded, length * MAX_EMCHAR_LEN, Bufbyte);
decoded_length = base64_decode_1 (XLSTREAM (input), decoded, &cc_decoded_length);
if (decoded_length > length * MAX_EMCHAR_LEN)
- abort ();
+ ABORT ();
Lstream_delete (XLSTREAM (input));
/* Now we have decoded the region, so we insert the new contents
＠＠ -3753,7 +3753,7 ＠＠ Characters out of the base64 alphabet ar
decoded_length = base64_decode_1 (XLSTREAM (input), decoded,
&cc_decoded_length);
if (decoded_length > length * MAX_EMCHAR_LEN)
- abort ();
+ ABORT ();
Lstream_delete (XLSTREAM (input));
result = make_string (decoded, decoded_length);
Index: src/font-lock.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/font-lock.c,v
retrieving revision 1.5.2.2
diff -u -p -r1.5.2.2 font-lock.c
--- src/font-lock.c 2002/10/31 15:07:57 1.5.2.2
+++ src/font-lock.c 2005/01/30 00:26:38
＠＠ -515,7 +515,7 ＠＠ find_context (struct buffer *buf, Bufpos
context_cache.context = context_comment;
context_cache.ccontext = ccontext_none;
context_cache.style = SINGLE_SYNTAX_STYLE (syncode);
- if (context_cache.style == comment_style_none) abort ();
+ if (context_cache.style == comment_style_none) ABORT ();
}
break;
＠＠ -607,7 +607,7 ＠＠ find_context (struct buffer *buf, Bufpos
{
context_cache.ccontext = ccontext_start2;
context_cache.style = SYNTAX_START_STYLE (prev_syncode, syncode);
- if (context_cache.style == comment_style_none) abort ();
+ if (context_cache.style == comment_style_none) ABORT ();
}
else if ((SYNTAX_CODE_COMMENT_BITS (syncode) &
SYNTAX_FIRST_CHAR_START) &&
＠＠ -648,18 +648,18 ＠＠ find_context (struct buffer *buf, Bufpos
comment-end sequence. ie, '/xxx foo xxx/' or '/xxx foo x/',
where 'x' = '*' -- mct */
{
- if (context_cache.style == comment_style_none) abort ();
+ if (context_cache.style == comment_style_none) ABORT ();
context_cache.ccontext = ccontext_end1;
}
else if (context_cache.ccontext == ccontext_start1)
{
- if (context_cache.context != context_none) abort ();
+ if (context_cache.context != context_none) ABORT ();
context_cache.ccontext = ccontext_none;
}
else if (context_cache.ccontext == ccontext_end1)
{
- if (context_cache.context != context_block_comment) abort ();
+ if (context_cache.context != context_block_comment) ABORT ();
context_cache.context = context_none;
context_cache.ccontext = ccontext_start2;
}
＠＠ -668,7 +668,7 ＠＠ find_context (struct buffer *buf, Bufpos
context_cache.context == context_none)
{
context_cache.context = context_block_comment;
- if (context_cache.style == comment_style_none) abort ();
+ if (context_cache.style == comment_style_none) ABORT ();
}
else if (context_cache.ccontext == ccontext_none &&
context_cache.context == context_block_comment)
＠＠ -691,7 +691,7 ＠＠ context_to_symbol (enum syntactic_contex
case context_block_comment: return Qblock_comment;
case context_generic_comment: return Qblock_comment;
case context_generic_string: return Qstring;
- default: abort (); return Qnil; /* suppress compiler warning */
+ default: ABORT (); return Qnil; /* suppress compiler warning */
}
}
Index: src/frame-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-gtk.c,v
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.3 frame-gtk.c
--- src/frame-gtk.c 2004/08/13 03:23:25 1.2.2.3
+++ src/frame-gtk.c 2005/01/30 00:26:38
＠＠ -1089,7 +1089,7 ＠＠ gtk_set_frame_pointer (struct frame *f)
}
else
{
- /* abort()? */
+ /* ABORT()? */
stderr_out ("POINTER_IMAGE_INSTANCEP (f->pointer) failed!\n");
}
}
＠＠ -1399,7 +1399,7 ＠＠ gtk_update_frame_external_traits (struct
}
}
else
- abort ();
+ ABORT ();
#ifdef HAVE_TOOLBARS
/* Setting the background clears the entire frame area
Index: src/frame-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-x.c,v
retrieving revision 1.45.2.3
diff -u -p -r1.45.2.3 frame-x.c
--- src/frame-x.c 2003/10/24 03:49:57 1.45.2.3
+++ src/frame-x.c 2005/01/30 00:26:39
＠＠ -210,14 +210,14 ＠＠ decode_x_frame (Lisp_Object frame)
void
x_wm_mark_shell_size_user_specified (Widget wmshell)
{
- if (! XtIsWMShell (wmshell)) abort ();
+ if (! XtIsWMShell (wmshell)) ABORT ();
EmacsShellSetSizeUserSpecified (wmshell);
}
void
x_wm_mark_shell_position_user_specified (Widget wmshell)
{
- if (! XtIsWMShell (wmshell)) abort ();
+ if (! XtIsWMShell (wmshell)) ABORT ();
EmacsShellSetPositionUserSpecified (wmshell);
}
＠＠ -226,7 +226,7 ＠＠ x_wm_mark_shell_position_user_specified
void
x_wm_set_shell_iconic_p (Widget shell, int iconic_p)
{
- if (! XtIsWMShell (shell)) abort ();
+ if (! XtIsWMShell (shell)) ABORT ();
/* Because of questionable logic in Shell.c, this sequence can't work:
＠＠ -256,9 +256,9 ＠＠ x_wm_set_cell_size (Widget wmshell, int
Arg al [2];
if (!XtIsWMShell (wmshell))
- abort ();
+ ABORT ();
if (cw <= 0 || ch <= 0)
- abort ();
+ ABORT ();
XtSetArg (al [0], XtNwidthInc, cw);
XtSetArg (al [1], XtNheightInc, ch);
＠＠ -271,7 +271,7 ＠＠ x_wm_set_variable_size (Widget wmshell,
Arg al [2];
if (!XtIsWMShell (wmshell))
- abort ();
+ ABORT ();
#ifdef DEBUG_GEOMETRY_MANAGEMENT
/* See comment in EmacsShell.c */
printf ("x_wm_set_variable_size: %d %d\n", width, height);
＠＠ -338,7 +338,7 ＠＠ x_wm_store_class_hints (Widget shell, ch
XClassHint classhint;
if (!XtIsWMShell (shell))
- abort ();
+ ABORT ();
XtGetApplicationNameAndClass (dpy, &app_name, &app_class);
classhint.res_name = frame_name;
＠＠ -354,7 +354,7 ＠＠ x_wm_maybe_store_wm_command (struct fram
struct device *d = XDEVICE (FRAME_DEVICE (f));
if (!XtIsWMShell (w))
- abort ();
+ ABORT ();
if (NILP (DEVICE_X_WM_COMMAND_FRAME (d)))
{
＠＠ -1637,7 +1637,7 ＠＠ x_initialize_frame_size (struct frame *f
/* OK, we're a top-level shell. */
if (!XtIsWMShell (wmshell))
- abort ();
+ ABORT ();
/* If the EmacsFrame doesn't have a geometry but the shell does,
treat that as the geometry of the frame.
＠＠ -2755,7 +2755,7 ＠＠ x_update_frame_external_traits (struct f
}
}
else
- abort ();
+ ABORT ();
XtSetValues (FRAME_X_TEXT_WIDGET (frm), al, ac);
Index: src/frame.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame.c,v
retrieving revision 1.40.2.2
diff -u -p -r1.40.2.2 frame.c
--- src/frame.c 2002/10/31 15:08:05 1.40.2.2
+++ src/frame.c 2005/01/30 00:26:40
＠＠ -779,7 +779,7 ＠＠ selected_frame (void)
/* use this instead of XFRAME (DEVICE_SELECTED_FRAME (d)) to catch
the possibility of there being no frames on the device (just created).
There is no point doing this inside of redisplay because errors
- cause an abort(), indicating a flaw in the logic, and error_check_frame()
+ cause an ABORT(), indicating a flaw in the logic, and error_check_frame()
will catch this just as well. */
struct frame *
＠＠ -1633,7 +1633,7 ＠＠ delete_frame_internal (struct frame *f,
that is prohibited at the top; you can't delete surrogate
minibuffer frames. */
if (NILP (frame_with_minibuf))
- abort ();
+ ABORT ();
con->default_minibuffer_frame = frame_with_minibuf;
}
＠＠ -1707,7 +1707,7 ＠＠ mouse_pixel_position_1 (struct device *d
break;
default:
- abort (); /* method is incorrectly written */
+ ABORT (); /* method is incorrectly written */
}
return 0;
＠＠ -2951,7 +2951,7 ＠＠ change_frame_size_1 (struct frame *f, in
`left' coordinates to be recomputed even though no frame size
change occurs. --kyle */
if (in_display)
- abort ();
+ ABORT ();
XSETFRAME (frame, f);
Index: src/free-hook.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/free-hook.c,v
retrieving revision 1.8
diff -u -p -r1.8 free-hook.c
--- src/free-hook.c 2001/04/12 18:23:48 1.8
+++ src/free-hook.c 2005/01/30 00:26:40
＠＠ -141,7 +141,7 ＠＠ check_free (void *ptr)
/* I originally wrote: "There's really no need to drop core."
I have seen the error of my ways. -slb */
if (strict_free_check)
- abort ();
+ ABORT ();
#endif
printf("Freeing unmalloc'ed memory at %p\n", ptr);
__free_hook = check_free;
＠＠ -155,7 +155,7 ＠＠ check_free (void *ptr)
#if !defined(__linux__)
/* See above comment. */
if (strict_free_check)
- abort ();
+ ABORT ();
#endif
printf("Freeing %p twice\n", ptr);
__free_hook = check_free;
＠＠ -264,7 +264,7 ＠＠ check_realloc (void * ptr, size_t size)
come from malloc. */
#if !defined(__linux__)
/* see comment in check_free(). */
- abort ();
+ ABORT ();
#endif
printf("Realloc'ing unmalloc'ed pointer at %p\n", ptr);
}
＠＠ -445,7 +445,7 ＠＠ block_input_history blhist[BLHISTLIMIT];
note_block_input (char *file, int line)
{
note_block (file, line, block_type);
- if (interrupt_input_blocked > 2) abort();
+ if (interrupt_input_blocked > 2) ABORT();
}
note_unblock_input (char* file, int line)
＠＠ -485,15 +485,15 ＠＠ log_gcpro (char *file, int line, struct
if (type == ungcpro_type)
{
if (value == gcprolist) goto OK;
- if (! gcprolist) abort ();
+ if (! gcprolist) ABORT ();
if (value == gcprolist->next) goto OK;
- if (! gcprolist->next) abort ();
+ if (! gcprolist->next) ABORT ();
if (value == gcprolist->next->next) goto OK;
- if (! gcprolist->next->next) abort ();
+ if (! gcprolist->next->next) ABORT ();
if (value == gcprolist->next->next->next) goto OK;
- if (! gcprolist->next->next->next) abort ();
+ if (! gcprolist->next->next->next) ABORT ();
if (value == gcprolist->next->next->next->next) goto OK;
- abort ();
+ ABORT ();
OK:;
}
gcprohist[gcprohistptr].file = file;
Index: src/gccache-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gccache-gtk.c,v
retrieving revision 1.2
diff -u -p -r1.2 gccache-gtk.c
--- src/gccache-gtk.c 2001/04/12 18:23:48 1.2
+++ src/gccache-gtk.c 2005/01/30 00:26:40
＠＠ -160,8 +160,8 ＠＠ gc_cache_lookup (struct gc_cache *cache,
struct gc_cache_cell *cell, *next, *prev;
struct gcv_and_mask gcvm;
- if ((!!cache->head) != (!!cache->tail)) abort ();
- if (cache->head && (cache->head->prev || cache->tail->next))
abort ();
+ if ((!!cache->head) != (!!cache->tail)) ABORT ();
+ if (cache->head && (cache->head->prev || cache->tail->next))
ABORT ();
/* Gdk does not have the equivalent of 'None' for the clip_mask, so
we need to check it carefully, or gdk_gc_new_with_values will
＠＠ -216,10 +216,10 ＠＠ gc_cache_lookup (struct gc_cache *cache,
cell->prev = cache->tail;
cache->tail->next = cell;
cache->tail = cell;
- if (cache->head == cell) abort ();
- if (cell->next) abort ();
- if (cache->head->prev) abort ();
- if (cache->tail->next) abort ();
+ if (cache->head == cell) ABORT ();
+ if (cell->next) ABORT ();
+ if (cache->head->prev) ABORT ();
+ if (cache->tail->next) ABORT ();
return cell->gc;
}
＠＠ -241,7 +241,7 ＠＠ gc_cache_lookup (struct gc_cache *cache,
#endif
}
else if (cache->size > GC_CACHE_SIZE)
- abort ();
+ ABORT ();
else
{
/* Allocate a new cell (don't put it in the list or table yet). */
Index: src/glyphs-eimage.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-eimage.c,v
retrieving revision 1.9.2.3
diff -u -p -r1.9.2.3 glyphs-eimage.c
--- src/glyphs-eimage.c 2003/02/01 01:11:47 1.9.2.3
+++ src/glyphs-eimage.c 2005/01/30 00:26:41
＠＠ -2,7 +2,7 ＠＠
Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc.
Copyright (C) 1995 Board of Trustees, University of Illinois.
Copyright (C) 1995 Tinker Systems
- Copyright (C) 1995, 1996 Ben Wing
+ Copyright (C) 1995, 1996, 2005 Ben Wing
Copyright (C) 1995 Sun Microsystems
This file is part of XEmacs.
＠＠ -105,6 +105,19 ＠＠ Lisp_Object Qpng;
#ifdef __cplusplus
extern "C" {
#endif
+
+#ifdef WIN32_NATIVE
+/* #### Yuck! More horrifitude. tiffio.h, below, includes <windows.h>,
+ which defines INT32 and INT16, the former differently and incompatibly
+ from jmorecfg.h, included by jpeglib.h. We can disable the stuff in
+ jmorecfg.h by defining XMD_H (clever, huh?); then we define these
+ typedefs the way that <windows.h> wants them (which is more correct,
+ anyway; jmorecfg.h defines INT32 as `long'). */
+#define XMD_H
+typedef signed int INT32;
+typedef signed short INT16;
+#endif
+
#include <jpeglib.h>
#include <jerror.h>
#ifdef __cplusplus
＠＠ -1103,7 +1116,7 ＠＠ tiff_memory_read(thandle_t data, tdata_t
static size_t tiff_memory_write(thandle_t data, tdata_t buf, tsize_t size)
{
- abort();
+ ABORT();
return 0; /* Shut up warnings. */
}
Index: src/glyphs-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-gtk.c,v
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.3 glyphs-gtk.c
--- src/glyphs-gtk.c 2004/07/07 02:25:57 1.2.2.3
+++ src/glyphs-gtk.c 2005/01/30 00:26:41
＠＠ -423,7 +423,7 ＠＠ gtk_finalize_image_instance (struct Lisp
#endif
else if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
{
- abort();
+ ABORT();
}
else
{
＠＠ -788,7 +788,7 ＠＠ void init_image_instance_from_gdk_pixmap
gint width, height, depth;
if (!DEVICE_GTK_P (device))
- abort ();
+ ABORT ();
IMAGE_INSTANCE_DEVICE (ii) = device;
IMAGE_INSTANCE_TYPE (ii) = IMAGE_COLOR_PIXMAP;
＠＠ -1034,7 +1034,7 ＠＠ init_image_instance_from_xbm_inline (str
break;
default:
- abort ();
+ ABORT ();
}
}
＠＠ -1347,7 +1347,7 ＠＠ gtk_xpm_instantiate (Lisp_Object image_i
break;
default:
- abort ();
+ ABORT ();
}
}
#endif /* HAVE_XPM */
＠＠ -1998,7 +1998,7 ＠＠ gtk_unmap_subwindow (Lisp_Image_Instance
if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
{
/* We don't support subwindows, but we do support widgets... */
- abort ();
+ ABORT ();
}
else /* must be a widget */
{
＠＠ -2021,7 +2021,7 ＠＠ gtk_map_subwindow (Lisp_Image_Instance *
if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
{
/* No subwindow support... */
- abort ();
+ ABORT ();
}
else /* must be a widget */
{
＠＠ -2461,7 +2461,7 ＠＠ gtk_button_redisplay (Lisp_Object image_
else
{
/* Unknown button type... */
- abort();
+ ABORT();
}
}
Index: src/glyphs-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-msw.c,v
retrieving revision 1.28.2.3
diff -u -p -r1.28.2.3 glyphs-msw.c
--- src/glyphs-msw.c 2002/10/31 15:08:09 1.28.2.3
+++ src/glyphs-msw.c 2005/01/30 00:26:42
＠＠ -1903,7 +1903,7 ＠＠ init_image_instance_from_xbm_inline (Lis
break;
default:
- abort ();
+ ABORT ();
}
}
＠＠ -1976,6 +1976,9 ＠＠ mswindows_xbm_instantiate (Lisp_Object i
#define SYSV32
#ifdef __cplusplus
extern "C" {
+#endif
+#ifndef __STDC__ /* Needed to avoid prototype warnings */
+#define __STDC__
#endif
#include <compface.h>
#ifdef __cplusplus
Index: src/glyphs-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-x.c,v
retrieving revision 1.54.2.3
diff -u -p -r1.54.2.3 glyphs-x.c
--- src/glyphs-x.c 2002/10/31 15:08:15 1.54.2.3
+++ src/glyphs-x.c 2005/01/30 00:26:43
＠＠ -1150,7 +1150,7 ＠＠ init_image_instance_from_xbm_inline (Lis
break;
default:
- abort ();
+ ABORT ();
}
}
＠＠ -1277,7 +1277,7 ＠＠ extract_xpm_color_names (XpmAttributes *
/* Duplicate the pixel value so that we still have a lock on it if
the pixel we were passed is later freed. */
if (! XAllocColor (dpy, cmap, &color))
- abort (); /* it must be allocable since we're just duplicating it */
+ ABORT (); /* it must be allocable since we're just duplicating it */
symbols [i].name = (char *) XSTRING_DATA (XCAR (cons));
symbols [i].pixel = color.pixel;
＠＠ -1632,7 +1632,7 ＠＠ x_xpm_instantiate (Lisp_Object image_ins
break;
default:
- abort ();
+ ABORT ();
}
xpm_free (&xpmattrs); /* after we've read pixels and hotspot */
Index: src/glyphs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs.c,v
retrieving revision 1.27.2.4
diff -u -p -r1.27.2.4 glyphs.c
--- src/glyphs.c 2004/03/15 03:34:58 1.27.2.4
+++ src/glyphs.c 2005/01/30 00:26:44
＠＠ -711,7 +711,7 ＠＠ get_image_instantiator_governing_domain
else if (governing_domain == GOVERNING_DOMAIN_DEVICE)
domain = DOMAIN_DEVICE (domain);
else
- abort ();
+ ABORT ();
return domain;
}
＠＠ -1032,7 +1032,7 ＠＠ print_image_instance (Lisp_Object obj, L
break;
default:
- abort ();
+ ABORT ();
}
MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), print_image_instance,
＠＠ -1155,7 +1155,7 ＠＠ image_instance_equal (Lisp_Object obj1,
break;
default:
- abort ();
+ ABORT ();
}
return DEVMETH_OR_GIVEN (DOMAIN_XDEVICE (i1->domain),
＠＠ -1234,7 +1234,7 ＠＠ image_instance_hash (Lisp_Object obj, in
break;
default:
- abort ();
+ ABORT ();
}
return HASH2 (hash, DEVMETH_OR_GIVEN
＠＠ -1322,7 +1322,7 ＠＠ encode_image_instance_type (enum image_i
case IMAGE_SUBWINDOW: return Qsubwindow;
case IMAGE_WIDGET: return Qwidget;
default:
- abort ();
+ ABORT ();
}
return Qnil; /* not reached */
＠＠ -1460,7 +1460,7 ＠＠ make_image_instance_1 (Lisp_Object data,
signal_simple_error ("Image instances not allowed here", data);
image_validate (data);
domain = decode_domain (domain);
- /* instantiate_image_instantiator() will abort if given an
+ /* instantiate_image_instantiator() will ABORT if given an
image instance ... */
dest_mask = decode_image_instance_type_list (dest_types);
data = normalize_image_instantiator (data,
＠＠ -2212,7 +2212,7 ＠＠ inherit_instantiate (Lisp_Object image_i
int dest_mask, Lisp_Object domain)
{
/* handled specially in image_instantiate */
- abort ();
+ ABORT ();
}
＠＠ -3235,7 +3235,7 ＠＠ image_instantiate (Lisp_Object specifier
Qunbound);
}
else
- abort (); /* We're not allowed anything else currently. */
+ ABORT (); /* We're not allowed anything else currently. */
/* If we don't have an instance at this point then create
one. */
＠＠ -3313,7 +3313,7 ＠＠ image_instantiate (Lisp_Object specifier
RETURN_UNGCPRO (instance);
}
- abort ();
+ ABORT ();
return Qnil; /* not reached */
}
＠＠ -3710,7 +3710,7 ＠＠ allocate_glyph (enum glyph_type type,
| IMAGE_COLOR_PIXMAP_MASK;
break;
default:
- abort ();
+ ABORT ();
}
/* I think Fmake_specifier can GC. I think set_specifier_fallback can GC. */
＠＠ -3835,7 +3835,7 ＠＠ The return value will be one of 'buffer,
CHECK_GLYPH (glyph);
switch (XGLYPH_TYPE (glyph))
{
- default: abort ();
+ default: ABORT ();
case GLYPH_BUFFER: return Qbuffer;
case GLYPH_POINTER: return Qpointer;
case GLYPH_ICON: return Qicon;
＠＠ -4523,7 +4523,7 ＠＠ redisplay_subwindow (Lisp_Object subwind
/* The update method is allowed to call eval. Since it is quite
common for this function to get called from somewhere in
redisplay we need to make sure that quits are ignored. Otherwise
- Fsignal will abort. */
+ Fsignal will ABORT. */
specbind (Qinhibit_quit, Qt);
ERROR_CHECK_IMAGE_INSTANCE (subwindow);
＠＠ -4886,7 +4886,7 ＠＠ display_table_entry (Emchar ch, Lisp_Obj
continue;
}
else
- abort ();
+ ABORT ();
}
}
Index: src/gtk-glue.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gtk-glue.c,v
retrieving revision 1.2
diff -u -p -r1.2 gtk-glue.c
--- src/gtk-glue.c 2001/04/12 18:23:53 1.2
+++ src/gtk-glue.c 2005/01/30 00:26:44
＠＠ -91,7 +91,7 ＠＠ xemacs_list_to_gtklist (Lisp_Object obj,
}
else
{
- abort();
+ ABORT();
}
}
＠＠ -128,7 +128,7 ＠＠ xemacs_gtklist_to_list (GtkArg *arg)
}
else
{
- abort();
+ ABORT();
}
}
return (rval);
＠＠ -179,7 +179,7 ＠＠ xemacs_list_to_array (Lisp_Object obj, G
}
else
{
- abort();
+ ABORT();
}
#undef FROB
}
Index: src/gutter.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gutter.c,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 gutter.c
--- src/gutter.c 2002/08/20 11:37:31 1.2.2.1
+++ src/gutter.c 2005/01/30 00:26:44
＠＠ -70,7 +70,7 ＠＠ update_gutter_geometry (struct frame *f,
(frame)->right_gutter_was_visible = flag; \
break; \
default: \
- abort (); \
+ ABORT (); \
} \
} while (0)
＠＠ -87,7 +87,7 ＠＠ static int gutter_was_visible (struct fr
case RIGHT_GUTTER:
return frame->right_gutter_was_visible;
default:
- abort ();
+ ABORT ();
return 0; /* To keep the compiler happy */
}
}
＠＠ -214,7 +214,7 ＠＠ get_gutter_coords (struct frame *f, enum
break;
default:
- abort ();
+ ABORT ();
}
}
Index: src/input-method-xlib.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/input-method-xlib.c,v
retrieving revision 1.12
diff -u -p -r1.12 input-method-xlib.c
--- src/input-method-xlib.c 2001/04/12 18:23:56 1.12
+++ src/input-method-xlib.c 2005/01/30 00:26:45
＠＠ -556,7 +556,7 ＠＠ retry:
case XLookupChars:
break;
default:
- abort ();
+ ABORT ();
}
new_event.type = ClientMessage;
Index: src/insdel.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/insdel.c,v
retrieving revision 1.20
diff -u -p -r1.20 insdel.c
--- src/insdel.c 2001/04/12 18:23:57 1.20
+++ src/insdel.c 2005/01/30 00:26:45
＠＠ -489,7 +489,7 ＠＠ bufpos_to_bytind_func (struct buffer *bu
}
#ifdef ERROR_CHECK_BUFPOS
else if (x >= bufmin)
- abort ();
+ ABORT ();
#endif
else
{
＠＠ -766,7 +766,7 ＠＠ bytind_to_bufpos_func (struct buffer *bu
}
#ifdef ERROR_CHECK_BUFPOS
else if (x >= bytmin)
- abort ();
+ ABORT ();
#endif
else
{
＠＠ -1797,7 +1797,7 ＠＠ static void
move_gap (struct buffer *buf, Bytind pos)
{
if (! BUF_BEG_ADDR (buf))
- abort ();
+ ABORT ();
if (pos < BI_BUF_GPT (buf))
gap_left (buf, pos);
else if (pos > BI_BUF_GPT (buf))
Index: src/intl.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/intl.c,v
retrieving revision 1.5
diff -u -p -r1.5 intl.c
--- src/intl.c 2001/04/12 18:23:57 1.5
+++ src/intl.c 2005/01/30 00:26:46
＠＠ -147,7 +147,7 ＠＠ x_get_composed_input (XKeyPressedEvent *
case XLookupChars:
break;
default:
- abort ();
+ ABORT ();
}
new_event.type = ClientMessage;
Index: src/keymap.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/keymap.c,v
retrieving revision 1.32.2.3
diff -u -p -r1.32.2.3 keymap.c
--- src/keymap.c 2005/01/23 16:23:04 1.32.2.3
+++ src/keymap.c 2005/01/30 00:26:47
＠＠ -472,7 +472,7 ＠＠ keymap_lookup_directly (Lisp_Object keym
if ((modifiers & ~(XEMACS_MOD_CONTROL | XEMACS_MOD_META | XEMACS_MOD_SUPER
| XEMACS_MOD_HYPER | XEMACS_MOD_ALT | XEMACS_MOD_SHIFT))
!= 0)
- abort ();
+ ABORT ();
k = XKEYMAP (keymap);
＠＠ -547,7 +547,7 ＠＠ keymap_delete_inverse_internal (Lisp_Obj
Lisp_Object *prev;
if (UNBOUNDP (keys))
- abort ();
+ ABORT ();
for (prev = &new_keys, tail = new_keys;
;
＠＠ -1719,7 +1719,7 ＠＠ ensure_meta_prefix_char_keymapp (Lisp_Ob
else
{
new_keys = Qnil;
- abort ();
+ ABORT ();
}
if (EQ (keys, new_keys))
＠＠ -3060,10 +3060,10 ＠＠ accessible_keymaps_mapper_1 (Lisp_Object
key.modifiers = modifiers;
if (NILP (cmd))
- abort ();
+ ABORT ();
cmd = get_keymap (cmd, 0, 1);
if (!KEYMAPP (cmd))
- abort ();
+ ABORT ();
vec = make_vector (XVECTOR_LENGTH (thisseq) + 1, Qnil);
len = XVECTOR_LENGTH (thisseq);
＠＠ -3589,7 +3589,7 ＠＠ where_is_recursive_mapper (Lisp_Object m
/* OK, the key is for real */
if (target_buffer)
{
- if (!firstonly) abort ();
+ if (!firstonly) ABORT ();
format_raw_keys (so_far, keys_count + 1, target_buffer);
return make_int (1);
}
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.45.2.8
diff -u -p -r1.45.2.8 lisp.h
--- src/lisp.h 2003/03/21 03:36:27 1.45.2.8
+++ src/lisp.h 2005/01/30 00:26:48
＠＠ -247,11 +247,11 ＠＠ template<typename T> struct alignment_tr
/* Highly dubious kludge */
/* (thanks, Jamie, I feel better now -- ben) */
void assert_failed (const char *, int, const char *);
-# define abort() (assert_failed (__FILE__, __LINE__, "abort()"))
+# define ABORT() (assert_failed (__FILE__, __LINE__, "ABORT()"))
# define assert(x) ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, #x))
#else
# ifdef DEBUG_XEMACS
-# define assert(x) ((x) ? (void) 0 : (void) abort ())
+# define assert(x) ((x) ? (void) 0 : (void) ABORT ())
# else
# define assert(x)
# endif
＠＠ -879,7 +879,7 ＠＠ do { \
/* For a list that's known to be in valid list format, where we may
be deleting the current element out of the list --
- will abort() if the list is not in valid format */
+ will ABORT() if the list is not in valid format */
#define LIST_LOOP_DELETING(consvar, nextconsvar, list) \
for (consvar = list; \
!NILP (consvar) ? (nextconsvar = XCDR (consvar), 1) :0; \
＠＠ -1410,7 +1410,7 ＠＠ DECLARE_LRECORD (marker, Lisp_Marker);
#define CONCHECK_MARKER(x) CONCHECK_RECORD (x, marker)
/* The second check was looking for GCed markers still in use */
-/* if (INTP (XMARKER (x)->lheader.next.v)) abort (); */
+/* if (INTP (XMARKER (x)->lheader.next.v)) ABORT (); */
#define marker_next(m) ((m)->next)
#define marker_prev(m) ((m)->prev)
Index: src/lread.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lread.c,v
retrieving revision 1.41.2.2
diff -u -p -r1.41.2.2 lread.c
--- src/lread.c 2002/08/12 14:56:39 1.41.2.2
+++ src/lread.c 2005/01/30 00:26:48
＠＠ -1921,7 +1921,7 ＠＠ read_atom (Lisp_Object readcharfun,
else if (sizeof (long) == sizeof (EMACS_INT))
number = atol (read_buffer);
else
- abort ();
+ ABORT ();
return make_int (number);
}
#else
Index: src/lstream.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lstream.c,v
retrieving revision 1.13.2.1
diff -u -p -r1.13.2.1 lstream.c
--- src/lstream.c 2004/03/15 03:34:59 1.13.2.1
+++ src/lstream.c 2005/01/30 00:26:49
＠＠ -284,7 +284,7 ＠＠ Lstream_delete (Lstream *lstr)
}
}
- abort ();
+ ABORT ();
}
#define Lstream_internal_error(reason, lstr) \
＠＠ -1484,7 +1484,7 ＠＠ make_lisp_buffer_stream_1 (struct buffer
/* Make sure the luser didn't pass "w" in. */
if (!strcmp (mode, "w"))
- abort ();
+ ABORT ();
if (flags & LSTR_IGNORE_ACCESSIBLE)
{
Index: src/macros.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/macros.c,v
retrieving revision 1.7
diff -u -p -r1.7 macros.c
--- src/macros.c 2001/04/12 18:24:00 1.7
+++ src/macros.c 2005/01/30 00:26:49
＠＠ -179,7 +179,7 ＠＠ store_kbd_macro_event (Lisp_Object event
void
pop_kbd_macro_event (Lisp_Object event)
{
- if (NILP (Vexecuting_macro)) abort ();
+ if (NILP (Vexecuting_macro)) ABORT ();
if (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))
{
Index: src/malloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/malloc.c,v
retrieving revision 1.6.2.2
diff -u -p -r1.6.2.2 malloc.c
--- src/malloc.c 2004/06/22 01:49:55 1.6.2.2
+++ src/malloc.c 2005/01/30 00:26:49
＠＠ -525,7 +525,7 ＠＠ malloc (n) /* get a block */
#ifdef rcheck
botch ("block on free list clobbered");
#else /* not rcheck */
- abort ();
+ ABORT ();
#endif /* not rcheck */
/* Fill in the info, and if range checking, set up the magic numbers */
＠＠ -569,7 +569,7 ＠＠ free (mem)
#ifndef rcheck
if (p -> mh_alloc != ISALLOC)
- abort ();
+ ABORT ();
#else /* rcheck */
if (p -> mh_alloc != ISALLOC)
Index: src/marker.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/marker.c,v
retrieving revision 1.5
diff -u -p -r1.5 marker.c
--- src/marker.c 2001/04/12 18:24:01 1.5
+++ src/marker.c 2005/01/30 00:26:49
＠＠ -339,7 +339,7 ＠＠ bi_marker_position (Lisp_Object marker)
#ifdef ERROR_CHECK_BUFPOS
if (pos < BI_BUF_BEG (buf) || pos > BI_BUF_Z (buf))
- abort ();
+ ABORT ();
#endif
return pos;
＠＠ -367,7 +367,7 ＠＠ set_bi_marker_position (Lisp_Object mark
#ifdef ERROR_CHECK_BUFPOS
if (pos < BI_BUF_BEG (buf) || pos > BI_BUF_Z (buf))
- abort ();
+ ABORT ();
#endif
m->memind = bytind_to_memind (buf, pos);
Index: src/menubar-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/menubar-gtk.c,v
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.3 menubar-gtk.c
--- src/menubar-gtk.c 2004/07/07 02:25:57 1.2.2.3
+++ src/menubar-gtk.c 2005/01/30 00:26:50
＠＠ -1021,7 +1021,7 ＠＠ menu_descriptor_to_widget_1 (Lisp_Object
else
{
return (NULL);
- /* abort (); ???? */
+ /* ABORT (); ???? */
}
}
Index: src/menubar-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/menubar-msw.c,v
retrieving revision 1.21.2.2
diff -u -p -r1.21.2.2 menubar-msw.c
--- src/menubar-msw.c 2002/10/31 15:08:25 1.21.2.2
+++ src/menubar-msw.c 2005/01/30 00:26:50
＠＠ -678,12 +678,12 ＠＠ prune_menubar (struct frame *f)
if (menubar == NULL)
return;
- /* #### If a filter function has set desc to Qnil, this abort()
+ /* #### If a filter function has set desc to Qnil, this ABORT()
triggers. To resolve, we must prevent filters explicitly from
mangling with the active menu. In apply_filter probably?
Is copy-tree on the whole menu too expensive? */
if (NILP (desc))
- /* abort(); */
+ /* ABORT(); */
return;
GCPRO1 (desc); /* just to be safe -- see above */
Index: src/menubar-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/menubar-x.c,v
retrieving revision 1.25
diff -u -p -r1.25 menubar-x.c
--- src/menubar-x.c 2001/04/12 18:24:02 1.25
+++ src/menubar-x.c 2005/01/30 00:26:50
＠＠ -572,7 +572,7 ＠＠ set_frame_menubar (struct frame *f, int
data = compute_menubar_data (f, menubar, deep_p);
if (!data || (!data->next && !data->contents))
- abort ();
+ ABORT ();
if (NILP (FRAME_MENUBAR_DATA (f)))
{
Index: src/mule-charset.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-charset.c,v
retrieving revision 1.19.2.1
diff -u -p -r1.19.2.1 mule-charset.c
--- src/mule-charset.c 2001/05/09 09:54:06 1.19.2.1
+++ src/mule-charset.c 2005/01/30 00:26:51
＠＠ -508,15 +508,22 ＠＠ get_unallocated_leading_byte (int dimens
if (dimension == 1)
{
- if (chlook->next_allocated_1_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_1)
+ if (chlook->next_allocated_1_byte_leading_byte >
+ MAX_LEADING_BYTE_PRIVATE_1)
lb = 0;
else
lb = chlook->next_allocated_1_byte_leading_byte++;
}
else
{
- if (chlook->next_allocated_2_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_2)
- lb = 0;
+ /* awfully fragile, but correct */
+#if MAX_LEADING_BYTE_PRIVATE_2 == 255
+ if (chlook->next_allocated_2_byte_leading_byte == 0)
+#else
+ if (chlook->next_allocated_2_byte_leading_byte >
+ MAX_LEADING_BYTE_PRIVATE_2)
+#endif
+ lb = 0;
else
lb = chlook->next_allocated_2_byte_leading_byte++;
}
Index: src/mule-charset.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/mule-charset.h,v
retrieving revision 1.9
diff -u -p -r1.9 mule-charset.h
--- src/mule-charset.h 2001/04/12 18:24:03 1.9
+++ src/mule-charset.h 2005/01/30 00:26:51
＠＠ -697,7 +697,7 ＠＠ CHAR_LEADING_BYTE (Emchar c)
#ifdef ENABLE_COMPOSITE_CHARS
return LEADING_BYTE_COMPOSITE;
#else
- abort();
+ ABORT();
return 0;
#endif /* ENABLE_COMPOSITE_CHARS */
}
Index: src/native-gtk-toolbar.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/native-gtk-toolbar.c,v
retrieving revision 1.2
diff -u -p -r1.2 native-gtk-toolbar.c
--- src/native-gtk-toolbar.c 2001/04/12 18:24:06 1.2
+++ src/native-gtk-toolbar.c 2005/01/30 00:26:51
＠＠ -49,7 +49,7 ＠＠ Boston, MA 02111-1307, USA. */
(frame)->right_toolbar_was_visible = flag; \
break; \
default: \
- abort (); \
+ ABORT (); \
} \
} while (0)
Index: src/nt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/nt.c,v
retrieving revision 1.21.2.3
diff -u -p -r1.21.2.3 nt.c
--- src/nt.c 2002/08/20 11:37:43 1.21.2.3
+++ src/nt.c 2005/01/30 00:26:52
＠＠ -629,16 +629,16 ＠＠ init_environment (void)
renaming or deleting directories. (We also don't call chdir when
running subprocesses for the same reason.) */
if (!GetCurrentDirectory (MAXPATHLEN, startup_dir))
- abort ();
+ ABORT ();
{
char *p;
char modname[MAX_PATH];
if (!GetModuleFileName (NULL, modname, MAX_PATH))
- abort ();
+ ABORT ();
if ((p = strrchr (modname, '\\')) == NULL)
- abort ();
+ ABORT ();
*p = 0;
SetCurrentDirectory (modname);
＠＠ -1356,7 +1356,7 ＠＠ generate_inode_val (const char * name)
doesn't resolve aliasing due to subst commands, or recognize hard
links. */
if (!win32_get_long_filename ((char *)name, fullname, MAX_PATH))
- abort ();
+ ABORT ();
parse_root (fullname, &p);
/* Normal Win32 filesystems are still case insensitive. */
Index: src/ntproc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/ntproc.c,v
retrieving revision 1.21.2.1
diff -u -p -r1.21.2.1 ntproc.c
--- src/ntproc.c 2001/10/23 08:35:35 1.21.2.1
+++ src/ntproc.c 2005/01/30 00:26:52
＠＠ -170,7 +170,7 ＠＠ delete_child (child_process *cp)
/* Should not be deleting a child that is still needed. */
for (i = 0; i < MAXDESC; i++)
if (fd_info[i].cp == cp)
- abort ();
+ ABORT ();
if (!CHILD_ACTIVE (cp))
return;
＠＠ -252,7 +252,7 ＠＠ _sys_read_ahead (int fd)
|| (fd_info[fd].flags & FILE_READ) == 0)
{
/* fd is not a pipe or socket */
- abort ();
+ ABORT ();
}
cp->status = STATUS_READ_IN_PROGRESS;
＠＠ -404,7 +404,7 ＠＠ create_child (const char *exe, char *cmd
SECURITY_DESCRIPTOR sec_desc;
char dir[ MAXPATHLEN ];
- if (cp == NULL) abort ();
+ if (cp == NULL) ABORT ();
xzero (start);
start.cb = sizeof (start);
Index: src/objects.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects.c,v
retrieving revision 1.7
diff -u -p -r1.7 objects.c
--- src/objects.c 2001/04/12 18:24:10 1.7
+++ src/objects.c 2005/01/30 00:26:53
＠＠ -563,7 +563,7 ＠＠ color_instantiate (Lisp_Object specifier
XVECTOR_DATA (instantiator)[1], domain, ERROR_ME, 0, depth));
default:
- abort ();
+ ABORT ();
}
}
else if (NILP (instantiator))
＠＠ -575,7 +575,7 ＠＠ color_instantiate (Lisp_Object specifier
device);
}
else
- abort (); /* The spec validation routines are screwed up. */
+ ABORT (); /* The spec validation routines are screwed up. */
return Qunbound;
}
＠＠ -787,7 +787,7 ＠＠ font_instantiate (Lisp_Object specifier,
else if (NILP (instantiator))
return Qunbound;
else
- abort (); /* Eh? */
+ ABORT (); /* Eh? */
return Qunbound;
}
＠＠ -910,7 +910,7 ＠＠ face_boolean_instantiate (Lisp_Object sp
return retval;
}
else
- abort (); /* Eh? */
+ ABORT (); /* Eh? */
return Qunbound;
}
Index: src/print.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/print.c,v
retrieving revision 1.29.2.1
diff -u -p -r1.29.2.1 print.c
--- src/print.c 2003/01/03 09:59:48 1.29.2.1
+++ src/print.c 2005/01/30 00:26:53
＠＠ -977,9 +977,9 ＠＠ long_to_string (char *buffer, long numbe
number = -number;
}
-#define FROB(figure) do { \
- if (force || number >= figure) \
- *p++ = number / figure + '0', number %= figure, force = 1; \
+#define FROB(figure) do { \
+ if (force || number >= figure) \
+ *p++ = (char) (number / figure + '0'), number %= figure, force = 1; \
} while (0)
#if SIZEOF_LONG == 8
FROB (1000000000000000000L);
＠＠ -1002,7 +1002,7 ＠＠ long_to_string (char *buffer, long numbe
FROB (100);
FROB (10);
#undef FROB
- *p++ = number + '0';
+ *p++ = (char) (number + '0');
*p = '\0';
return p;
#endif /* (SIZEOF_LONG == 4) || (SIZEOF_LONG == 8) */
＠＠ -1246,12 +1246,12 ＠＠ printing_major_badness (Lisp_Object prin
break;
}
- /* Don't abort or signal if called from debug_print() or already
+ /* Don't ABORT or signal if called from debug_print() or already
crashing */
if (!inhibit_non_essential_printing_operations)
{
#ifdef ERROR_CHECK_TYPES
- abort ();
+ ABORT ();
#else /* not ERROR_CHECK_TYPES */
if (print_readably)
type_error (Qinternal_error, "printing %s", buf);
Index: src/process-nt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process-nt.c,v
retrieving revision 1.17.2.3
diff -u -p -r1.17.2.3 process-nt.c
--- src/process-nt.c 2002/08/20 11:37:45 1.17.2.3
+++ src/process-nt.c 2005/01/30 00:26:53
＠＠ -1054,7 +1054,7 ＠＠ nt_send_process (Lisp_Object proc, struc
chunklen = Lstream_read (lstream, chunkbuf, 512);
if (chunklen <= 0)
- break; /* perhaps should abort() if < 0?
+ break; /* perhaps should ABORT() if < 0?
This should never happen. */
/* Lstream_write() will never successfully write less than the
Index: src/process-unix.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process-unix.c,v
retrieving revision 1.20.2.7
diff -u -p -r1.20.2.7 process-unix.c
--- src/process-unix.c 2003/03/05 03:28:40 1.20.2.7
+++ src/process-unix.c 2005/01/30 00:26:54
＠＠ -1299,7 +1299,7 ＠＠ unix_send_process (Lisp_Object proc, str
chunklen = Lstream_read (lstream, chunkbuf, 512);
if (chunklen <= 0)
- break; /* perhaps should abort() if < 0?
+ break; /* perhaps should ABORT() if < 0?
This should never happen. */
old_sigpipe =
(SIGTYPE (*) (int)) signal (SIGPIPE, send_process_trap);
Index: src/process.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process.c,v
retrieving revision 1.41.2.5
diff -u -p -r1.41.2.5 process.c
--- src/process.c 2003/08/14 23:42:58 1.41.2.5
+++ src/process.c 2005/01/30 00:26:55
＠＠ -352,7 +352,7 ＠＠ get_process (Lisp_Object name)
#endif
/* This may be called during a GC from process_send_signal() from
- kill_buffer_processes() if emacs decides to abort(). */
+ kill_buffer_processes() if emacs decides to ABORT(). */
if (PROCESSP (name))
return name;
else if (STRINGP (name))
Index: src/ralloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ralloc.c,v
retrieving revision 1.12.2.1
diff -u -p -r1.12.2.1 ralloc.c
--- src/ralloc.c 2002/08/20 11:37:50 1.12.2.1
+++ src/ralloc.c 2005/01/30 00:26:55
＠＠ -254,7 +254,7 ＠＠ obtain (POINTER address, size_t size)
}
if (! heap)
- abort ();
+ ABORT ();
/* If we can't fit SIZE bytes in that heap,
try successive later heaps. */
＠＠ -360,7 +360,7 ＠＠ relinquish (void)
/* This heap should have no blocs in it. */
if (last_heap->first_bloc != NIL_BLOC
|| last_heap->last_bloc != NIL_BLOC)
- abort ();
+ ABORT ();
/* Return the last heap, with its header, to the system. */
excess = (char *)last_heap->end - (char *)last_heap->start;
＠＠ -375,7 +375,7 ＠＠ relinquish (void)
}
if ((*real_morecore) (- excess) == 0)
- abort ();
+ ABORT ();
}
}
＠＠ -478,7 +478,7 ＠＠ relocate_blocs (bloc_ptr bloc, heap_ptr
/* No need to ever call this if arena is frozen, bug somewhere! */
if (r_alloc_freeze_level)
- abort();
+ ABORT();
while (b)
{
＠＠ -633,7 +633,7 ＠＠ resize_bloc (bloc_ptr bloc, size_t size)
/* No need to ever call this if arena is frozen, bug somewhere! */
if (r_alloc_freeze_level)
- abort();
+ ABORT();
if (bloc == NIL_BLOC || size == bloc->size)
return 1;
＠＠ -645,7 +645,7 ＠＠ resize_bloc (bloc_ptr bloc, size_t size)
}
if (heap == NIL_HEAP)
- abort ();
+ ABORT ();
old_size = bloc->size;
bloc->size = size;
＠＠ -972,7 +972,7 ＠＠ r_alloc_free (POINTER *ptr)
dead_bloc = find_bloc (ptr);
if (dead_bloc == NIL_BLOC)
- abort ();
+ ABORT ();
free_bloc (dead_bloc);
*ptr = 0;
＠＠ -1015,7 +1015,7 ＠＠ r_re_alloc (POINTER *ptr, size_t size)
bloc = find_bloc (ptr);
if (bloc == NIL_BLOC)
- abort ();
+ ABORT ();
if (size < bloc->size)
{
＠＠ -1085,7 +1085,7 ＠＠ r_alloc_thaw (void)
init_ralloc ();
if (--r_alloc_freeze_level < 0)
- abort ();
+ ABORT ();
/* This frees all unused blocs. It is not too inefficient, as the resize
and memmove is done only once. Afterwards, all unreferenced blocs are
＠＠ -1129,7 +1129,7 ＠＠ init_ralloc (void)
first_heap->start = first_heap->bloc_start
= virtual_break_value = break_value = (*real_morecore) (0);
if (break_value == NIL)
- abort ();
+ ABORT ();
page_size = PAGE;
extra_bytes = ROUNDUP (50000);
＠＠ -1805,13 +1805,13 ＠＠ Free_Addr_Block (VM_ADDR addr, size_t sz
{
if (p->addr == addr)
{
- if (p->sz != sz) abort(); /* ACK! Shouldn't happen at all. */
+ if (p->sz != sz) ABORT(); /* ACK! Shouldn't happen at all. */
munmap( (VM_ADDR) p->addr, p->sz );
p->flag = empty;
break;
}
}
- if (!p) abort(); /* Can't happen... we've got a block to free which is not in
+ if (!p) ABORT(); /* Can't happen... we've got a block to free which is not in
the address list. */
Coalesce_Addr_Blocks();
}
＠＠ -1857,7 +1857,7 ＠＠ r_alloc (POINTER *ptr, size_t size)
switch(r_alloc_initialized)
{
case 0:
- abort();
+ ABORT();
case 1:
*ptr = (POINTER) UNDERLYING_MALLOC(size);
break;
＠＠ -1898,7 +1898,7 ＠＠ r_alloc_free (POINTER *ptr)
{
switch( r_alloc_initialized) {
case 0:
- abort();
+ ABORT();
case 1:
UNDERLYING_FREE( *ptr ); /* Certain this is from the heap. */
＠＠ -1940,7 +1940,7 ＠＠ r_re_alloc (POINTER *ptr, size_t sz)
{
if (r_alloc_initialized == 0)
{
- abort ();
+ ABORT ();
return 0; /* suppress compiler warning */
}
else if (r_alloc_initialized == 1)
Index: src/redisplay-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-gtk.c,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 redisplay-gtk.c
--- src/redisplay-gtk.c 2002/08/20 11:37:52 1.2.2.2
+++ src/redisplay-gtk.c 2005/01/30 00:26:56
＠＠ -460,7 +460,7 ＠＠ gtk_output_display_block (struct window
break;
case IMAGE_POINTER:
- abort ();
+ ABORT ();
case IMAGE_WIDGET:
if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance),
＠＠ -484,14 +484,14 ＠＠ gtk_output_display_block (struct window
break;
default:
- abort ();
+ ABORT ();
}
xpos += rb->width;
elt++;
}
else
- abort ();
+ ABORT ();
}
}
Index: src/redisplay-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-msw.c,v
retrieving revision 1.29.2.1
diff -u -p -r1.29.2.1 redisplay-msw.c
--- src/redisplay-msw.c 2002/08/20 11:37:55 1.29.2.1
+++ src/redisplay-msw.c 2005/01/30 00:26:56
＠＠ -1216,7 +1216,7 ＠＠ mswindows_output_display_block (struct w
case IMAGE_TEXT:
case IMAGE_POINTER:
default:
- abort ();
+ ABORT ();
}
IMAGE_INSTANCE_OPTIMIZE_OUTPUT
(XIMAGE_INSTANCE (instance)) = 0;
＠＠ -1225,7 +1225,7 ＠＠ mswindows_output_display_block (struct w
elt++;
}
else
- abort ();
+ ABORT ();
}
}
Index: src/redisplay-output.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-output.c,v
retrieving revision 1.12.2.3
diff -u -p -r1.12.2.3 redisplay-output.c
--- src/redisplay-output.c 2002/10/31 15:08:32 1.12.2.3
+++ src/redisplay-output.c 2005/01/30 00:26:57
＠＠ -334,7 +334,7 ＠＠ get_next_display_block (layout_bounds bo
else if (start_pos <= bounds.right_out)
*next_start = bounds.right_out;
else
- abort ();
+ ABORT ();
}
for (block = 0; block < Dynarr_length (dba); block++)
＠＠ -377,7 +377,7 ＠＠ get_cursor_size_and_location (struct win
int defheight, defwidth;
if (Dynarr_length (db->runes) <= cursor_location)
- abort ();
+ ABORT ();
XSETWINDOW (window, w);
＠＠ -1520,7 +1520,7 ＠＠ redisplay_output_layout (Lisp_Object dom
case IMAGE_POINTER:
default:
- abort ();
+ ABORT ();
}
}
IMAGE_INSTANCE_OPTIMIZE_OUTPUT (childii) = 0;
＠＠ -1632,7 +1632,7 ＠＠ redisplay_clear_region (Lisp_Object loca
f = XFRAME (locale);
}
else
- abort ();
+ ABORT ();
d = XDEVICE (f->device);
Index: src/redisplay-tty.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-tty.c,v
retrieving revision 1.16
diff -u -p -r1.16 redisplay-tty.c
--- src/redisplay-tty.c 2001/04/12 18:24:14 1.16
+++ src/redisplay-tty.c 2005/01/30 00:26:57
＠＠ -345,7 +345,7 ＠＠ tty_output_display_block (struct window
case IMAGE_TEXT:
case IMAGE_POINTER:
default:
- abort ();
+ ABORT ();
}
IMAGE_INSTANCE_OPTIMIZE_OUTPUT
(XIMAGE_INSTANCE (instance)) = 0;
＠＠ -355,7 +355,7 ＠＠ tty_output_display_block (struct window
elt++;
}
else
- abort ();
+ ABORT ();
}
}
Index: src/redisplay-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-x.c,v
retrieving revision 1.25.2.4
diff -u -p -r1.25.2.4 redisplay-x.c
--- src/redisplay-x.c 2004/03/15 03:34:59 1.25.2.4
+++ src/redisplay-x.c 2005/01/30 00:26:58
＠＠ -482,7 +482,7 ＠＠ x_output_display_block (struct window *w
case IMAGE_TEXT:
case IMAGE_POINTER:
default:
- abort ();
+ ABORT ();
}
IMAGE_INSTANCE_OPTIMIZE_OUTPUT
(XIMAGE_INSTANCE (instance)) = 0;
＠＠ -492,7 +492,7 ＠＠ x_output_display_block (struct window *w
elt++;
}
else
- abort ();
+ ABORT ();
}
}
Index: src/redisplay.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay.c,v
retrieving revision 1.62.2.3
diff -u -p -r1.62.2.3 redisplay.c
--- src/redisplay.c 2002/10/31 15:08:34 1.62.2.3
+++ src/redisplay.c 2005/01/30 00:27:00
＠＠ -1635,7 +1635,7 ＠＠ add_propagation_runes (prop_block_dynarr
}
break;
default:
- abort ();
+ ABORT ();
}
}
＠＠ -1830,7 +1830,7 ＠＠ add_glyph_rune (pos_data *data, struct g
/* Otherwise something is screwed up. */
else
- abort ();
+ ABORT ();
}
face = glyph_face (gb->glyph, data->window);
＠＠ -1938,7 +1938,7 ＠＠ add_glyph_rune (pos_data *data, struct g
return NULL;
}
else
- abort (); /* there are no unknown types */
+ ABORT (); /* there are no unknown types */
}
return NULL;
＠＠ -2511,7 +2511,7 ＠＠ create_text_block (struct window *w, str
/* This had better be a newline but doing it this way
we'll see obvious incorrect results if it isn't. No
- need to abort here. */
+ need to ABORT here. */
data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
goto done;
＠＠ -2989,7 +2989,7 ＠＠ add_margin_runes (struct display_line *d
struct glyph_block *gb = Dynarr_atp (gbd, elt);
if (NILP (gb->extent))
- abort (); /* these should have been handled in add_glyph_rune */
+ ABORT (); /* these should have been handled in add_glyph_rune */
if (gb->active &&
((side == LEFT_GLYPHS &&
＠＠ -3074,7 +3074,7 ＠＠ create_left_glyph_block (struct window *
struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
if (NILP (gb->extent))
- abort (); /* these should have been handled in add_glyph_rune */
+ ABORT (); /* these should have been handled in add_glyph_rune */
if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
{
＠＠ -3126,7 +3126,7 ＠＠ create_left_glyph_block (struct window *
struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
if (NILP (gb->extent))
- abort (); /* these should have been handled in add_glyph_rune */
+ ABORT (); /* these should have been handled in add_glyph_rune */
if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
GL_INSIDE_MARGIN)
＠＠ -3195,7 +3195,7 ＠＠ create_left_glyph_block (struct window *
struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
if (NILP (gb->extent))
- abort (); /* these should have been handled in add_glyph_rune */
+ ABORT (); /* these should have been handled in add_glyph_rune */
if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
GL_INSIDE_MARGIN)
＠＠ -3237,7 +3237,7 ＠＠ create_left_glyph_block (struct window *
struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
if (NILP (gb->extent))
- abort (); /* these should have been handled in add_glyph_rune */
+ ABORT (); /* these should have been handled in add_glyph_rune */
if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
GL_OUTSIDE_MARGIN)
＠＠ -3395,7 +3395,7 ＠＠ create_right_glyph_block (struct window
struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
if (NILP (gb->extent))
- abort (); /* these should have been handled in add_glyph_rune */
+ ABORT (); /* these should have been handled in add_glyph_rune */
if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
{
＠＠ -3445,7 +3445,7 ＠＠ create_right_glyph_block (struct window
struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
if (NILP (gb->extent))
- abort (); /* these should have been handled in add_glyph_rune */
+ ABORT (); /* these should have been handled in add_glyph_rune */
if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
{
＠＠ -3509,7 +3509,7 ＠＠ create_right_glyph_block (struct window
struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
if (NILP (gb->extent))
- abort (); /* these should have been handled in add_glyph_rune */
+ ABORT (); /* these should have been handled in add_glyph_rune */
if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
{
＠＠ -3550,7 +3550,7 ＠＠ create_right_glyph_block (struct window
struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
if (NILP (gb->extent))
- abort (); /* these should have been handled in add_glyph_rune */
+ ABORT (); /* these should have been handled in add_glyph_rune */
if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
{
＠＠ -4740,7 +4740,7 ＠＠ create_string_text_block (struct window
else if (data.bi_bufpos == bi_string_zv)
goto done;
else if (data.bi_bufpos < 0)
- /* #### urk urk urk! Aborts are not very fun! Fix this please! */
+ /* #### urk urk urk! ABORTs are not very fun! Fix this please! */
data.bi_bufpos = 0;
else
INC_CHARBYTIND (string_data (s), data.bi_bufpos);
＠＠ -5291,7 +5291,7 ＠＠ regenerate_window (struct window *w, Buf
/* The lines had better exist by this point. */
if (!(dla = window_display_lines (w, type)))
- abort ();
+ ABORT ();
Dynarr_reset (dla);
w->max_line_len = 0;
＠＠ -5483,7 +5483,7 ＠＠ regenerate_window (struct window *w, Buf
dla_start = 0; \
} \
else \
- abort (); /* structs differ */ \
+ ABORT (); /* structs differ */ \
\
dla_end = Dynarr_length (cdla) - 1; \
} \
＠＠ -6505,7 +6505,7 ＠＠ redisplay_frame (struct frame *f, int pr
/* The menubar, toolbar, and icon updates must be done before
hold_frame_size_changes is called and we are officially
'in_display'. They may eval lisp code which may call Fsignal.
- If in_display is set Fsignal will abort. */
+ If in_display is set Fsignal will ABORT. */
#ifdef HAVE_MENUBARS
/* Update the menubar. It is done first since it could change
＠＠ -6565,10 +6565,10 ＠＠ redisplay_frame (struct frame *f, int pr
We need to remove them.
If Fsignal() is called during this critical section, we
- will abort().
+ will ABORT().
If garbage collection is called during this critical section,
- we simply return. #### We should abort instead.
+ we simply return. #### We should ABORT instead.
#### If a frame-size change does occur we should probably
actually be preempting redisplay. */
＠＠ -7493,7 +7493,7 ＠＠ point_in_line_start_cache (struct window
int win_char_height = window_char_height (w, 1);
/* Occasionally we get here with a 0 height
- window. find_next_newline_no_quit will abort if we pass it a
+ window. find_next_newline_no_quit will ABORT if we pass it a
count of 0 so handle that case. */
if (!win_char_height)
win_char_height = 1;
＠＠ -7645,7 +7645,7 ＠＠ find_point_loop:
else if (point < start)
top = pos - 1;
else
- abort ();
+ ABORT ();
new_pos = (bottom + top + 1) >> 1;
if (pos == new_pos)
Index: src/regex.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
retrieving revision 1.25.2.11
diff -u -p -r1.25.2.11 regex.c
--- src/regex.c 2005/01/16 02:38:58 1.25.2.11
+++ src/regex.c 2005/01/30 00:27:02
＠＠ -119,6 +119,8 ＠＠ complex_vars_of_regex (void)
#else /* not emacs */
+#define ABORT abort
+
/* If we are not linking with Emacs proper,
we can't use the relocating allocator
even if config.h says that we can. */
＠＠ -3923,7 +3925,7 ＠＠ re_compile_fastmap (struct re_pattern_bu
default:
- abort (); /* We have listed all the cases. */
+ ABORT (); /* We have listed all the cases. */
} /* switch *p++ */
/* Getting here means we have found the possible starting
＠＠ -5884,7 +5886,7 ＠＠ re_match_2_internal (struct re_pattern_b
#endif /* emacs */
default:
- abort ();
+ ABORT ();
}
continue; /* Successfully executed one pattern command; keep going. */
＠＠ -6504,7 +6506,7 ＠＠ regerror (int errcode, const regex_t *pr
to this routine. If we are given anything else, or if other regex
code generates an invalid error code, then the program has a bug.
Dump core so we can fix it. */
- abort ();
+ ABORT ();
msg = gettext (re_error_msgid[errcode]);
Index: src/scrollbar-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-gtk.c,v
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.3 scrollbar-gtk.c
--- src/scrollbar-gtk.c 2004/08/13 03:23:26 1.2.2.3
+++ src/scrollbar-gtk.c 2005/01/30 00:27:02
＠＠ -364,7 +364,7 ＠＠ gtk_scrollbar_loop (enum gtk_scrollbar_l
}
break;
default:
- abort ();
+ ABORT ();
}
}
＠＠ -438,7 +438,7 ＠＠ scrollbar_cb (GtkAdjustment *adj, gpoint
event_data = Fcons (win, make_int ((int)adj->value));
break;
default:
- abort();
+ ABORT();
}
signal_special_gtk_user_event (frame, event_type, event_data);
＠＠ -462,13 +462,13 ＠＠ gtk_scrollbar_pointer_changed_in_window
void
gtk_update_frame_scrollbars (struct frame *f)
{
- /* Consider this code to be "in_display" so that we abort() if Fsignal()
+ /* Consider this code to be "in_display" so that we ABORT() if Fsignal()
gets called. */
in_display++;
gtk_scrollbar_loop (GTK_UPDATE_FRAME_SCROLLBARS, f->root_window, f->root_mirror,
0, (GdkWindow *) NULL);
in_display--;
- if (in_display < 0) abort ();
+ if (in_display < 0) ABORT ();
}
#ifdef MEMORY_USAGE_STATS
Index: src/scrollbar-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-msw.c,v
retrieving revision 1.11.2.4
diff -u -p -r1.11.2.4 scrollbar-msw.c
--- src/scrollbar-msw.c 2002/08/20 11:38:07 1.11.2.4
+++ src/scrollbar-msw.c 2005/01/30 00:27:02
＠＠ -210,7 +210,7 ＠＠ mswindows_handle_scrollbar_event (HWND h
/* "0 as the second parameter" refers to the call to real_window
above. This comment was taken from Ben's 21.5 code that differs
somewhat from this, I don't think the 21.4 code ever had a 0
- there. #### we're still hitting an abort here with 0 as the
+ there. #### we're still hitting an ABORT here with 0 as the
second parameter, although only occasionally. It seems that
sometimes we receive events for scrollbars that don't exist
anymore. I assume it must happen like this: The user does
Index: src/scrollbar-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-x.c,v
retrieving revision 1.17
diff -u -p -r1.17 scrollbar-x.c
--- src/scrollbar-x.c 2001/04/12 18:24:17 1.17
+++ src/scrollbar-x.c 2005/01/30 00:27:02
＠＠ -280,7 +280,7 ＠＠ x_update_scrollbar_instance_status (stru
}
}
- if (!wv->scrollbar_data) abort ();
+ if (!wv->scrollbar_data) ABORT ();
free_widget_value_tree (wv);
}
else if (managed)
＠＠ -366,7 +366,7 ＠＠ x_scrollbar_loop (enum x_scrollbar_loop
}
break;
default:
- abort ();
+ ABORT ();
}
}
＠＠ -685,13 +685,13 ＠＠ x_scrollbar_pointer_changed_in_window (s
void
x_update_frame_scrollbars (struct frame *f)
{
- /* Consider this code to be "in_display" so that we abort() if Fsignal()
+ /* Consider this code to be "in_display" so that we ABORT() if Fsignal()
gets called. */
in_display++;
x_scrollbar_loop (X_UPDATE_FRAME_SCROLLBARS, f->root_window, f->root_mirror,
0, (Window) NULL);
in_display--;
- if (in_display < 0) abort ();
+ if (in_display < 0) ABORT ();
}
#ifdef MEMORY_USAGE_STATS
Index: src/search.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/search.c,v
retrieving revision 1.17.2.7
diff -u -p -r1.17.2.7 search.c
--- src/search.c 2004/06/12 17:44:14 1.17.2.7
+++ src/search.c 2005/01/30 00:27:03
＠＠ -1084,7 +1084,7 ＠＠ search_command (Lisp_Object string, Lisp
if (!EQ (noerror, Qt))
{
if (lim < BUF_BEGV (buf) || lim > BUF_ZV (buf))
- abort ();
+ ABORT ();
BUF_SET_PT (buf, lim);
return Qnil;
#if 0 /* This would be clean, but maybe programs depend on
＠＠ -1097,7 +1097,7 ＠＠ search_command (Lisp_Object string, Lisp
}
if (np < BUF_BEGV (buf) || np > BUF_ZV (buf))
- abort ();
+ ABORT ();
BUF_SET_PT (buf, np);
＠＠ -2837,7 +2837,7 ＠＠ to hold all the values, and if INTEGERS
}
else
/* last_thing_searched must always be Qt, a buffer, or Qnil. */
- abort ();
+ ABORT ();
len = i;
}
Index: src/select-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/select-x.c,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 select-x.c
--- src/select-x.c 2002/08/20 11:38:10 1.2.2.1
+++ src/select-x.c 2005/01/30 00:27:03
＠＠ -382,7 +382,7 ＠＠ motif_clipboard_cb (Widget widget, int *
Window window = (Window) *private_id;
Lisp_Object selection = select_convert_out (QCLIPBOARD, Qnil, Qnil);
- /* Whichever lazy git wrote this originally just called abort()
+ /* Whichever lazy git wrote this originally just called ABORT()
when anything didn't go their way... */
/* Try some other text types */
Index: src/signal.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/signal.c,v
retrieving revision 1.13.2.1
diff -u -p -r1.13.2.1 signal.c
--- src/signal.c 2001/10/23 08:35:39 1.13.2.1
+++ src/signal.c 2005/01/30 00:27:03
＠＠ -439,7 +439,7 ＠＠ interrupt_signal (int sig)
c = getc (stdin);
stdout_out ("Abort (and dump core)? (y or n) ");
if (((c = getc (stdin)) & ~040) == 'Y')
- abort ();
+ ABORT ();
while (c != '\n')
c = getc (stdin);
stdout_out ("Continuing...\n");
Index: src/specifier.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.c,v
retrieving revision 1.17.2.1
diff -u -p -r1.17.2.1 specifier.c
--- src/specifier.c 2002/12/12 06:21:32 1.17.2.1
+++ src/specifier.c 2005/01/30 00:27:04
＠＠ -1787,7 +1787,7 ＠＠ specifier_add_spec (Lisp_Object specifie
tem = nconc2 (*orig_inst_list, list_to_build_up);
else
{
- abort ();
+ ABORT ();
tem = Qnil;
}
＠＠ -2494,7 +2494,7 ＠＠ specifier_instance_from_inst_list (Lisp_
/* The instantiate method is allowed to call eval. Since it
is quite common for this function to get called from somewhere in
redisplay we need to make sure that quits are ignored. Otherwise
- Fsignal will abort. */
+ Fsignal will ABORT. */
specbind (Qinhibit_quit, Qt);
LIST_LOOP (rest, inst_list)
＠＠ -2580,7 +2580,7 ＠＠ specifier_instance (Lisp_Object specifie
No. Errors are handled in Lisp primitives implementation.
Invalid domain is a design error here - kkm. */
- abort ();
+ ABORT ();
if (NILP (buffer) && !NILP (window))
buffer = WINDOW_BUFFER (XWINDOW (window));
＠＠ -2591,7 +2591,7 ＠＠ specifier_instance (Lisp_Object specifie
really went wrong. */
device = FRAME_DEVICE (XFRAME (frame));
- /* device had better be determined by now; abort if not. */
+ /* device had better be determined by now; ABORT if not. */
tag = DEVICE_CLASS (XDEVICE (device));
depth = make_int (1 + XINT (depth));
Index: src/specifier.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.h,v
retrieving revision 1.7
diff -u -p -r1.7 specifier.h
--- src/specifier.h 2001/04/12 18:24:19 1.7
+++ src/specifier.h 2005/01/30 00:27:04
＠＠ -154,7 +154,7 ＠＠ struct specifier_methods
This method must presume that both INSTANTIATOR and MATCHSPEC are
already validated by the corresponding validate_* methods, and
- may abort if they are invalid.
+ may ABORT if they are invalid.
Return value is an instance, which is returned immediately to the
caller, or Qunbound to continue instantiation lookup chain.
＠＠ -417,7 +417,7 ＠＠ struct specifier_caching
/* #### get image instances out of domains! */
-/* #### I think the following should abort() rather than return nil
+/* #### I think the following should ABORT() rather than return nil
when an invalid domain is given; much more likely we'll catch design
errors early. --ben */
Index: src/strftime.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/strftime.c,v
retrieving revision 1.4
diff -u -p -r1.4 strftime.c
--- src/strftime.c 2001/04/12 18:24:20 1.4
+++ src/strftime.c 2005/01/30 00:27:05
＠＠ -193,7 +193,7 ＠＠ add_num_time_t (char *string, int max, t
int length;
if (sizeof (num) > 16)
- abort ();
+ ABORT ();
sprintf (buf, "%lu", (unsigned long) num);
length = add_str (string, buf, max);
return length;
Index: src/sunplay.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sunplay.c,v
retrieving revision 1.6
diff -u -p -r1.6 sunplay.c
--- src/sunplay.c 2001/04/12 18:24:20 1.6
+++ src/sunplay.c 2005/01/30 00:27:05
＠＠ -76,7 +76,7 ＠＠ init_device (int volume, unsigned char *
reset_volume_p = 0;
reset_device_p = 0;
- if (data && fd) abort (); /* one or the other */
+ if (data && fd) ABORT (); /* one or the other */
if (AUDIO_SUCCESS != audio_get_play_config (audio_fd, &dev_hdr))
{
Index: src/symbols.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v
retrieving revision 1.25.2.2
diff -u -p -r1.25.2.2 symbols.c
--- src/symbols.c 2003/09/14 01:43:34 1.25.2.2
+++ src/symbols.c 2005/01/30 00:27:05
＠＠ -735,7 +735,7 ＠＠ Set SYMBOL's property list to NEWPLIST,
#if 0 /* Inserted for debugging 6/28/1997 -slb */
/* Somebody is setting a property list of integer 0, who? */
/* Not this way apparently. */
- if (EQ(newplist, Qzero)) abort();
+ if (EQ(newplist, Qzero)) ABORT();
#endif
XSYMBOL (symbol)->plist = newplist;
＠＠ -1118,7 +1118,7 ＠＠ do_symval_forwarding (Lisp_Object valcon
return valcontents;
default:
- abort ();
+ ABORT ();
}
return Qnil; /* suppress compiler warning */
}
＠＠ -1294,7 +1294,7 ＠＠ store_symval_forwarding (Lisp_Object sym
return;
default:
- abort ();
+ ABORT ();
}
}
}
＠＠ -1890,7 +1890,7 ＠＠ Set SYMBOL's value to NEWVAL, and return
break;
}
default:
- abort ();
+ ABORT ();
}
store_symval_forwarding (symbol, valcontents, newval);
＠＠ -2159,7 +2159,7 ＠＠ sets it.
return variable;
default:
- abort ();
+ ABORT ();
}
}
＠＠ -2269,7 +2269,7 ＠＠ Use `make-local-hook' instead.
}
default:
- abort ();
+ ABORT ();
}
}
＠＠ -2344,7 +2344,7 ＠＠ Use `make-local-hook' instead.
break;
default:
- abort ();
+ ABORT ();
}
}
＠＠ -2662,7 +2662,7 ＠＠ The returned info will be a symbol, one
case SYMVAL_UNBOUND_MARKER: return Qnil;
default:
- abort (); return Qnil;
+ ABORT (); return Qnil;
}
}
＠＠ -2860,7 +2860,7 ＠＠ decode_magic_handler_type (Lisp_Object s
if (EQ (symbol, Qmake_local)) return MAGIC_HANDLER_MAKE_LOCAL;
signal_simple_error ("Unrecognized symbol value handler type", symbol);
- abort ();
+ ABORT ();
return MAGIC_HANDLER_MAX;
}
＠＠ -2893,7 +2893,7 ＠＠ handler_type_from_function_symbol (Lisp_
return MAGIC_HANDLER_MAKE_LOCAL;
if (abort_if_not_found)
- abort ();
+ ABORT ();
signal_simple_error ("Unrecognized symbol-value function", funsym);
return MAGIC_HANDLER_MAX;
}
Index: src/syntax.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syntax.c,v
retrieving revision 1.9.2.3
diff -u -p -r1.9.2.3 syntax.c
--- src/syntax.c 2003/01/15 12:18:02 1.9.2.3
+++ src/syntax.c 2005/01/30 00:27:06
＠＠ -413,7 +413,7 ＠＠ update_syntax_cache (int pos, int count)
else
{
tmp_table = Qnil; /* silence compiler */
- /* Always aborts. #### Is there another sensible thing to do here? */
+ /* Always ABORTs. #### Is there another sensible thing to do here? */
assert (BUFFERP (syntax_cache.object) || STRINGP (syntax_cache.object));
}
Index: src/sysdep.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysdep.c,v
retrieving revision 1.38.2.4
diff -u -p -r1.38.2.4 sysdep.c
--- src/sysdep.c 2004/04/20 02:56:34 1.38.2.4
+++ src/sysdep.c 2005/01/30 00:27:07
＠＠ -30,23 +30,6 ＠＠ Boston, MA 02111-1307, USA. */
#define DONT_ENCAPSULATE
#include <config.h>
-
-#ifdef WIN32_NATIVE
-#ifdef MINGW
-#include <../mingw/process.h>
-#else
-/* <process.h> should not conflict with "process.h", as per ANSI
definition.
- This is not true with visual c though. The trick below works with
- VC4.2b, 5.0 and 6.0. It assumes that VC is installed in a kind of
- standard way, so include path ends with /include.
-
- Unfortunately, this must go before lisp.h, since process.h defines abort()
- which will conflict with the macro defined in lisp.h
-*/
-#include <../include/process.h>
-#endif /* MINGW */
-#endif /* WIN32_NATIVE */
-
#include "lisp.h"
/* ------------------------------- */
＠＠ -94,6 +77,19 ＠＠ Boston, MA 02111-1307, USA. */
#include "nt.h"
#endif
+#ifdef WIN32_NATIVE
+#ifdef MINGW
+#include <../mingw/process.h>
+#else
+/* <process.h> should not conflict with "process.h", as per ANSI
definition.
+ This is not true with visual c though. The trick below works with
+ VC4.2b, 5.0 and 6.0. It assumes that VC is installed in a kind of
+ standard way, so include path ends with /include.
+*/
+#include <../include/process.h>
+#endif /* MINGW */
+#endif /* WIN32_NATIVE */
+
/* ------------------------------- */
/* TTY definitions */
/* ------------------------------- */
＠＠ -975,7 +971,7 ＠＠ init_baud_rate (struct device *d)
sg.sg_ospeed = B9600;
if (ioctl (input_fd, TIOCGETP, &sg) < 0)
- abort ();
+ ABORT ();
DEVICE_TTY_DATA (d)->ospeed = sg.sg_ospeed;
#endif
}
Index: src/toolbar-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar-gtk.c,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 toolbar-gtk.c
--- src/toolbar-gtk.c 2002/08/20 11:38:18 1.2.2.1
+++ src/toolbar-gtk.c 2005/01/30 00:27:07
＠＠ -389,7 +389,7 ＠＠ gtk_get_button_size (struct frame *f, Li
(frame)->right_toolbar_was_visible = flag; \
break; \
default: \
- abort (); \
+ ABORT (); \
} \
} while (0)
Index: src/toolbar-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar-msw.c,v
retrieving revision 1.14.2.1
diff -u -p -r1.14.2.1 toolbar-msw.c
--- src/toolbar-msw.c 2002/08/20 11:38:19 1.14.2.1
+++ src/toolbar-msw.c 2005/01/30 00:27:08
＠＠ -71,7 +71,7 ＠＠ mswindows_move_toolbar (struct frame *f,
(frame)->right_toolbar_was_visible = flag; \
break; \
default: \
- abort (); \
+ ABORT (); \
} \
} while (0)
Index: src/toolbar-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar-x.c,v
retrieving revision 1.13.2.1
diff -u -p -r1.13.2.1 toolbar-x.c
--- src/toolbar-x.c 2002/08/20 11:38:20 1.13.2.1
+++ src/toolbar-x.c 2005/01/30 00:27:08
＠＠ -401,7 +401,7 ＠＠ x_get_button_size (struct frame *f, Lisp
(frame)->right_toolbar_was_visible = flag; \
break; \
default: \
- abort (); \
+ ABORT (); \
} \
} while (0)
Index: src/toolbar.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar.c,v
retrieving revision 1.19.2.1
diff -u -p -r1.19.2.1 toolbar.c
--- src/toolbar.c 2002/08/20 11:38:21 1.19.2.1
+++ src/toolbar.c 2005/01/30 00:27:08
＠＠ -908,7 +908,7 ＠＠ get_toolbar_coords (struct frame *f, enu
*vert = 1;
break;
default:
- abort ();
+ ABORT ();
}
}
Index: src/ui-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ui-gtk.c,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 ui-gtk.c
--- src/ui-gtk.c 2004/07/07 02:25:57 1.2.2.2
+++ src/ui-gtk.c 2005/01/30 00:27:08
＠＠ -1156,7 +1156,7 ＠＠ Lisp_Object build_gtk_boxed (void *obj,
emacs_gtk_boxed_data *data = NULL;
if (GTK_FUNDAMENTAL_TYPE (t) != GTK_TYPE_BOXED)
- abort();
+ ABORT();
data = allocate_emacs_gtk_boxed_data ();
data->object = obj;
＠＠ -1421,13 +1421,13 ＠＠ void describe_gtk_arg (GtkArg *arg)
/* structured types */
case GTK_TYPE_SIGNAL:
case GTK_TYPE_ARGS: /* This we can do as a list of values */
- abort();
+ ABORT();
case GTK_TYPE_CALLBACK:
stderr_out ("callback fn: ...\n");
break;
case GTK_TYPE_C_CALLBACK:
case GTK_TYPE_FOREIGN:
- abort();
+ ABORT();
/* base type of the object system */
case GTK_TYPE_OBJECT:
＠＠ -1438,7 +1438,7 ＠＠ void describe_gtk_arg (GtkArg *arg)
break;
default:
- abort();
+ ABORT();
}
}
＠＠ -1518,7 +1518,7 ＠＠ Lisp_Object gtk_type_to_lisp (GtkArg *ar
}
}
stderr_out ("Do not know how to convert `%s' to lisp!\n",
gtk_type_name (arg->type));
- abort ();
+ ABORT ();
}
/* This is chuck reminding GCC to... SHUT UP! */
return (Qnil);
＠＠ -1571,7 +1571,7 ＠＠ int lisp_to_gtk_type (Lisp_Object obj, G
break;
case GTK_TYPE_LONG:
case GTK_TYPE_ULONG:
- abort();
+ ABORT();
case GTK_TYPE_FLOAT:
CHECK_INT_OR_FLOAT (obj);
GTK_VALUE_FLOAT(*arg) = extract_float (obj);
＠＠ -1789,7 +1789,7 ＠＠ int lisp_to_gtk_type (Lisp_Object obj, G
else
{
stderr_out ("Do not know how to convert `%s' from lisp!\n",
gtk_type_name (arg->type));
- abort();
+ ABORT();
}
break;
}
＠＠ -1850,7 +1850,7 ＠＠ int lisp_to_gtk_ret_type (Lisp_Object ob
break;
case GTK_TYPE_LONG:
case GTK_TYPE_ULONG:
- abort();
+ ABORT();
case GTK_TYPE_FLOAT:
CHECK_INT_OR_FLOAT (obj);
*(GTK_RETLOC_FLOAT(*arg)) = extract_float (obj);
＠＠ -2068,7 +2068,7 ＠＠ int lisp_to_gtk_ret_type (Lisp_Object ob
else
{
stderr_out ("Do not know how to convert `%s' from lisp!\n",
gtk_type_name (arg->type));
- abort();
+ ABORT();
}
break;
}
＠＠ -2143,7 +2143,7 ＠＠ lisp_to_flag (Lisp_Object obj, GtkType t
}
else
{
- /* abort ()? */
+ /* ABORT ()? */
}
return (val);
}
Index: src/unexnt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexnt.c,v
retrieving revision 1.9
diff -u -p -r1.9 unexnt.c
--- src/unexnt.c 2001/04/12 18:24:28 1.9
+++ src/unexnt.c 2005/01/30 00:27:09
＠＠ -511,17 +511,17 ＠＠ read_in_bss (char *filename)
file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
if (file == INVALID_HANDLE_VALUE)
- abort ();
+ ABORT ();
/* Seek to where the .bss section is tucked away after the heap... */
index = heap_index_in_executable + get_committed_heap_size ();
if (SetFilePointer (file, index, NULL, FILE_BEGIN) == 0xFFFFFFFF)
- abort ();
+ ABORT ();
/* Ok, read in the saved .bss section and initialize all
uninitialized variables. */
if (!ReadFile (file, bss_start, bss_size, &n_read, NULL))
- abort ();
+ ABORT ();
CloseHandle (file);
#endif
＠＠ -539,13 +539,13 ＠＠ map_in_heap (char *filename)
file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
if (file == INVALID_HANDLE_VALUE)
- abort ();
+ ABORT ();
size = GetFileSize (file, &upper_size);
file_mapping = CreateFileMapping (file, NULL, PAGE_WRITECOPY,
0, size, NULL);
if (!file_mapping)
- abort ();
+ ABORT ();
size = get_committed_heap_size ();
file_base = MapViewOfFileEx (file_mapping, FILE_MAP_COPY, 0,
＠＠ -563,17 +563,17 ＠＠ map_in_heap (char *filename)
if (VirtualAlloc (get_heap_start (), get_committed_heap_size (),
MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE) == NULL)
- abort ();
+ ABORT ();
/* Seek to the location of the heap data in the executable. */
if (SetFilePointer (file, heap_index_in_executable,
NULL, FILE_BEGIN) == 0xFFFFFFFF)
- abort ();
+ ABORT ();
/* Read in the data. */
if (!ReadFile (file, get_heap_start (),
get_committed_heap_size (), &n_read, NULL))
- abort ();
+ ABORT ();
CloseHandle (file);
}
Index: src/window.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window.c,v
retrieving revision 1.52.2.5
diff -u -p -r1.52.2.5 window.c
--- src/window.c 2005/01/23 16:23:05 1.52.2.5
+++ src/window.c 2005/01/30 00:27:10
＠＠ -492,7 +492,7 ＠＠ real_window (struct window_mirror *mir,
Lisp_Object retval = real_window_internal (mir->frame->root_window,
mir->frame->root_mirror, mir);
if (NILP (retval) && !no_abort)
- abort ();
+ ABORT ();
return retval;
}
＠＠ -554,7 +554,7 ＠＠ window_display_lines (struct window *w,
update_frame_window_mirror (XFRAME (w->frame));
t = find_window_mirror (w);
if (!t)
- abort ();
+ ABORT ();
if (which == CURRENT_DISP)
return t->current_display_lines;
＠＠ -564,7 +564,7 ＠＠ window_display_lines (struct window *w,
/* The CMOTION_DISP display lines are global. */
return cmotion_display_lines;
else
- abort ();
+ ABORT ();
return 0; /* shut up compiler */
}
＠＠ -578,7 +578,7 ＠＠ window_display_buffer (struct window *w)
update_frame_window_mirror (XFRAME (w->frame));
t = find_window_mirror (w);
if (!t)
- abort ();
+ ABORT ();
return t->buffer;
}
＠＠ -592,7 +592,7 ＠＠ set_window_display_buffer (struct window
update_frame_window_mirror (XFRAME (w->frame));
t = find_window_mirror (w);
if (!t)
- abort ();
+ ABORT ();
t->buffer = b;
}
＠＠ -923,7 +923,7 ＠＠ window_modeline_height (struct window *w
modeline_height = (Dynarr_atp (dla, 0)->ascent +
Dynarr_atp (dla, 0)->descent);
else
- /* This should be an abort except I'm not yet 100%
+ /* This should be an ABORT except I'm not yet 100%
confident that it won't ever get hit (though I
haven't been able to trigger it). It is extremely
unlikely to cause any noticeable problem and even if
＠＠ -1809,7 +1809,7 ＠＠ unshow_buffer (struct window *w)
Lisp_Object buf = w->buffer;
if (XBUFFER (buf) != XMARKER (w->pointm[CURRENT_DISP])->buffer)
- abort ();
+ ABORT ();
/* FSF disables this check, so I'll do it too. I hope it won't
break things. --ben */
＠＠ -2639,14 +2639,14 ＠＠ window_loop (enum window_loop type,
I feel no shame about putting this piece of shit in. */
if (++lose_lose >= 500)
{
- /* Call to abort() added by Darryl Okahata (16 Nov. 2001),
+ /* Call to ABORT() added by Darryl Okahata (16 Nov. 2001),
at Ben's request, to catch any remaining bugs.
- If you find that XEmacs is aborting here, and you
+ If you find that XEmacs is ABORTing here, and you
need to be up and running ASAP, it should be safe to
- comment out the following abort(), as long as you
+ comment out the following ABORT(), as long as you
leave the "break;" alone. */
- abort();
+ ABORT();
break; /* <--- KEEP THIS HERE! Do not delete! */
}
＠＠ -2797,7 +2797,7 ＠＠ window_loop (enum window_loop type,
}
default:
- abort ();
+ ABORT ();
}
if (EQ (w, last_window))
＠＠ -2895,7 +2895,7 ＠＠ Any other non-nil value means search all
w = window_loop (GET_LRU_WINDOW, Qnil, 0, which_frames, 1, which_devices);
/* At this point we damn well better have found something. */
- if (NILP (w)) abort ();
+ if (NILP (w)) ABORT ();
#endif
return w;
＠＠ -3800,7 +3800,7 ＠＠ returned.
XFRAME (p->frame)->mirror_dirty = 1;
/* do this last (after the window is completely initialized and
the mirror-dirty flag is set) so that specifier recomputation
- caused as a result of this will work properly and not abort. */
+ caused as a result of this will work properly and not ABORT. */
Fset_window_buffer (new, o->buffer, Qt);
return new;
}
＠＠ -5730,7 +5730,7 ＠＠ by `current-window-configuration' (which
if (FRAME_LIVE_P (f))
{
/* Do this before calling recompute_all_cached_specifiers_in_window()
- so that things like redisplay_redraw_cursor() won't abort due
+ so that things like redisplay_redraw_cursor() won't ABORT due
to no window mirror present. */
f->mirror_dirty = 1;
＠＠ -5798,7 +5798,7 ＠＠ saved_window_index (Lisp_Object window,
if (EQ (SAVED_WINDOW_N (config, j)->window, window))
return j;
}
- abort ();
+ ABORT ();
return 0; /* suppress compiler warning */
}
Index: src/xgccache.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xgccache.c,v
retrieving revision 1.5.2.1
diff -u -p -r1.5.2.1 xgccache.c
--- src/xgccache.c 2002/08/20 11:38:28 1.5.2.1
+++ src/xgccache.c 2005/01/30 00:27:10
＠＠ -158,8 +158,8 ＠＠ gc_cache_lookup (struct gc_cache *cache,
struct gc_cache_cell *cell, *next, *prev;
struct gcv_and_mask gcvm;
- if ((!!cache->head) != (!!cache->tail)) abort ();
- if (cache->head && (cache->head->prev || cache->tail->next))
abort ();
+ if ((!!cache->head) != (!!cache->tail)) ABORT ();
+ if (cache->head && (cache->head->prev || cache->tail->next))
ABORT ();
gcvm.mask = mask;
gcvm.gcv = *gcv; /* this copies... */
＠＠ -206,10 +206,10 ＠＠ gc_cache_lookup (struct gc_cache *cache,
cell->prev = cache->tail;
cache->tail->next = cell;
cache->tail = cell;
- if (cache->head == cell) abort ();
- if (cell->next) abort ();
- if (cache->head->prev) abort ();
- if (cache->tail->next) abort ();
+ if (cache->head == cell) ABORT ();
+ if (cell->next) ABORT ();
+ if (cache->head->prev) ABORT ();
+ if (cache->tail->next) ABORT ();
return cell->gc;
}
＠＠ -231,7 +231,7 ＠＠ gc_cache_lookup (struct gc_cache *cache,
#endif
}
else if (cache->size > GC_CACHE_SIZE)
- abort ();
+ ABORT ();
else
{
/* Allocate a new cell (don't put it in the list or table yet). */
cvs server: Diffing src/m
cvs server: Diffing src/s
cvs server: Diffing tests
cvs server: Diffing tests/DLL
cvs server: Diffing tests/Dnd
cvs server: Diffing tests/automated
cvs server: Diffing tests/gtk
cvs server: Diffing tests/mule
cvs server: Diffing tests/tooltalk
2:50 a.m.
New subject: [AC21.4] Get working with VC++ v7, fix some Cygwin problems
APPROVE COMMIT 21.4
Ben, I nearly vetoed this patch based on the size. Upon further
investigation, I saw that nearly all of the bulk of the changes were
related to abort () -> ABORT () changes. It would have been a lot
easier to process if one patch consisted solely of those changes and
the rest of the changes were in a separate patch.
Thanks for the patch, it will appear in XEmacs 21.4.17, "Jumbo
Shrimp".
- Vin
Ben Wing <ben(a)xemacs.org> writes:
Vin -- this combines various patches; it includes everything I needed
in
order to get 21.4 to compile correctly under VC++ 7 and under Cygwin. It
supersedes both my previous patch to config.inc.samp and the patch to
xemacs.mak that you were ambivalent about (I include only the first part of
that patch, necessary to get makeinfo to work correctly).
ben
3:54 a.m.
New subject: [AC21.4] Get working with VC++ v7, fix some Cygwin problems
APPROVE COMMIT 21.4
Ben, I nearly vetoed this patch based on the size. Upon
further investigation, I saw that nearly all of the bulk of
the changes were related to abort () -> ABORT () changes. It
would have been a lot easier to process if one patch
consisted solely of those changes and the rest of the changes
were in a separate patch.
Thanks for the patch, it will appear in XEmacs 21.4.17,
"Jumbo Shrimp".
Sorry, it was impossible to test that patch by itself so I was reluctant to
submit it separately.
7578
days inactive
7579
days old
2 comments
3 participants
participants (3)
-
Ben Wing -
Ben Wing -
Vin Shelton