--- a/lisp/ChangeLog	Thu May 24 06:30:21 2001 +0000
+++ b/lisp/ChangeLog	Thu May 24 07:51:33 2001 +0000
@@ -1,3 +1,9 @@
+2001-05-24  Ben Wing  <ben@xemacs.org>
+
+	* subr.el:
+	* subr.el (error):
+	fix doc string to reflect reality
+
 2001-05-23  Ben Wing  <ben@xemacs.org>
 
 	* behavior-defs.el:

--- a/lisp/subr.el	Thu May 24 06:30:21 2001 +0000
+++ b/lisp/subr.el	Thu May 24 07:51:33 2001 +0000
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1986, 1992, 1994-5, 1997 Free Software Foundation, Inc.
 ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
 ;; Copyright (C) 1995 Sun Microsystems.
-;; Copyright (C) 2000 Ben Wing.
+;; Copyright (C) 2000, 2001 Ben Wing.
 
 ;; Maintainer: XEmacs Development Team
 ;; Keywords: extensions, dumped
@@ -625,38 +625,42 @@
 totally defeats the purpose of having structured errors.  There is now
 a rich set of defined errors you can use:
 
+quit
+
 error
-  syntax-error
-    invalid-read-syntax
-    list-formation-error
-      malformed-list
-        malformed-property-list
-      circular-list
-        circular-property-list
-    invalid-regexp
-    specifier-syntax-error
-
   invalid-argument
+    syntax-error
+      invalid-read-syntax
+      invalid-regexp
+      structure-formation-error
+        list-formation-error
+          malformed-list
+            malformed-property-list
+          circular-list
+            circular-property-list
+    invalid-function
+    no-catch
+    undefined-keystroke-sequence
+    invalid-constant
     wrong-type-argument
     args-out-of-range
     wrong-number-of-arguments
-    invalid-function
-    no-catch
-    undefined-keystroke-sequence
-    specifier-argument-error
 
   invalid-state
     void-function
     cyclic-function-indirection
     void-variable
     cyclic-variable-indirection
-    protected-field
     invalid-byte-code
+    stack-overflow
+    out-of-memory
+    invalid-key-binding
+    internal-error
 
   invalid-operation
     invalid-change
       setting-constant
-      specifier-change-error
+      protected-field
     editing-error
       beginning-of-buffer
       end-of-buffer
@@ -666,32 +670,37 @@
         file-already-exists
         file-locked
         file-supersession
-      end-of-file
-      coding-system-error
-      image-conversion-error
+        end-of-file
+      process-error
+      network-error
       tooltalk-error
+      gui-error
+        dialog-box-error
+      sound-error
+      conversion-error
+        text-conversion-error
+        image-conversion-error
+        base64-conversion-error
+        selection-conversion-error
     arith-error
       range-error
       domain-error
       singularity-error
       overflow-error
       underflow-error
-    dialog-box-error
     search-failed
-    selection-conversion-error
+    printing-unreadable-object
+    unimplemented
 
-  unimplemented
-
-  internal-error
+Note the semantic differences between some of the more common errors:
 
-The five most common errors you will probably use or base your new
-errors off of are `syntax-error', `invalid-argument', `invalid-state',
-`invalid-operation', and `invalid-change'.  Note the semantic differences:
-
--- `syntax-error' is for errors in complex structures: parsed strings, lists,
-   and the like.
--- `invalid-argument' is for errors in a simple value.  Typically, the entire
-   value, not just one part of it, is wrong.
+-- `invalid-argument' is for all cases where a bad value is encountered.
+-- `invalid-constant' is for arguments where only a specific set of values
+   is allowed.
+-- `syntax-error' is when complex structures (parsed strings, lists,
+   and the like) are badly formed.  If the problem is just a single bad
+   value inside the structure, you should probably be using something else,
+   e.g. `invalid-constant', `wrong-type-argument', or `invalid-argument'.
 -- `invalid-state' means that some settings have been changed in such a way
    that their current state is unallowable.  More and more, code is being
    written more carefully, and catches the error when the settings are being
@@ -699,9 +708,10 @@
 -- `invalid-change' means that an attempt is being made to change some settings
    into an invalid state.  `invalid-change' is a type of `invalid-operation'.
 -- `invalid-operation' refers to all cases where code is trying to do something
-   that's disallowed.  This includes file errors, buffer errors (e.g. running
-   off the end of a buffer), `invalid-change' as just mentioned, and
-   arithmetic errors.
+   that's disallowed, or when an error occurred during an operation. (These
+   two concepts are merged because there's no clear distinction between them.)
+-- `io-error' refers to errors involving interaction with any external
+   components (files, other programs, the operating system, etc).
 
 See also `cerror', `signal', and `signal-error'."
   (while t (apply

--- a/man/ChangeLog	Thu May 24 06:30:21 2001 +0000
+++ b/man/ChangeLog	Thu May 24 07:51:33 2001 +0000
@@ -1,3 +1,12 @@
+2001-05-24  Ben Wing  <ben@xemacs.org>
+
+	* xemacs-faq.texi (Top):
+	* xemacs-faq.texi (Installation):
+	* xemacs-faq.texi (Q2.1.15):
+	* xemacs-faq.texi (Q2.1.18):
+	* xemacs-faq.texi (Q2.1.19):
+	document how to debug X errors
+	
 2001-05-15  Steve Youngs  <youngs@xemacs.org>
 
 	* xemacs/packages.texi (Local.rules): Update to reflect new dir tree.

--- a/man/xemacs-faq.texi	Thu May 24 06:30:21 2001 +0000
+++ b/man/xemacs-faq.texi	Thu May 24 07:51:33 2001 +0000
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/04/20 11:32:18 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/05/24 07:50:53 $
 @sp 1
 @author Tony Rossini <rossini@@biostat.washington.edu>
 @author Ben Wing <ben@@xemacs.org>
@@ -169,7 +169,7 @@
 * Q2.1.15::     How to debug an XEmacs problem with a debugger.
 * Q2.1.16::     XEmacs crashes in @code{strcat} on HP/UX 10.
 * Q2.1.17::     @samp{Marker does not point anywhere}.
-* Q2.1.18::     [This question intentionally left blank]
+* Q2.1.18::     XEmacs is outputting lots of X errors.
 * Q2.1.19::     XEmacs does not follow the local timezone.
 * Q2.1.20::     @samp{Symbol's function definition is void: hkey-help-show.}
 * Q2.1.21::     [This question intentionally left blank]
@@ -1224,7 +1224,7 @@
 * Q2.1.15::     How to debug an XEmacs problem with a debugger.
 * Q2.1.16::     XEmacs crashes in @code{strcat} on HP/UX 10.
 * Q2.1.17::     @samp{Marker does not point anywhere}.
-* Q2.1.18::     [This question intentionally left blank]
+* Q2.1.18::     XEmacs is outputting lots of X errors.
 * Q2.1.19::     XEmacs does not follow the local timezone.
 * Q2.1.20::     @samp{Symbol's function definition is void: hkey-help-show.}
 * Q2.1.21::     [This question intentionally left blank]
@@ -2014,12 +2014,13 @@
 @itemize @bullet
 @item
 First of all, if the crash is at all reproducible, consider very
-strongly recompiling your XEmacs with debugging symbols, with no
-optimization, and with the configure options @samp{--debug=yes} and
-@samp{--error-checking=all}.  This will make your XEmacs run somewhat
-slower but make it a lot more likely to catch the problem earlier
-(closer to its source), and a lot easier to determine what's going on
-with a debugger.
+strongly recompiling your XEmacs with debugging symbols and with no
+optimization (e.g. with GCC use the compiler flags @samp{-g -O0} --
+that's an "oh" followed by a zero), and with the configure options
+@samp{--debug=yes} and @samp{--error-checking=all}.  This will make your
+XEmacs run somewhat slower but make it a lot more likely to catch the
+problem earlier (closer to its source), and a lot easier to determine
+what's going on with a debugger.
 
 @item
 If you're able to run XEmacs under a debugger and reproduce the crash
@@ -2040,6 +2041,10 @@
 declared static in eval.c.
 
 @item
+If XEmacs is outputting lots of X errors, put a breakpoint on
+@code{x_error_handler()}; that will tell you which call is causing them.
+
+@item
 Internally, you will probably see lots of variables that hold objects of
 type @code{Lisp_Object}.  These are exactly what they appear to be,
 i.e. references to Lisp objects.  Printing them out with the debugger
@@ -2219,7 +2224,11 @@
 @end enumerate
 
 @node Q2.1.18, Q2.1.19, Q2.1.17, Installation
-@unnumberedsubsec Q2.1.18: removed
+@unnumberedsubsec Q2.1.18: XEmacs is outputting lots of X errors.
+
+If this is happening, we would very much like to know what's causing
+them.  To find this out, @xref{Q2.1.15}.  Try to get both a C and Lisp
+backtrace, and send them to @email{xemacs-beta@@xemacs.org}.
 
 @node Q2.1.19, Q2.1.20, Q2.1.18, Installation
 @unnumberedsubsec Q2.1.19: XEmacs does not follow the local timezone.

--- a/nt/ChangeLog	Thu May 24 06:30:21 2001 +0000
+++ b/nt/ChangeLog	Thu May 24 07:51:33 2001 +0000
@@ -1,3 +1,9 @@
+2001-05-24  Ben Wing  <ben@xemacs.org>
+
+	* xemacs.mak (DOC):
+	* xemacs.mak (TEMACS_OBJS):
+	add glyphs-shared.c.
+
 2001-05-23  Ben Wing  <ben@xemacs.org>
 
 	* xemacs.mak (installation):

--- a/nt/xemacs.mak	Thu May 24 06:30:21 2001 +0000
+++ b/nt/xemacs.mak	Thu May 24 07:51:33 2001 +0000
@@ -696,6 +696,7 @@
  $(SRC)\getloadavg.c \
  $(SRC)\glyphs.c \
  $(SRC)\glyphs-eimage.c \
+ $(SRC)\glyphs-shared.c \
  $(SRC)\glyphs-widget.c \
  $(SRC)\gui.c  \
  $(SRC)\gutter.c \
@@ -987,6 +988,7 @@
 	$(OUTDIR)\getloadavg.obj \
 	$(OUTDIR)\glyphs.obj \
 	$(OUTDIR)\glyphs-eimage.obj \
+	$(OUTDIR)\glyphs-shared.obj \
 	$(OUTDIR)\glyphs-widget.obj \
 	$(OUTDIR)\gui.obj \
 	$(OUTDIR)\gutter.obj \

--- a/src/ChangeLog	Thu May 24 06:30:21 2001 +0000
+++ b/src/ChangeLog	Thu May 24 07:51:33 2001 +0000
@@ -1,3 +1,1783 @@
+2001-05-24  Ben Wing  <ben@xemacs.org>
+
+	* Makefile.in.in (objs):
+	* abbrev.c (syms_of_abbrev):
+	* alloc.c (memory_full):
+	* alloc.c (Fmake_byte_code):
+	* alloc.c (garbage_collect_1):
+	* buffer.c:
+	* buffer.c (print_buffer):
+	* buffer.c (nsberror):
+	* buffer.c (Fget_buffer_create):
+	* buffer.c (Fset_buffer):
+	* buffer.c (Fbury_buffer):
+	* buffer.c (syms_of_buffer):
+	* bytecode.c:
+	* bytecode.c (execute_optimized_program):
+	* bytecode.c (invalid_byte_code):
+	* bytecode.c (check_opcode):
+	* bytecode.c (check_constants_index):
+	* bytecode.c (READ_INSTRUCTION_CHAR):
+	* bytecode.c (optimize_byte_code):
+	* bytecode.c (Ffetch_bytecode):
+	* bytecode.c (syms_of_bytecode):
+	* callint.c (check_mark):
+	* callint.c (Fcall_interactively):
+	* callint.c (syms_of_callint):
+	* callproc.c:
+	* callproc.c (Fold_call_process_internal):
+	* callproc.c (child_setup):
+	* casetab.c (print_case_table):
+	* casetab.c (Fget_case_table):
+	* casetab.c (Fput_case_table):
+	* casetab.c (syms_of_casetab):
+	* chartab.c (symbol_to_char_table_type):
+	* chartab.c (decode_char_table_range):
+	* chartab.c (check_valid_char_table_value):
+	* chartab.c (chartab_data_validate):
+	* chartab.c (check_category_char):
+	* chartab.c (syms_of_chartab):
+	* cmdloop.c (command_loop_3):
+	* cmdloop.c (syms_of_cmdloop):
+	* cmds.c (Fdelete_char):
+	* cmds.c (Fself_insert_command):
+	* cmds.c (syms_of_cmds):
+	* console-msw.c:
+	* console-msw.c (mswindows_canonicalize_console_connection):
+	* console-msw.c (Fmswindows_message_box):
+	* console-msw.c (mswindows_lisp_error):
+	* console-msw.c (msprinter_canonicalize_console_connection):
+	* console-msw.c (syms_of_console_mswindows):
+	* console-msw.h:
+	* console-stream.c (stream_init_console):
+	* console-stream.c (stream_init_frame_1):
+	* console-tty.c (tty_init_console):
+	* console-tty.c (syms_of_console_tty):
+	* console-x.c (get_display_arg_connection):
+	* console.c (print_console):
+	* console.c (decode_console_type):
+	* console.c (Fselect_console):
+	* console.c (Fget_console):
+	* console.c (delete_console_internal):
+	* console.c (syms_of_console):
+	* data.c:
+	* data.c (dead_wrong_type_argument):
+	* data.c (c_write_error):
+	* data.c (lisp_write_error):
+	* data.c (args_out_of_range):
+	* data.c (args_out_of_range_3):
+	* data.c (print_weak_list):
+	* data.c (decode_weak_list_type):
+	* data.c (arith_error):
+	* data.c (init_errors_once_early):
+	* data.c (syms_of_data):
+	* database.c (CHECK_LIVE_DATABASE):
+	* database.c (print_database):
+	* database.c (finalize_database):
+	* database.c (Fopen_database):
+	* database.c (syms_of_database):
+	* debug.c (Fadd_debug_class_to_check):
+	* debug.c (Fdelete_debug_class_to_check):
+	* debug.c (Fset_debug_classes_to_check):
+	* debug.c (Fset_debug_class_types_to_check):
+	* debug.c (Fdebug_types_being_checked):
+	* debug.c (syms_of_debug):
+	* device-gtk.c (gtk_init_device):
+	* device-gtk.c (Fgtk_display_visual_class):
+	* device-gtk.c (Fgtk_keysym_on_keyboard_p):
+	* device-gtk.c (syms_of_device_gtk):
+	* device-msw.c (handle_devmode_changes):
+	* device-msw.c (mswindows_handle_print_dialog_box):
+	* device-msw.c (mswindows_handle_page_setup_dialog_box):
+	* device-msw.c (Fmsprinter_select_settings):
+	* device-msw.c (Fmsprinter_apply_settings):
+	* device-msw.c (print_devmode):
+	* device-tty.c (tty_init_device):
+	* device-tty.c (syms_of_device_tty):
+	* device-x.c (sanity_check_geometry_resource):
+	* device-x.c (x_init_device):
+	* device-x.c (x_get_resource_prefix):
+	* device-x.c (Fx_get_resource):
+	* device-x.c (Fx_put_resource):
+	* device-x.c (Fx_display_visual_class):
+	* device-x.c (Fx_keysym_hash_table):
+	* device-x.c (Fx_keysym_on_keyboard_p):
+	* device-x.c (Fx_get_font_path):
+	* device-x.c (syms_of_device_x):
+	* device.c (print_device):
+	* device.c (Fselect_device):
+	* device.c (Fset_device_selected_frame):
+	* device.c (Fget_device):
+	* device.c (Fmake_device):
+	* device.c (Fset_device_class):
+	* device.c (Fdevice_system_metric):
+	* device.c (Fdomain_device_type):
+	* device.c (syms_of_device):
+	* dialog-gtk.c (syms_of_dialog_gtk):
+	* dialog-msw.c (handle_file_dialog_box):
+	* dialog-msw.c (handle_question_dialog_box):
+	* dialog-msw.c (mswindows_make_dialog_box_internal):
+	* dialog-msw.c (syms_of_dialog_mswindows):
+	* dialog-x.c (dbox_descriptor_to_widget_value):
+	* dialog-x.c (x_make_dialog_box_internal):
+	* dialog.c (Fmake_dialog_box_internal):
+	* dired-msw.c (mswindows_get_files):
+	* dired-msw.c (syms_of_dired_mswindows):
+	* dired.c (Fdirectory_files):
+	* dired.c (file_name_completion):
+	* dired.c (syms_of_dired):
+	* doc.c (get_doc_string):
+	* doc.c (read_doc_string):
+	* doc.c (Fsnarf_documentation):
+	* doprnt.c (parse_off_posnum):
+	* doprnt.c (NEXT_ASCII_BYTE):
+	* doprnt.c (parse_doprnt_spec):
+	* doprnt.c (get_doprnt_args):
+	* doprnt.c (emacs_doprnt_1):
+	* dragdrop.c (syms_of_dragdrop):
+	* editfns.c (Fchar_to_string):
+	* editfns.c (region_limit):
+	* editfns.c (Fformat_time_string):
+	* editfns.c (Fdecode_time):
+	* editfns.c (Fencode_time):
+	* editfns.c (Ftranspose_regions):
+	* editfns.c (syms_of_editfns):
+	* eldap.c (signal_ldap_error):
+	* eldap.c (print_ldap):
+	* eldap.c (finalize_ldap):
+	* eldap.c (Fldap_open):
+	* eldap.c (Fldap_search_basic):
+	* eldap.c (Fldap_add):
+	* eldap.c (Fldap_modify):
+	* eldap.c (syms_of_eldap):
+	* eldap.h (CHECK_LIVE_LDAP):
+	* elhash.c (hash_table_size_validate):
+	* elhash.c (hash_table_weakness_validate):
+	* elhash.c (decode_hash_table_weakness):
+	* elhash.c (hash_table_test_validate):
+	* elhash.c (decode_hash_table_test):
+	* elhash.c (hash_table_rehash_size_validate):
+	* elhash.c (hash_table_rehash_threshold_validate):
+	* elhash.c (hash_table_data_validate):
+	* elhash.c (Fmake_hash_table):
+	* elhash.c (syms_of_elhash):
+	* emacs-widget-accessors.c (Fgtk_adjustment_lower):
+	* emacs-widget-accessors.c (Fgtk_adjustment_upper):
+	* emacs-widget-accessors.c (Fgtk_adjustment_value):
+	* emacs-widget-accessors.c (Fgtk_adjustment_step_increment):
+	* emacs-widget-accessors.c (Fgtk_adjustment_page_increment):
+	* emacs-widget-accessors.c (Fgtk_adjustment_page_size):
+	* emacs-widget-accessors.c (Fgtk_widget_style):
+	* emacs-widget-accessors.c (Fgtk_widget_window):
+	* emacs-widget-accessors.c (Fgtk_widget_state):
+	* emacs-widget-accessors.c (Fgtk_widget_name):
+	* emacs-widget-accessors.c (Fgtk_widget_parent):
+	* emacs-widget-accessors.c (Fgtk_button_child):
+	* emacs-widget-accessors.c (Fgtk_button_in_button):
+	* emacs-widget-accessors.c (Fgtk_button_button_down):
+	* emacs-widget-accessors.c (Fgtk_combo_entry):
+	* emacs-widget-accessors.c (Fgtk_combo_button):
+	* emacs-widget-accessors.c (Fgtk_combo_popup):
+	* emacs-widget-accessors.c (Fgtk_combo_popwin):
+	* emacs-widget-accessors.c (Fgtk_combo_list):
+	* emacs-widget-accessors.c (Fgtk_gamma_curve_table):
+	* emacs-widget-accessors.c (Fgtk_gamma_curve_curve):
+	* emacs-widget-accessors.c (Fgtk_gamma_curve_gamma):
+	* emacs-widget-accessors.c (Fgtk_gamma_curve_gamma_dialog):
+	* emacs-widget-accessors.c (Fgtk_gamma_curve_gamma_text):
+	* emacs-widget-accessors.c (Fgtk_check_menu_item_active):
+	* emacs-widget-accessors.c (Fgtk_notebook_tab_pos):
+	* emacs-widget-accessors.c (Fgtk_text_hadj):
+	* emacs-widget-accessors.c (Fgtk_text_vadj):
+	* emacs-widget-accessors.c (Fgtk_file_selection_dir_list):
+	* emacs-widget-accessors.c (Fgtk_file_selection_file_list):
+	* emacs-widget-accessors.c (Fgtk_file_selection_selection_entry):
+	* emacs-widget-accessors.c (Fgtk_file_selection_selection_text):
+	* emacs-widget-accessors.c (Fgtk_file_selection_main_vbox):
+	* emacs-widget-accessors.c (Fgtk_file_selection_ok_button):
+	* emacs-widget-accessors.c (Fgtk_file_selection_cancel_button):
+	* emacs-widget-accessors.c (Fgtk_file_selection_help_button):
+	* emacs-widget-accessors.c (Fgtk_file_selection_action_area):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_fontsel):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_main_vbox):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_action_area):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_ok_button):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_apply_button):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_cancel_button):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_colorsel):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_main_vbox):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_ok_button):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_reset_button):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_cancel_button):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_help_button):
+	* emacs-widget-accessors.c (Fgtk_dialog_vbox):
+	* emacs-widget-accessors.c (Fgtk_dialog_action_area):
+	* emacs-widget-accessors.c (Fgtk_input_dialog_close_button):
+	* emacs-widget-accessors.c (Fgtk_input_dialog_save_button):
+	* emacs-widget-accessors.c (Fgtk_plug_socket_window):
+	* emacs-widget-accessors.c (Fgtk_plug_same_app):
+	* emacs-widget-accessors.c (Fgtk_object_flags):
+	* emacs-widget-accessors.c (Fgtk_object_ref_count):
+	* emacs-widget-accessors.c (Fgtk_paned_child1):
+	* emacs-widget-accessors.c (Fgtk_paned_child2):
+	* emacs-widget-accessors.c (Fgtk_paned_child1_resize):
+	* emacs-widget-accessors.c (Fgtk_paned_child2_resize):
+	* emacs-widget-accessors.c (Fgtk_paned_child1_shrink):
+	* emacs-widget-accessors.c (Fgtk_paned_child2_shrink):
+	* emacs-widget-accessors.c (Fgtk_clist_rows):
+	* emacs-widget-accessors.c (Fgtk_clist_columns):
+	* emacs-widget-accessors.c (Fgtk_clist_hadjustment):
+	* emacs-widget-accessors.c (Fgtk_clist_vadjustment):
+	* emacs-widget-accessors.c (Fgtk_clist_sort_type):
+	* emacs-widget-accessors.c (Fgtk_clist_focus_row):
+	* emacs-widget-accessors.c (Fgtk_clist_sort_column):
+	* emacs-widget-accessors.c (Fgtk_list_children):
+	* emacs-widget-accessors.c (Fgtk_list_selection):
+	* emacs-widget-accessors.c (Fgtk_tree_children):
+	* emacs-widget-accessors.c (Fgtk_tree_root_tree):
+	* emacs-widget-accessors.c (Fgtk_tree_tree_owner):
+	* emacs-widget-accessors.c (Fgtk_tree_selection):
+	* emacs-widget-accessors.c (Fgtk_tree_item_subtree):
+	* emacs-widget-accessors.c (Fgtk_scrolled_window_hscrollbar):
+	* emacs-widget-accessors.c (Fgtk_scrolled_window_vscrollbar):
+	* emacs-widget-accessors.c (Fgtk_scrolled_window_hscrollbar_visible):
+	* emacs-widget-accessors.c (Fgtk_scrolled_window_vscrollbar_visible):
+	* emacs.c (main_1):
+	* emacs.c (Fsplit_path):
+	* emacs.c (syms_of_emacs):
+	* emodules.c (emodules_load):
+	* esd.c:
+	* esd.c (esd_play_sound_file):
+	* esd.c (esd_play_sound_data):
+	* eval.c:
+	* eval.c (print_subr):
+	* eval.c (FletX):
+	* eval.c (Flet):
+	* eval.c (Fdefvar):
+	* eval.c (Fdefconst):
+	* eval.c (condition_case_3):
+	* eval.c (return_from_signal):
+	* eval.c (signal_error_1):
+	* eval.c (maybe_signal_error_1):
+	* eval.c (maybe_signal_continuable_error_1):
+	* eval.c (signal_error):
+	* eval.c (maybe_signal_error):
+	* eval.c (signal_continuable_error):
+	* eval.c (maybe_signal_continuable_error):
+	* eval.c (signal_error_2):
+	* eval.c (maybe_signal_error_2):
+	* eval.c (signal_continuable_error_2):
+	* eval.c (maybe_signal_continuable_error_2):
+	* eval.c (signal_ferror):
+	* eval.c (maybe_signal_ferror):
+	* eval.c (signal_continuable_ferror):
+	* eval.c (maybe_signal_continuable_ferror):
+	* eval.c (signal_ferror_with_frob):
+	* eval.c (maybe_signal_ferror_with_frob):
+	* eval.c (signal_continuable_ferror_with_frob):
+	* eval.c (maybe_signal_continuable_ferror_with_frob):
+	* eval.c (signal_quit):
+	* eval.c (signal_invalid_function_error):
+	* eval.c (signal_wrong_number_of_arguments_error):
+	* eval.c (signal_malformed_list_error):
+	* eval.c (signal_malformed_property_list_error):
+	* eval.c (signal_circular_list_error):
+	* eval.c (signal_circular_property_list_error):
+	* eval.c (syntax_error):
+	* eval.c (syntax_error_2):
+	* eval.c (maybe_syntax_error):
+	* eval.c (sferror):
+	* eval.c (sferror_2):
+	* eval.c (maybe_sferror):
+	* eval.c (invalid_argument):
+	* eval.c (invalid_argument_2):
+	* eval.c (maybe_invalid_argument):
+	* eval.c (invalid_constant):
+	* eval.c (invalid_constant_2):
+	* eval.c (maybe_invalid_constant):
+	* eval.c (invalid_operation):
+	* eval.c (invalid_operation_2):
+	* eval.c (maybe_invalid_operation):
+	* eval.c (invalid_change):
+	* eval.c (invalid_change_2):
+	* eval.c (maybe_invalid_change):
+	* eval.c (invalid_state):
+	* eval.c (invalid_state_2):
+	* eval.c (maybe_invalid_state):
+	* eval.c (stack_overflow):
+	* eval.c (out_of_memory):
+	* eval.c (printing_unreadable_object):
+	* eval.c (do_autoload):
+	* eval.c (Feval):
+	* eval.c (Ffuncall):
+	* eval.c (grow_specpdl):
+	* eval.c (syms_of_eval):
+	* event-Xt.c (syms_of_event_Xt):
+	* event-gtk.c (syms_of_event_gtk):
+	* event-msw.c (mswindows_need_event_in_modal_loop):
+	* event-msw.c (emacs_mswindows_select_process):
+	* event-stream.c:
+	* event-stream.c (check_event_stream_ok):
+	* event-stream.c (lisp_number_to_milliseconds):
+	* event-stream.c (Fnext_event):
+	* event-stream.c (munge_keymap_translate):
+	* event-stream.c (Fset_recent_keys_ring_size):
+	* event-stream.c (execute_command_event):
+	* event-stream.c (syms_of_event_stream):
+	* events.c (print_event):
+	* events.c (Fmake_event):
+	* events.c (WRONG_EVENT_TYPE_FOR_PROPERTY):
+	* events.c (Fdeallocate_event):
+	* events.c (Fcopy_event):
+	* events.c (character_to_event):
+	* events.c (syms_of_events):
+	* extents.c (print_extent):
+	* extents.c (Fset_extent_parent):
+	* extents.c (decode_map_extents_flags):
+	* extents.c (decode_extent_at_flag):
+	* extents.c (symbol_to_glyph_layout):
+	* extents.c (Fset_extent_property):
+	* extents.c (syms_of_extents):
+	* faces.c (face_validate):
+	* faces.c (Fget_face):
+	* faces.c (syms_of_faces):
+	* file-coding.c:
+	* file-coding.c (print_coding_system):
+	* file-coding.c (symbol_to_eol_type):
+	* file-coding.c (Fget_coding_system):
+	* file-coding.c (parse_charset_conversion_specs):
+	* file-coding.c (Fmake_coding_system):
+	* file-coding.c (Fcoding_system_aliasee):
+	* file-coding.c (Fdefine_coding_system_alias):
+	* file-coding.c (Fcoding_system_property):
+	* file-coding.c (decode_coding_category):
+	* file-coding.c (Fset_coding_priority_list):
+	* file-coding.c (syms_of_file_coding):
+	* fileio.c:
+	* fileio.c (report_file_type_error):
+	* fileio.c (report_error_with_errno):
+	* fileio.c (report_file_error):
+	* fileio.c (Fmake_temp_name):
+	* fileio.c (Ffile_truename):
+	* fileio.c (Fmake_directory_internal):
+	* fileio.c (Fdelete_directory):
+	* fileio.c (Fdelete_file):
+	* fileio.c (Fset_file_modes):
+	* fileio.c (syms_of_fileio):
+	* filelock.c (syms_of_filelock):
+	* floatfns.c (float_error):
+	* fns.c:
+	* fns.c (check_losing_bytecode):
+	* fns.c (safe_copy_tree):
+	* fns.c (Fget):
+	* fns.c (Fput):
+	* fns.c (Fremprop):
+	* fns.c (Fobject_plist):
+	* fns.c (internal_equal):
+	* fns.c (internal_old_equal):
+	* fns.c (Fload_average):
+	* fns.c (Frequire):
+	* fns.c (base64_conversion_error):
+	* fns.c (base64_decode_1):
+	* fns.c (syms_of_fns):
+	* font-lock.c (syms_of_font_lock):
+	* frame-gtk.c (gtk_create_widgets):
+	* frame-gtk.c (gtk_init_frame_1):
+	* frame-gtk.c (gtk_cant_notify_wm_error):
+	* frame-gtk.c (syms_of_frame_gtk):
+	* frame-x.c (x_create_widgets):
+	* frame-x.c (x_init_frame_1):
+	* frame-x.c (x_cant_notify_wm_error):
+	* frame-x.c (syms_of_frame_x):
+	* frame.c (print_frame):
+	* frame.c (setup_frame_without_minibuffer):
+	* frame.c (Fmake_frame):
+	* frame.c (selected_frame):
+	* frame.c (device_selected_frame):
+	* frame.c (Fset_frame_selected_window):
+	* frame.c (delete_frame_internal):
+	* frame.c (Fmake_frame_invisible):
+	* frame.c (store_minibuf_frame_prop):
+	* frame.c (syms_of_frame):
+	* general-slots.h:
+	* glade.c (Fglade_xml_textdomain):
+	* glyphs-gtk.c:
+	* glyphs-gtk.c (check_pointer_sizes):
+	* glyphs-gtk.c (init_image_instance_from_gdk_image):
+	* glyphs-gtk.c (image_instance_add_gdk_image):
+	* glyphs-gtk.c (init_image_instance_from_xbm_inline):
+	* glyphs-gtk.c (write_lisp_string_to_temp_file):
+	* glyphs-gtk.c (gtk_xpm_instantiate):
+	* glyphs-gtk.c (gtk_xface_instantiate):
+	* glyphs-gtk.c (gtk_resource_validate):
+	* glyphs-gtk.c (gtk_resource_normalize):
+	* glyphs-gtk.c (gtk_resource_instantiate):
+	* glyphs-gtk.c (check_valid_resource_symbol):
+	* glyphs-gtk.c (check_valid_resource_id):
+	* glyphs-gtk.c (font_instantiate):
+	* glyphs-gtk.c (cursor_font_instantiate):
+	* glyphs-gtk.c (gtk_subwindow_instantiate):
+	* glyphs-gtk.c (syms_of_glyphs_gtk):
+	* glyphs-msw.c:
+	* glyphs-msw.c (init_image_instance_from_dibitmap):
+	* glyphs-msw.c (image_instance_add_dibitmap):
+	* glyphs-msw.c (mswindows_init_image_instance_from_eimage):
+	* glyphs-msw.c (xpm_to_eimage):
+	* glyphs-msw.c (mswindows_xpm_instantiate):
+	* glyphs-msw.c (mswindows_resource_validate):
+	* glyphs-msw.c (mswindows_resource_normalize):
+	* glyphs-msw.c (resource_name_to_resource):
+	* glyphs-msw.c (mswindows_resource_instantiate):
+	* glyphs-msw.c (check_valid_resource_symbol):
+	* glyphs-msw.c (check_valid_resource_id):
+	* glyphs-msw.c (mswindows_xface_instantiate):
+	* glyphs-msw.c (mswindows_subwindow_instantiate):
+	* glyphs-msw.c (mswindows_widget_instantiate):
+	* glyphs-msw.c (add_tree_item):
+	* glyphs-msw.c (add_tab_item):
+	* glyphs-msw.c (mswindows_combo_box_instantiate):
+	* glyphs-msw.c (syms_of_glyphs_mswindows):
+	* glyphs-msw.c (console_type_create_glyphs_mswindows):
+	* glyphs-widget.c (check_valid_orientation):
+	* glyphs-widget.c (check_valid_tab_orientation):
+	* glyphs-widget.c (check_valid_justification):
+	* glyphs-widget.c (widget_validate):
+	* glyphs-widget.c (combo_box_validate):
+	* glyphs-x.c (write_lisp_string_to_temp_file):
+	* glyphs-x.c (check_pointer_sizes):
+	* glyphs-x.c (init_image_instance_from_x_image):
+	* glyphs-x.c (image_instance_add_x_image):
+	* glyphs-x.c (init_image_instance_from_xbm_inline):
+	* glyphs-x.c (x_xpm_instantiate):
+	* glyphs-x.c (x_xface_instantiate):
+	* glyphs-x.c (font_instantiate):
+	* glyphs-x.c (cursor_font_instantiate):
+	* glyphs-x.c (x_redisplay_widget):
+	* glyphs-x.c (x_subwindow_instantiate):
+	* glyphs-x.c (x_widget_instantiate):
+	* glyphs.c:
+	* glyphs.c (decode_device_ii_format):
+	* glyphs.c (process_image_string_instantiator):
+	* glyphs.c (if):
+	* glyphs.c (file_or_data_must_be_present):
+	* glyphs.c (data_must_be_present):
+	* glyphs.c (face_must_be_present):
+	* glyphs.c (get_image_instantiator_governing_domain):
+	* glyphs.c (instantiate_image_instantiator):
+	* glyphs.c (print_image_instance):
+	* glyphs.c (decode_image_instance_type):
+	* glyphs.c (incompatible_image_types):
+	* glyphs.c (make_image_instance_1):
+	* glyphs.c (signal_image_error):
+	* glyphs.c (signal_image_error_2):
+	* glyphs.c (signal_double_image_error_2):
+	* glyphs.c (simple_image_type_normalize):
+	* glyphs.c (check_valid_xbm_inline):
+	* glyphs.c (bitmap_to_lisp_data):
+	* glyphs.c (xbm_normalize):
+	* glyphs.c (xface_normalize):
+	* glyphs.c (pixmap_to_lisp_data):
+	* glyphs.c (check_valid_xpm_color_symbols):
+	* glyphs.c (evaluate_xpm_color_symbols):
+	* glyphs.c (xpm_normalize):
+	* glyphs.c (image_instantiate):
+	* glyphs.c (image_validate):
+	* glyphs.c (print_glyph):
+	* glyphs.c (decode_glyph_type):
+	* glyphs.c (subwindow_instantiate):
+	* glyphs.c (syms_of_glyphs):
+	* glyphs.h:
+	* gpmevent.c (Fgpm_enable):
+	* gui-gtk.c (syms_of_gui_gtk):
+	* gui-x.c (button_item_to_widget_value):
+	* gui-x.c (gui_items_to_widget_values_1):
+	* gui-x.c (gui_items_to_widget_values):
+	* gui.c:
+	* gui.c (gui_item_add_keyval_pair):
+	* gui.c (make_gui_item_from_keywords_internal):
+	* gui.c (widget_gui_parse_item_keywords):
+	* gui.c (update_gui_item_keywords):
+	* gui.c (signal_too_long_error):
+	* gui.c (print_gui_item):
+	* gui.c (parse_gui_item_tree_item):
+	* gui.c (syms_of_gui):
+	* gutter.c (decode_gutter_position):
+	* gutter.c (gutter_validate):
+	* gutter.c (gutter_size_validate):
+	* gutter.c (gutter_visible_validate):
+	* gutter.c (syms_of_gutter):
+	* hpplay.c:
+	* hpplay.c (player_error_internal):
+	* hpplay.c (myHandler):
+	* hpplay.c (play_bucket_internal):
+	* hpplay.c (play_sound_file):
+	* hpplay.c (play_sound_data):
+	* hpplay.c (vars_of_hpplay):
+	* indent.c (Findent_to):
+	* indent.c (syms_of_indent):
+	* input-method-xlib.c (Fx_open_xim):
+	* input-method-xlib.c (Fx_close_xim):
+	* input-method-xlib.c (syms_of_input_method_xlib):
+	* insdel.c (get_buffer_range_char):
+	* insdel.c (get_string_range_char):
+	* insdel.c (make_gap):
+	* insdel.c (buffer_insert_string_1):
+	* intl.c (syms_of_intl):
+	* keymap.c (print_keymap):
+	* keymap.c (traverse_keymaps):
+	* keymap.c (check_keymap_definition_loop):
+	* keymap.c (define_key_check_and_coerce_keysym):
+	* keymap.c (define_key_parser):
+	* keymap.c (key_desc_list_to_event):
+	* keymap.c (ensure_meta_prefix_char_keymapp):
+	* keymap.c (Fdefine_key):
+	* keymap.c (Fsingle_key_description):
+	* keymap.c (Ftext_char_description):
+	* libsst.c:
+	* libsst.c (dial;):
+	* libsst.h:
+	* libsst.h (sst_dtmf):
+	* linuxplay.c:
+	* linuxplay.c (audio_init):
+	* linuxplay.c (linux_play_data_or_file):
+	* linuxplay.c (play_sound_file):
+	* linuxplay.c (play_sound_data):
+	* lisp.h:
+	* lread.c (read_syntax_error):
+	* lread.c (continuable_read_syntax_error):
+	* lread.c (readchar):
+	* lread.c (pas_de_holgazan_ici):
+	* lread.c (load_force_doc_string_unwind):
+	* lread.c (Fload_internal):
+	* lread.c (decode_mode_1):
+	* lread.c (readevalloop):
+	* lread.c (Feval_buffer):
+	* lread.c (read_escape):
+	* lread.c (FSF_LOSSAGE):
+	* lread.c (read_atom_0):
+	* lread.c (reader_nextchar):
+	* lread.c (read_list_conser):
+	* lread.c (syms_of_lread):
+	* lread.c (vars_of_lread):
+	* lstream.c (Lstream_internal_error):
+	* lstream.h (wrap_lstream):
+	* macros.c (Fstart_kbd_macro):
+	* macros.c (Fend_kbd_macro):
+	* macros.c (pop_kbd_macro_event):
+	* macros.c (Fcall_last_kbd_macro):
+	* macros.c (Fexecute_kbd_macro):
+	* macros.c (syms_of_macros):
+	* marker.c (print_marker):
+	* marker.c (set_marker_internal):
+	* marker.c (bi_marker_position):
+	* marker.c (marker_position):
+	* marker.c (set_bi_marker_position):
+	* marker.c (set_marker_position):
+	* md5.c (md5_coding_system):
+	* menubar-gtk.c (menu_convert):
+	* menubar-gtk.c (menu_descriptor_to_widget_1):
+	* menubar-msw.c (mswindows_translate_menu_or_dialog_item):
+	* menubar-msw.c (populate_menu_add_item):
+	* menubar-msw.c (populate_or_checksum_helper):
+	* menubar-msw.c (unsafe_handle_wm_initmenupopup_1):
+	* menubar-msw.c (mswindows_popup_menu):
+	* menubar-x.c (menu_item_descriptor_to_widget_value_1):
+	* menubar-x.c (x_popup_menu):
+	* menubar-x.c (Faccelerate_menu):
+	* menubar.c (syms_of_menubar):
+	* menubar.c (vars_of_menubar):
+	* minibuf.c (Ftry_completion):
+	* minibuf.c (syms_of_minibuf):
+	* miscplay.c:
+	* miscplay.c (parse_wave_complete):
+	* miscplay.c (waverequire):
+	* miscplay.c (parsewave):
+	* miscplay.c (parsesundecaudio):
+	* miscplay.c (sndcnv8U_2mono):
+	* miscplay.c (sndcnv8S_2mono):
+	* miscplay.c (sndcnv2monounsigned):
+	* miscplay.c (sndcnv2unsigned):
+	* miscplay.c (int2ulaw):
+	* miscplay.c (sndcnvULaw_2linear):
+	* miscplay.c (sndcnvULaw_2mono):
+	* miscplay.c (sndcnv16_2monoLE):
+	* miscplay.c (sndcnv16_2monoBE):
+	* miscplay.c (sndcnv2byteLE):
+	* miscplay.c (sndcnv2byteBE):
+	* miscplay.c (sndcnv2monobyteLE):
+	* miscplay.c (sndcnv2monobyteBE):
+	* miscplay.c (analyze_format):
+	* miscplay.h:
+	* miscplay.h (HEADERSZ):
+	* miscplay.h (parse_wave_complete):
+	* mule-ccl.c (Fccl_execute):
+	* mule-ccl.c (vars_of_mule_ccl):
+	* mule-charset.c (print_charset):
+	* mule-charset.c (get_unallocated_leading_byte):
+	* mule-charset.c (Fget_charset):
+	* mule-charset.c (Fmake_charset):
+	* mule-charset.c (Fcharset_from_attributes):
+	* mule-charset.c (Fcharset_property):
+	* mule-charset.c (Fset_charset_ccl_program):
+	* mule-charset.c (Fmake_char):
+	* mule-charset.c (Fchar_octet):
+	* mule-charset.c (lookup_composite_char):
+	* mule-charset.c (syms_of_mule_charset):
+	* mule-wnnfns.c (Fwnn_set_param):
+	* mule-wnnfns.c (syms_of_mule_wnn):
+	* mule.c (Fdefine_word_pattern):
+	* nas.c:
+	* nas.c (XTOOLKIT):
+	* nas.c (play_sound_file):
+	* nas.c (close_down_play):
+	* nas.c (do_caching_play):
+	* nas.c (play_sound_data):
+	* nas.c (CatchIoErrorAndJump):
+	* nas.c (NameFromData):
+	* nas.c (SndOpenDataForReading):
+	* nas.c (cmpID):
+	* nas.c (dread):
+	* nas.c (dgetc):
+	* nas.c (readChunk):
+	* nas.c (WaveOpenDataForReading):
+	* nas.c (SoundOpenDataForReading):
+	* ntplay.c:
+	* ntplay.c (play_sound_file):
+	* ntplay.c (play_sound_data_1):
+	* ntplay.c (play_sound_data):
+	* ntproc.c:
+	* ntproc.c (prepare_standard_handles):
+	* ntproc.c (vars_of_ntproc):
+	* objects-gtk.c (gtk_parse_nearest_color):
+	* objects-gtk.c (gtk_initialize_font_instance):
+	* objects-msw.c (mswindows_initialize_color_instance):
+	* objects-msw.c (initialize_font_instance):
+	* objects-x.c (x_parse_nearest_color):
+	* objects-x.c (x_initialize_font_instance):
+	* objects-x.c (x_font_instance_truename):
+	* objects.c (finalose):
+	* objects.c (print_color_instance):
+	* objects.c (print_font_instance):
+	* objects.c (font_instance_truename_internal):
+	* objects.c (color_instantiate):
+	* objects.c (color_validate):
+	* objects.c (font_validate):
+	* objects.c (face_boolean_instantiate):
+	* objects.c (face_boolean_validate):
+	* objects.c (syms_of_objects):
+	* postgresql.c (CHECK_LIVE_CONNECTION):
+	* postgresql.c (print_pgconn):
+	* postgresql.c (finalize_pgconn):
+	* postgresql.c (print_pgresult):
+	* postgresql.c (finalize_pgresult):
+	* postgresql.c (Fpq_connectdb):
+	* postgresql.c (Fpq_connect_start):
+	* postgresql.c (Fpq_connect_poll):
+	* postgresql.c (Fpq_set_client_encoding):
+	* postgresql.c (Fpq_reset_start):
+	* postgresql.c (Fpq_reset_poll):
+	* postgresql.c (Fpq_pgconn):
+	* postgresql.c (Fpq_exec):
+	* postgresql.c (Fpq_send_query):
+	* postgresql.c (Fpq_get_result):
+	* postgresql.c (Fpq_result_status):
+	* postgresql.c (Fpq_make_empty_pgresult):
+	* postgresql.c (syms_of_postgresql):
+	* print.c:
+	* print.c (print_error_message):
+	* print.c (print_cons):
+	* print.c (default_object_printer):
+	* print.c (Fexternal_debugging_output):
+	* print.c (Fopen_termscript):
+	* print.c (syms_of_print):
+	* process-nt.c:
+	* process-nt.c (validate_signal_number):
+	* process-nt.c (mswindows_report_process_error):
+	* process-nt.c (mswindows_report_winsock_error):
+	* process-nt.c (nt_create_process):
+	* process-nt.c (get_internet_address):
+	* process-nt.c (nt_canonicalize_host_name):
+	* process-nt.c (nt_open_network_stream):
+	* process-unix.c (get_internet_address):
+	* process-unix.c (unix_create_process):
+	* process-unix.c (unix_send_process):
+	* process-unix.c (unix_kill_child_process):
+	* process-unix.c (unix_canonicalize_host_name):
+	* process-unix.c (unix_open_network_stream):
+	* process-unix.c (unix_open_multicast_group):
+	* process.c:
+	* process.c (print_process):
+	* process.c (get_process):
+	* process.c (report_process_error):
+	* process.c (init_process_io_handles):
+	* process.c (Fstart_process_internal):
+	* process.c (send_process):
+	* process.c (decode_signal):
+	* process.c (process_send_signal):
+	* process.c (Fkill_process):
+	* process.c (Fquit_process):
+	* process.c (Fstop_process):
+	* process.c (Fcontinue_process):
+	* process.c (Fprocess_send_eof):
+	* process.c (syms_of_process):
+	* ralloc.c (syms_of_ralloc):
+	* rangetab.c (Fput_range_table):
+	* rangetab.c (rangetab_data_validate):
+	* rangetab.c (syms_of_rangetab):
+	* redisplay.c (syms_of_redisplay):
+	* scrollbar.c (syms_of_scrollbar):
+	* search.c (matcher_overflow):
+	* search.c (compile_pattern_1):
+	* search.c (skip_chars):
+	* search.c (search_command):
+	* search.c (Freplace_match):
+	* search.c (Fmatch_data):
+	* search.c (syms_of_search):
+	* select-gtk.c (gtk_get_foreign_selection):
+	* select-gtk.c (gtk_get_window_property_as_lisp_data):
+	* select-gtk.c (lisp_data_to_selection_data):
+	* select-x.c (motif_clipboard_cb):
+	* select-x.c (x_reply_selection_request):
+	* select-x.c (copy_multiple_data):
+	* select-x.c (x_get_foreign_selection):
+	* select-x.c (x_get_window_property_as_lisp_data):
+	* select-x.c (lisp_data_to_selection_data):
+	* select-x.c (CHECK_CUTBUFFER):
+	* select-x.c (Fx_get_cutbuffer_internal):
+	* select-x.c (syms_of_select_x):
+	* select.c (Fown_selection_internal):
+	* select.c (syms_of_select):
+	* sgiplay.c:
+	* sgiplay.c (play_sound_file):
+	* sgiplay.c (play_sound_data):
+	* sgiplay.c (audio_initialize):
+	* sgiplay.c (play_internal):
+	* sgiplay.c (write_mulaw_8_chunk):
+	* sgiplay.c (write_linear_chunk):
+	* sgiplay.c (initialize_audio_port):
+	* sgiplay.c (open_audio_port):
+	* sgiplay.c (set_channels):
+	* sgiplay.c (set_output_format):
+	* sgiplay.c (struct):
+	* sgiplay.c (parse_snd_header):
+	* sheap.c (sheap_adjust_h):
+	* sound.c:
+	* sound.c (report_sound_error):
+	* sound.c (Fplay_sound_file):
+	* sound.c (Fplay_sound):
+	* sound.c (Fding):
+	* sound.c (init_nas_sound):
+	* sound.c (init_native_sound):
+	* sound.c (syms_of_sound):
+	* specifier.c:
+	* specifier.c (print_specifier):
+	* specifier.c (decode_specifier_type):
+	* specifier.c (check_valid_locale_or_locale_type):
+	* specifier.c (decode_locale):
+	* specifier.c (decode_locale_type):
+	* specifier.c (check_valid_domain):
+	* specifier.c (decode_specifier_tag_set):
+	* specifier.c (Fcanonicalize_tag_set):
+	* specifier.c (Fdefine_specifier_tag):
+	* specifier.c (Fspecifier_tag_predicate):
+	* specifier.c (check_valid_inst_list):
+	* specifier.c (check_valid_spec_list):
+	* specifier.c (decode_how_to_add_specification):
+	* specifier.c (check_modifiable_specifier):
+	* specifier.c (Fcopy_specifier):
+	* specifier.c (check_valid_specifier_matchspec):
+	* specifier.c (specifier_instance):
+	* specifier.c (boolean_validate):
+	* specifier.c (syms_of_specifier):
+	* sunplay.c:
+	* sunplay.c (init_device):
+	* sunplay.c (play_sound_file):
+	* sunplay.c (play_sound_data):
+	* symbols.c (oblookup):
+	* symbols.c (reject_constant_symbols):
+	* symbols.c (verify_ok_for_buffer_local):
+	* symbols.c (Fset):
+	* symbols.c (decode_magic_handler_type):
+	* symbols.c (handler_type_from_function_symbol):
+	* symbols.c (Fdefvaralias):
+	* symbols.c (init_symbols_once_early):
+	* symeval.h:
+	* symsinit.h:
+	* syntax.c (scan_lists):
+	* syntax.c (scan_sexps_forward):
+	* syntax.c (syms_of_syntax):
+	* sysdep.c (stuff_char):
+	* sysdep.c (sys_subshell):
+	* sysdep.c (dup2):
+	* toolbar-msw.c (mswindows_output_toolbar):
+	* toolbar.c (decode_toolbar_position):
+	* toolbar.c (compute_frame_toolbar_buttons):
+	* toolbar.c (CTB_ERROR):
+	* toolbar.c (check_toolbar_button_keywords):
+	* toolbar.c (toolbar_validate):
+	* toolbar.c (syms_of_toolbar):
+	* tooltalk.c (print_tooltalk_message):
+	* tooltalk.c (print_tooltalk_pattern):
+	* tooltalk.c (check_status):
+	* tooltalk.c (Ftooltalk_open_connection):
+	* tooltalk.c (syms_of_tooltalk):
+	* ui-byhand.c (Fgtk_box_query_child_packing):
+	* ui-byhand.c (Fgtk_button_box_get_child_size):
+	* ui-byhand.c (Fgtk_calendar_get_date):
+	* ui-byhand.c (Fgtk_clist_get_text):
+	* ui-byhand.c (Fgtk_clist_get_selection):
+	* ui-byhand.c (Fgtk_clist_get_pixmap):
+	* ui-byhand.c (Fgtk_clist_get_pixtext):
+	* ui-byhand.c (Fgtk_color_selection_get_color):
+	* ui-byhand.c (Fgtk_editable_insert_text):
+	* ui-byhand.c (Fgtk_pixmap_get):
+	* ui-byhand.c (Fgtk_curve_get_vector):
+	* ui-byhand.c (Fgtk_curve_set_vector):
+	* ui-byhand.c (Fgtk_label_get):
+	* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
+	* ui-byhand.c (Fgtk_widget_get_pointer):
+	* ui-byhand.c (generic_toolbar_insert_item):
+	* ui-gtk.c (Fdll_load):
+	* ui-gtk.c (ffi_object_printer):
+	* ui-gtk.c (Fgtk_import_variable_internal):
+	* ui-gtk.c (Fgtk_import_function_internal):
+	* ui-gtk.c (Fgtk_call_function):
+	* ui-gtk.c (emacs_gtk_object_printer):
+	* ui-gtk.c (object_getprop):
+	* ui-gtk.c (object_putprop):
+	* ui-gtk.c (emacs_gtk_object_finalizer):
+	* ui-gtk.c (emacs_gtk_boxed_printer):
+	* ui-gtk.c (Fgtk_fundamental_type):
+	* ui-gtk.c (Fgtk_describe_type):
+	* ui-gtk.c (syms_of_ui_gtk):
+	* ui-gtk.c (lisp_to_gtk_type):
+	* ui-gtk.c (symbol_to_enum):
+	* ui-gtk.c (enum_to_symbol):
+	* undo.c (Fprimitive_undo):
+	* undo.c (syms_of_undo):
+	* unexaix.c (report_error):
+	* unexaix.c (report_error_1):
+	* unexapollo.c (unexec):
+	* unexapollo.c (CopyData):
+	* unexconvex.c (report_error):
+	* unexconvex.c (a2;):
+	* unexec.c (report_error):
+	* unexec.c (report_error_1):
+	* widget.c (syms_of_widget):
+	* win32.c (Fmswindows_shell_execute):
+	* window.c (print_window):
+	* window.c (Fdelete_window):
+	* window.c (Fdelete_other_windows):
+	* window.c (Fset_window_buffer):
+	* window.c (Fselect_window):
+	* window.c (Fsplit_window):
+	* window.c (change_window_height):
+	* window.c (window_scroll):
+	* window.c (Fother_window_for_scrolling):
+	* window.c (print_window_config):
+	* window.c (syms_of_window):
+
+2001-05-19  Ben Wing  <ben@xemacs.org>
+
+	* glyphs-shared.c: New.  Try just a bit to start eliminating
+	the massive code duplication in *-gtk.c.
+
+2001-05-16  Ben Wing  <ben@xemacs.org>
+
+	* abbrev.c (syms_of_abbrev):
+	* alloc.c (memory_full):
+	* alloc.c (Fmake_byte_code):
+	* alloc.c (garbage_collect_1):
+	* buffer.c:
+	* buffer.c (print_buffer):
+	* buffer.c (nsberror):
+	* buffer.c (Fget_buffer_create):
+	* buffer.c (Fset_buffer):
+	* buffer.c (Fbury_buffer):
+	* buffer.c (syms_of_buffer):
+	* bytecode.c:
+	* bytecode.c (execute_optimized_program):
+	* bytecode.c (invalid_byte_code):
+	* bytecode.c (check_opcode):
+	* bytecode.c (check_constants_index):
+	* bytecode.c (READ_INSTRUCTION_CHAR):
+	* bytecode.c (optimize_byte_code):
+	* bytecode.c (Ffetch_bytecode):
+	* bytecode.c (syms_of_bytecode):
+	* callint.c (check_mark):
+	* callint.c (Fcall_interactively):
+	* callint.c (syms_of_callint):
+	* callproc.c:
+	* callproc.c (Fold_call_process_internal):
+	* callproc.c (child_setup):
+	* casetab.c (print_case_table):
+	* casetab.c (Fget_case_table):
+	* casetab.c (Fput_case_table):
+	* casetab.c (syms_of_casetab):
+	* chartab.c (symbol_to_char_table_type):
+	* chartab.c (decode_char_table_range):
+	* chartab.c (check_valid_char_table_value):
+	* chartab.c (chartab_data_validate):
+	* chartab.c (check_category_char):
+	* chartab.c (syms_of_chartab):
+	* cmdloop.c (command_loop_3):
+	* cmdloop.c (syms_of_cmdloop):
+	* cmds.c (Fdelete_char):
+	* cmds.c (Fself_insert_command):
+	* cmds.c (syms_of_cmds):
+	* console-msw.c:
+	* console-msw.c (mswindows_canonicalize_console_connection):
+	* console-msw.c (Fmswindows_message_box):
+	* console-msw.c (mswindows_output_last_error):
+	* console-msw.c (msprinter_canonicalize_console_connection):
+	* console-msw.c (syms_of_console_mswindows):
+	* console-msw.h:
+	* console-stream.c (stream_init_console):
+	* console-stream.c (stream_init_frame_1):
+	* console-tty.c (tty_init_console):
+	* console-tty.c (syms_of_console_tty):
+	* console-x.c (get_display_arg_connection):
+	* console.c (print_console):
+	* console.c (decode_console_type):
+	* console.c (Fselect_console):
+	* console.c (Fget_console):
+	* console.c (delete_console_internal):
+	* console.c (syms_of_console):
+	* data.c:
+	* data.c (dead_wrong_type_argument):
+	* data.c (c_write_error):
+	* data.c (lisp_write_error):
+	* data.c (args_out_of_range):
+	* data.c (args_out_of_range_3):
+	* data.c (print_weak_list):
+	* data.c (decode_weak_list_type):
+	* data.c (arith_error):
+	* data.c (init_errors_once_early):
+	* data.c (syms_of_data):
+	* database.c (CHECK_LIVE_DATABASE):
+	* database.c (print_database):
+	* database.c (finalize_database):
+	* database.c (Fopen_database):
+	* database.c (syms_of_database):
+	* debug.c (Fadd_debug_class_to_check):
+	* debug.c (Fdelete_debug_class_to_check):
+	* debug.c (Fset_debug_classes_to_check):
+	* debug.c (Fset_debug_class_types_to_check):
+	* debug.c (Fdebug_types_being_checked):
+	* debug.c (syms_of_debug):
+	* device-gtk.c (gtk_init_device):
+	* device-gtk.c (Fgtk_display_visual_class):
+	* device-gtk.c (Fgtk_keysym_on_keyboard_p):
+	* device-gtk.c (syms_of_device_gtk):
+	* device-msw.c (handle_devmode_changes):
+	* device-msw.c (mswindows_handle_print_dialog_box):
+	* device-msw.c (mswindows_handle_page_setup_dialog_box):
+	* device-msw.c (Fmsprinter_select_settings):
+	* device-msw.c (Fmsprinter_apply_settings):
+	* device-msw.c (print_devmode):
+	* device-tty.c (tty_init_device):
+	* device-tty.c (syms_of_device_tty):
+	* device-x.c (sanity_check_geometry_resource):
+	* device-x.c (x_init_device):
+	* device-x.c (x_get_resource_prefix):
+	* device-x.c (Fx_get_resource):
+	* device-x.c (Fx_put_resource):
+	* device-x.c (Fx_display_visual_class):
+	* device-x.c (Fx_keysym_hash_table):
+	* device-x.c (Fx_keysym_on_keyboard_p):
+	* device-x.c (Fx_get_font_path):
+	* device-x.c (syms_of_device_x):
+	* device.c (print_device):
+	* device.c (Fselect_device):
+	* device.c (Fset_device_selected_frame):
+	* device.c (Fget_device):
+	* device.c (Fmake_device):
+	* device.c (Fset_device_class):
+	* device.c (Fdevice_system_metric):
+	* device.c (Fdomain_device_type):
+	* device.c (syms_of_device):
+	* dialog-gtk.c (syms_of_dialog_gtk):
+	* dialog-msw.c (handle_file_dialog_box):
+	* dialog-msw.c (handle_question_dialog_box):
+	* dialog-msw.c (mswindows_make_dialog_box_internal):
+	* dialog-msw.c (syms_of_dialog_mswindows):
+	* dialog-x.c (dbox_descriptor_to_widget_value):
+	* dialog-x.c (x_make_dialog_box_internal):
+	* dialog.c (Fmake_dialog_box_internal):
+	* dired-msw.c (mswindows_get_files):
+	* dired-msw.c (syms_of_dired_mswindows):
+	* dired.c (Fdirectory_files):
+	* dired.c (file_name_completion):
+	* dired.c (syms_of_dired):
+	* doc.c (get_doc_string):
+	* doc.c (read_doc_string):
+	* doc.c (Fsnarf_documentation):
+	* doprnt.c (parse_off_posnum):
+	* doprnt.c (NEXT_ASCII_BYTE):
+	* doprnt.c (parse_doprnt_spec):
+	* doprnt.c (get_doprnt_args):
+	* doprnt.c (emacs_doprnt_1):
+	* dragdrop.c (syms_of_dragdrop):
+	* editfns.c (Fchar_to_string):
+	* editfns.c (region_limit):
+	* editfns.c (Fformat_time_string):
+	* editfns.c (Fdecode_time):
+	* editfns.c (Fencode_time):
+	* editfns.c (Ftranspose_regions):
+	* editfns.c (syms_of_editfns):
+	* eldap.c (signal_ldap_error):
+	* eldap.c (print_ldap):
+	* eldap.c (finalize_ldap):
+	* eldap.c (Fldap_open):
+	* eldap.c (Fldap_search_basic):
+	* eldap.c (Fldap_add):
+	* eldap.c (Fldap_modify):
+	* eldap.c (syms_of_eldap):
+	* eldap.h (CHECK_LIVE_LDAP):
+	* elhash.c (hash_table_size_validate):
+	* elhash.c (hash_table_weakness_validate):
+	* elhash.c (decode_hash_table_weakness):
+	* elhash.c (hash_table_test_validate):
+	* elhash.c (decode_hash_table_test):
+	* elhash.c (hash_table_rehash_size_validate):
+	* elhash.c (hash_table_rehash_threshold_validate):
+	* elhash.c (hash_table_data_validate):
+	* elhash.c (Fmake_hash_table):
+	* elhash.c (syms_of_elhash):
+	* emacs-widget-accessors.c (Fgtk_adjustment_lower):
+	* emacs-widget-accessors.c (Fgtk_adjustment_upper):
+	* emacs-widget-accessors.c (Fgtk_adjustment_value):
+	* emacs-widget-accessors.c (Fgtk_adjustment_step_increment):
+	* emacs-widget-accessors.c (Fgtk_adjustment_page_increment):
+	* emacs-widget-accessors.c (Fgtk_adjustment_page_size):
+	* emacs-widget-accessors.c (Fgtk_widget_style):
+	* emacs-widget-accessors.c (Fgtk_widget_window):
+	* emacs-widget-accessors.c (Fgtk_widget_state):
+	* emacs-widget-accessors.c (Fgtk_widget_name):
+	* emacs-widget-accessors.c (Fgtk_widget_parent):
+	* emacs-widget-accessors.c (Fgtk_button_child):
+	* emacs-widget-accessors.c (Fgtk_button_in_button):
+	* emacs-widget-accessors.c (Fgtk_button_button_down):
+	* emacs-widget-accessors.c (Fgtk_combo_entry):
+	* emacs-widget-accessors.c (Fgtk_combo_button):
+	* emacs-widget-accessors.c (Fgtk_combo_popup):
+	* emacs-widget-accessors.c (Fgtk_combo_popwin):
+	* emacs-widget-accessors.c (Fgtk_combo_list):
+	* emacs-widget-accessors.c (Fgtk_gamma_curve_table):
+	* emacs-widget-accessors.c (Fgtk_gamma_curve_curve):
+	* emacs-widget-accessors.c (Fgtk_gamma_curve_gamma):
+	* emacs-widget-accessors.c (Fgtk_gamma_curve_gamma_dialog):
+	* emacs-widget-accessors.c (Fgtk_gamma_curve_gamma_text):
+	* emacs-widget-accessors.c (Fgtk_check_menu_item_active):
+	* emacs-widget-accessors.c (Fgtk_notebook_tab_pos):
+	* emacs-widget-accessors.c (Fgtk_text_hadj):
+	* emacs-widget-accessors.c (Fgtk_text_vadj):
+	* emacs-widget-accessors.c (Fgtk_file_selection_dir_list):
+	* emacs-widget-accessors.c (Fgtk_file_selection_file_list):
+	* emacs-widget-accessors.c (Fgtk_file_selection_selection_entry):
+	* emacs-widget-accessors.c (Fgtk_file_selection_selection_text):
+	* emacs-widget-accessors.c (Fgtk_file_selection_main_vbox):
+	* emacs-widget-accessors.c (Fgtk_file_selection_ok_button):
+	* emacs-widget-accessors.c (Fgtk_file_selection_cancel_button):
+	* emacs-widget-accessors.c (Fgtk_file_selection_help_button):
+	* emacs-widget-accessors.c (Fgtk_file_selection_action_area):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_fontsel):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_main_vbox):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_action_area):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_ok_button):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_apply_button):
+	* emacs-widget-accessors.c (Fgtk_font_selection_dialog_cancel_button):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_colorsel):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_main_vbox):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_ok_button):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_reset_button):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_cancel_button):
+	* emacs-widget-accessors.c (Fgtk_color_selection_dialog_help_button):
+	* emacs-widget-accessors.c (Fgtk_dialog_vbox):
+	* emacs-widget-accessors.c (Fgtk_dialog_action_area):
+	* emacs-widget-accessors.c (Fgtk_input_dialog_close_button):
+	* emacs-widget-accessors.c (Fgtk_input_dialog_save_button):
+	* emacs-widget-accessors.c (Fgtk_plug_socket_window):
+	* emacs-widget-accessors.c (Fgtk_plug_same_app):
+	* emacs-widget-accessors.c (Fgtk_object_flags):
+	* emacs-widget-accessors.c (Fgtk_object_ref_count):
+	* emacs-widget-accessors.c (Fgtk_paned_child1):
+	* emacs-widget-accessors.c (Fgtk_paned_child2):
+	* emacs-widget-accessors.c (Fgtk_paned_child1_resize):
+	* emacs-widget-accessors.c (Fgtk_paned_child2_resize):
+	* emacs-widget-accessors.c (Fgtk_paned_child1_shrink):
+	* emacs-widget-accessors.c (Fgtk_paned_child2_shrink):
+	* emacs-widget-accessors.c (Fgtk_clist_rows):
+	* emacs-widget-accessors.c (Fgtk_clist_columns):
+	* emacs-widget-accessors.c (Fgtk_clist_hadjustment):
+	* emacs-widget-accessors.c (Fgtk_clist_vadjustment):
+	* emacs-widget-accessors.c (Fgtk_clist_sort_type):
+	* emacs-widget-accessors.c (Fgtk_clist_focus_row):
+	* emacs-widget-accessors.c (Fgtk_clist_sort_column):
+	* emacs-widget-accessors.c (Fgtk_list_children):
+	* emacs-widget-accessors.c (Fgtk_list_selection):
+	* emacs-widget-accessors.c (Fgtk_tree_children):
+	* emacs-widget-accessors.c (Fgtk_tree_root_tree):
+	* emacs-widget-accessors.c (Fgtk_tree_tree_owner):
+	* emacs-widget-accessors.c (Fgtk_tree_selection):
+	* emacs-widget-accessors.c (Fgtk_tree_item_subtree):
+	* emacs-widget-accessors.c (Fgtk_scrolled_window_hscrollbar):
+	* emacs-widget-accessors.c (Fgtk_scrolled_window_vscrollbar):
+	* emacs-widget-accessors.c (Fgtk_scrolled_window_hscrollbar_visible):
+	* emacs-widget-accessors.c (Fgtk_scrolled_window_vscrollbar_visible):
+	* emacs.c (main_1):
+	* emacs.c (Fsplit_path):
+	* emacs.c (syms_of_emacs):
+	* emodules.c (emodules_load):
+	* esd.c:
+	* esd.c (esd_play_sound_file):
+	* esd.c (esd_play_sound_data):
+	* eval.c:
+	* eval.c (print_subr):
+	* eval.c (FletX):
+	* eval.c (Flet):
+	* eval.c (Fdefvar):
+	* eval.c (Fdefconst):
+	* eval.c (condition_case_3):
+	* eval.c (return_from_signal):
+	* eval.c (signal_error_1):
+	* eval.c (maybe_signal_error_1):
+	* eval.c (maybe_signal_continuable_error_1):
+	* eval.c (signal_error):
+	* eval.c (maybe_signal_error):
+	* eval.c (signal_continuable_error):
+	* eval.c (maybe_signal_continuable_error):
+	* eval.c (signal_error_2):
+	* eval.c (maybe_signal_error_2):
+	* eval.c (signal_continuable_error_2):
+	* eval.c (maybe_signal_continuable_error_2):
+	* eval.c (signal_ferror):
+	* eval.c (maybe_signal_ferror):
+	* eval.c (signal_continuable_ferror):
+	* eval.c (maybe_signal_continuable_ferror):
+	* eval.c (signal_ferror_with_frob):
+	* eval.c (maybe_signal_ferror_with_frob):
+	* eval.c (signal_continuable_ferror_with_frob):
+	* eval.c (maybe_signal_continuable_ferror_with_frob):
+	* eval.c (signal_quit):
+	* eval.c (signal_invalid_function_error):
+	* eval.c (signal_wrong_number_of_arguments_error):
+	* eval.c (signal_malformed_list_error):
+	* eval.c (signal_malformed_property_list_error):
+	* eval.c (signal_circular_list_error):
+	* eval.c (signal_circular_property_list_error):
+	* eval.c (syntax_error):
+	* eval.c (syntax_error_2):
+	* eval.c (maybe_syntax_error):
+	* eval.c (sferror):
+	* eval.c (sferror_2):
+	* eval.c (maybe_sferror):
+	* eval.c (invalid_argument):
+	* eval.c (invalid_argument_2):
+	* eval.c (maybe_invalid_argument):
+	* eval.c (invalid_constant):
+	* eval.c (invalid_constant_2):
+	* eval.c (maybe_invalid_constant):
+	* eval.c (invalid_operation):
+	* eval.c (invalid_operation_2):
+	* eval.c (maybe_invalid_operation):
+	* eval.c (invalid_change):
+	* eval.c (invalid_change_2):
+	* eval.c (maybe_invalid_change):
+	* eval.c (invalid_state):
+	* eval.c (invalid_state_2):
+	* eval.c (maybe_invalid_state):
+	* eval.c (stack_overflow):
+	* eval.c (out_of_memory):
+	* eval.c (printing_unreadable_object):
+	* eval.c (do_autoload):
+	* eval.c (Feval):
+	* eval.c (Ffuncall):
+	* eval.c (grow_specpdl):
+	* eval.c (syms_of_eval):
+	* event-Xt.c (syms_of_event_Xt):
+	* event-gtk.c (syms_of_event_gtk):
+	* event-msw.c (mswindows_need_event_in_modal_loop):
+	* event-msw.c (emacs_mswindows_select_process):
+	* event-stream.c:
+	* event-stream.c (check_event_stream_ok):
+	* event-stream.c (lisp_number_to_milliseconds):
+	* event-stream.c (Fnext_event):
+	* event-stream.c (munge_keymap_translate):
+	* event-stream.c (Fset_recent_keys_ring_size):
+	* event-stream.c (execute_command_event):
+	* event-stream.c (syms_of_event_stream):
+	* events.c (print_event):
+	* events.c (Fmake_event):
+	* events.c (WRONG_EVENT_TYPE_FOR_PROPERTY):
+	* events.c (Fdeallocate_event):
+	* events.c (Fcopy_event):
+	* events.c (character_to_event):
+	* events.c (syms_of_events):
+	* extents.c (print_extent):
+	* extents.c (Fset_extent_parent):
+	* extents.c (decode_map_extents_flags):
+	* extents.c (decode_extent_at_flag):
+	* extents.c (symbol_to_glyph_layout):
+	* extents.c (Fset_extent_property):
+	* extents.c (syms_of_extents):
+	* faces.c (face_validate):
+	* faces.c (Fget_face):
+	* faces.c (syms_of_faces):
+	* file-coding.c:
+	* file-coding.c (print_coding_system):
+	* file-coding.c (symbol_to_eol_type):
+	* file-coding.c (Fget_coding_system):
+	* file-coding.c (parse_charset_conversion_specs):
+	* file-coding.c (Fmake_coding_system):
+	* file-coding.c (Fcoding_system_aliasee):
+	* file-coding.c (Fdefine_coding_system_alias):
+	* file-coding.c (Fcoding_system_property):
+	* file-coding.c (decode_coding_category):
+	* file-coding.c (Fset_coding_priority_list):
+	* file-coding.c (syms_of_file_coding):
+	* fileio.c:
+	* fileio.c (report_file_type_error):
+	* fileio.c (report_error_with_errno):
+	* fileio.c (report_file_error):
+	* fileio.c (Fmake_temp_name):
+	* fileio.c (Ffile_truename):
+	* fileio.c (Fmake_directory_internal):
+	* fileio.c (Fdelete_directory):
+	* fileio.c (Fdelete_file):
+	* fileio.c (Fset_file_modes):
+	* fileio.c (syms_of_fileio):
+	* filelock.c (syms_of_filelock):
+	* floatfns.c (float_error):
+	* fns.c:
+	* fns.c (check_losing_bytecode):
+	* fns.c (safe_copy_tree):
+	* fns.c (Fget):
+	* fns.c (Fput):
+	* fns.c (Fremprop):
+	* fns.c (Fobject_plist):
+	* fns.c (internal_equal):
+	* fns.c (internal_old_equal):
+	* fns.c (Fload_average):
+	* fns.c (Frequire):
+	* fns.c (base64_conversion_error):
+	* fns.c (base64_decode_1):
+	* fns.c (syms_of_fns):
+	* font-lock.c (syms_of_font_lock):
+	* frame-gtk.c (gtk_create_widgets):
+	* frame-gtk.c (gtk_init_frame_1):
+	* frame-gtk.c (gtk_cant_notify_wm_error):
+	* frame-gtk.c (syms_of_frame_gtk):
+	* frame-x.c (x_create_widgets):
+	* frame-x.c (x_init_frame_1):
+	* frame-x.c (x_cant_notify_wm_error):
+	* frame-x.c (syms_of_frame_x):
+	* frame.c (print_frame):
+	* frame.c (setup_frame_without_minibuffer):
+	* frame.c (Fmake_frame):
+	* frame.c (selected_frame):
+	* frame.c (device_selected_frame):
+	* frame.c (Fset_frame_selected_window):
+	* frame.c (delete_frame_internal):
+	* frame.c (Fmake_frame_invisible):
+	* frame.c (store_minibuf_frame_prop):
+	* frame.c (syms_of_frame):
+	* general-slots.h:
+	* glade.c (Fglade_xml_textdomain):
+	* glyphs-gtk.c:
+	* glyphs-msw.c (console_type_create_glyphs_mswindows):
+	* glyphs-gtk.c (check_pointer_sizes):
+	* glyphs-gtk.c (init_image_instance_from_gdk_image):
+	* glyphs-gtk.c (image_instance_add_gdk_image):
+	* glyphs-gtk.c (init_image_instance_from_xbm_inline):
+	* glyphs-gtk.c (write_lisp_string_to_temp_file):
+	* glyphs-gtk.c (gtk_xpm_instantiate):
+	* glyphs-gtk.c (gtk_xface_instantiate):
+	* glyphs-gtk.c (gtk_resource_validate):
+	* glyphs-gtk.c (gtk_resource_normalize):
+	* glyphs-gtk.c (gtk_resource_instantiate):
+	* glyphs-gtk.c (check_valid_resource_symbol):
+	* glyphs-gtk.c (check_valid_resource_id):
+	* glyphs-gtk.c (font_instantiate):
+	* glyphs-gtk.c (cursor_font_instantiate):
+	* glyphs-gtk.c (gtk_subwindow_instantiate):
+	* glyphs-gtk.c (syms_of_glyphs_gtk):
+	* glyphs-msw.c:
+	* glyphs-msw.c (init_image_instance_from_dibitmap):
+	* glyphs-msw.c (image_instance_add_dibitmap):
+	* glyphs-msw.c (mswindows_init_image_instance_from_eimage):
+	* glyphs-msw.c (xpm_to_eimage):
+	* glyphs-msw.c (mswindows_xpm_instantiate):
+	* glyphs-msw.c (mswindows_resource_validate):
+	* glyphs-msw.c (mswindows_resource_normalize):
+	* glyphs-msw.c (resource_name_to_resource):
+	* glyphs-msw.c (mswindows_resource_instantiate):
+	* glyphs-msw.c (check_valid_resource_symbol):
+	* glyphs-msw.c (check_valid_resource_id):
+	* glyphs-msw.c (mswindows_xface_instantiate):
+	* glyphs-msw.c (mswindows_subwindow_instantiate):
+	* glyphs-msw.c (mswindows_widget_instantiate):
+	* glyphs-msw.c (add_tree_item):
+	* glyphs-msw.c (add_tab_item):
+	* glyphs-msw.c (mswindows_combo_box_instantiate):
+	* glyphs-msw.c (syms_of_glyphs_mswindows):
+	* glyphs-widget.c (check_valid_orientation):
+	* glyphs-widget.c (check_valid_tab_orientation):
+	* glyphs-widget.c (check_valid_justification):
+	* glyphs-widget.c (widget_validate):
+	* glyphs-widget.c (combo_box_validate):
+	* glyphs-x.c (write_lisp_string_to_temp_file):
+	* glyphs-x.c (check_pointer_sizes):
+	* glyphs-x.c (init_image_instance_from_x_image):
+	* glyphs-x.c (image_instance_add_x_image):
+	* glyphs-x.c (init_image_instance_from_xbm_inline):
+	* glyphs-x.c (x_xpm_instantiate):
+	* glyphs-x.c (x_xface_instantiate):
+	* glyphs-x.c (font_instantiate):
+	* glyphs-x.c (cursor_font_instantiate):
+	* glyphs-x.c (x_redisplay_widget):
+	* glyphs-x.c (x_subwindow_instantiate):
+	* glyphs-x.c (x_widget_instantiate):
+	* glyphs.c:
+	* glyphs.c (decode_device_ii_format):
+	* glyphs.c (process_image_string_instantiator):
+	* glyphs.c (if):
+	* glyphs.c (file_or_data_must_be_present):
+	* glyphs.c (data_must_be_present):
+	* glyphs.c (face_must_be_present):
+	* glyphs.c (get_image_instantiator_governing_domain):
+	* glyphs.c (instantiate_image_instantiator):
+	* glyphs.c (print_image_instance):
+	* glyphs.c (decode_image_instance_type):
+	* glyphs.c (incompatible_image_types):
+	* glyphs.c (make_image_instance_1):
+	* glyphs.c (signal_image_error):
+	* glyphs.c (signal_image_error_2):
+	* glyphs.c (signal_double_image_error_2):
+	* glyphs.c (simple_image_type_normalize):
+	* glyphs.c (check_valid_xbm_inline):
+	* glyphs.c (bitmap_to_lisp_data):
+	* glyphs.c (xbm_normalize):
+	* glyphs.c (xface_normalize):
+	* glyphs.c (pixmap_to_lisp_data):
+	* glyphs.c (check_valid_xpm_color_symbols):
+	* glyphs.c (evaluate_xpm_color_symbols):
+	* glyphs.c (xpm_normalize):
+	* glyphs.c (image_instantiate):
+	* glyphs.c (image_validate):
+	* glyphs.c (print_glyph):
+	* glyphs.c (decode_glyph_type):
+	* glyphs.c (subwindow_instantiate):
+	* glyphs.c (syms_of_glyphs):
+	* glyphs.h:
+	* gpmevent.c (Fgpm_enable):
+	* gui-gtk.c (syms_of_gui_gtk):
+	* gui-x.c (button_item_to_widget_value):
+	* gui-x.c (gui_items_to_widget_values_1):
+	* gui-x.c (gui_items_to_widget_values):
+	* gui.c:
+	* gui.c (gui_item_add_keyval_pair):
+	* gui.c (make_gui_item_from_keywords_internal):
+	* gui.c (widget_gui_parse_item_keywords):
+	* gui.c (update_gui_item_keywords):
+	* gui.c (signal_too_long_error):
+	* gui.c (print_gui_item):
+	* gui.c (parse_gui_item_tree_item):
+	* gui.c (syms_of_gui):
+	* gutter.c (decode_gutter_position):
+	* gutter.c (gutter_validate):
+	* gutter.c (gutter_size_validate):
+	* gutter.c (gutter_visible_validate):
+	* gutter.c (syms_of_gutter):
+	* hpplay.c:
+	* hpplay.c (player_error_internal):
+	* hpplay.c (myHandler):
+	* hpplay.c (play_bucket_internal):
+	* hpplay.c (play_sound_file):
+	* hpplay.c (play_sound_data):
+	* hpplay.c (vars_of_hpplay):
+	* indent.c (Findent_to):
+	* indent.c (syms_of_indent):
+	* input-method-xlib.c (Fx_open_xim):
+	* input-method-xlib.c (Fx_close_xim):
+	* input-method-xlib.c (syms_of_input_method_xlib):
+	* insdel.c (get_buffer_range_char):
+	* insdel.c (get_string_range_char):
+	* insdel.c (make_gap):
+	* insdel.c (buffer_insert_string_1):
+	* intl.c (syms_of_intl):
+	* keymap.c (print_keymap):
+	* keymap.c (traverse_keymaps):
+	* keymap.c (check_keymap_definition_loop):
+	* keymap.c (define_key_check_and_coerce_keysym):
+	* keymap.c (define_key_parser):
+	* keymap.c (key_desc_list_to_event):
+	* keymap.c (ensure_meta_prefix_char_keymapp):
+	* keymap.c (Fdefine_key):
+	* keymap.c (Fsingle_key_description):
+	* keymap.c (Ftext_char_description):
+	* libsst.c:
+	* libsst.c (dial;):
+	* libsst.h:
+	* libsst.h (sst_dtmf):
+	* linuxplay.c:
+	* linuxplay.c (audio_init):
+	* linuxplay.c (linux_play_data_or_file):
+	* linuxplay.c (play_sound_file):
+	* linuxplay.c (play_sound_data):
+	* lisp.h:
+	* lread.c (read_syntax_error):
+	* lread.c (continuable_read_syntax_error):
+	* lread.c (readchar):
+	* lread.c (pas_de_lache_ici):
+	* lread.c (load_force_doc_string_unwind):
+	* lread.c (Fload_internal):
+	* lread.c (decode_mode_1):
+	* lread.c (readevalloop):
+	* lread.c (Feval_buffer):
+	* lread.c (read_escape):
+	* lread.c (FSF_LOSSAGE):
+	* lread.c (read_atom_0):
+	* lread.c (reader_nextchar):
+	* lread.c (read_list_conser):
+	* lread.c (syms_of_lread):
+	* lread.c (vars_of_lread):
+	* lstream.c (Lstream_internal_error):
+	* lstream.h (wrap_lstream):
+	* macros.c (Fstart_kbd_macro):
+	* macros.c (Fend_kbd_macro):
+	* macros.c (pop_kbd_macro_event):
+	* macros.c (Fcall_last_kbd_macro):
+	* macros.c (Fexecute_kbd_macro):
+	* macros.c (syms_of_macros):
+	* marker.c (print_marker):
+	* marker.c (set_marker_internal):
+	* marker.c (bi_marker_position):
+	* marker.c (marker_position):
+	* marker.c (set_bi_marker_position):
+	* marker.c (set_marker_position):
+	* md5.c (md5_coding_system):
+	* menubar-gtk.c (menu_convert):
+	* menubar-gtk.c (menu_descriptor_to_widget_1):
+	* menubar-msw.c (mswindows_translate_menu_or_dialog_item):
+	* menubar-msw.c (populate_menu_add_item):
+	* menubar-msw.c (populate_or_checksum_helper):
+	* menubar-msw.c (unsafe_handle_wm_initmenupopup_1):
+	* menubar-msw.c (mswindows_popup_menu):
+	* menubar-x.c (menu_item_descriptor_to_widget_value_1):
+	* menubar-x.c (x_popup_menu):
+	* menubar-x.c (Faccelerate_menu):
+	* menubar.c (syms_of_menubar):
+	* menubar.c (vars_of_menubar):
+	* minibuf.c (Ftry_completion):
+	* minibuf.c (syms_of_minibuf):
+	* miscplay.c:
+	* miscplay.c (parse_wave_complete):
+	* miscplay.c (waverequire):
+	* miscplay.c (parsewave):
+	* miscplay.c (parsesundecaudio):
+	* miscplay.c (sndcnv8U_2mono):
+	* miscplay.c (sndcnv8S_2mono):
+	* miscplay.c (sndcnv2monounsigned):
+	* miscplay.c (sndcnv2unsigned):
+	* miscplay.c (int2ulaw):
+	* miscplay.c (sndcnvULaw_2linear):
+	* miscplay.c (sndcnvULaw_2mono):
+	* miscplay.c (sndcnv16_2monoLE):
+	* miscplay.c (sndcnv16_2monoBE):
+	* miscplay.c (sndcnv2byteLE):
+	* miscplay.c (sndcnv2byteBE):
+	* miscplay.c (sndcnv2monobyteLE):
+	* miscplay.c (sndcnv2monobyteBE):
+	* miscplay.c (analyze_format):
+	* miscplay.h:
+	* miscplay.h (HEADERSZ):
+	* miscplay.h (parse_wave_complete):
+	* mule-ccl.c (Fccl_execute):
+	* mule-ccl.c (vars_of_mule_ccl):
+	* mule-charset.c (print_charset):
+	* mule-charset.c (get_unallocated_leading_byte):
+	* mule-charset.c (Fget_charset):
+	* mule-charset.c (Fmake_charset):
+	* mule-charset.c (Fcharset_from_attributes):
+	* mule-charset.c (Fcharset_property):
+	* mule-charset.c (Fset_charset_ccl_program):
+	* mule-charset.c (Fmake_char):
+	* mule-charset.c (Fchar_octet):
+	* mule-charset.c (lookup_composite_char):
+	* mule-charset.c (syms_of_mule_charset):
+	* mule-wnnfns.c (Fwnn_set_param):
+	* mule-wnnfns.c (syms_of_mule_wnn):
+	* mule.c (Fdefine_word_pattern):
+	* nas.c:
+	* nas.c (XTOOLKIT):
+	* nas.c (play_sound_file):
+	* nas.c (close_down_play):
+	* nas.c (do_caching_play):
+	* nas.c (play_sound_data):
+	* nas.c (CatchIoErrorAndJump):
+	* nas.c (NameFromData):
+	* nas.c (SndOpenDataForReading):
+	* nas.c (cmpID):
+	* nas.c (dread):
+	* nas.c (dgetc):
+	* nas.c (readChunk):
+	* nas.c (WaveOpenDataForReading):
+	* nas.c (SoundOpenDataForReading):
+	* ntplay.c:
+	* ntplay.c (play_sound_file):
+	* ntplay.c (play_sound_data_1):
+	* ntplay.c (play_sound_data):
+	* ntproc.c:
+	* ntproc.c (prepare_standard_handles):
+	* ntproc.c (vars_of_ntproc):
+	* objects-gtk.c (gtk_parse_nearest_color):
+	* objects-gtk.c (gtk_initialize_font_instance):
+	* objects-msw.c (mswindows_initialize_color_instance):
+	* objects-msw.c (initialize_font_instance):
+	* objects-x.c (x_parse_nearest_color):
+	* objects-x.c (x_initialize_font_instance):
+	* objects-x.c (x_font_instance_truename):
+	* objects.c (finalose):
+	* objects.c (print_color_instance):
+	* objects.c (print_font_instance):
+	* objects.c (font_instance_truename_internal):
+	* objects.c (color_instantiate):
+	* objects.c (color_validate):
+	* objects.c (font_validate):
+	* objects.c (face_boolean_instantiate):
+	* objects.c (face_boolean_validate):
+	* objects.c (syms_of_objects):
+	* postgresql.c (CHECK_LIVE_CONNECTION):
+	* postgresql.c (print_pgconn):
+	* postgresql.c (finalize_pgconn):
+	* postgresql.c (print_pgresult):
+	* postgresql.c (finalize_pgresult):
+	* postgresql.c (Fpq_connectdb):
+	* postgresql.c (Fpq_connect_start):
+	* postgresql.c (Fpq_connect_poll):
+	* postgresql.c (Fpq_set_client_encoding):
+	* postgresql.c (Fpq_reset_start):
+	* postgresql.c (Fpq_reset_poll):
+	* postgresql.c (Fpq_pgconn):
+	* postgresql.c (Fpq_exec):
+	* postgresql.c (Fpq_send_query):
+	* postgresql.c (Fpq_get_result):
+	* postgresql.c (Fpq_result_status):
+	* postgresql.c (Fpq_make_empty_pgresult):
+	* postgresql.c (syms_of_postgresql):
+	* print.c:
+	* print.c (print_error_message):
+	* print.c (print_cons):
+	* print.c (default_object_printer):
+	* print.c (Fexternal_debugging_output):
+	* print.c (Fopen_termscript):
+	* print.c (syms_of_print):
+	* process-nt.c:
+	* process-nt.c (validate_signal_number):
+	* process-nt.c (mswindows_report_process_error):
+	* process-nt.c (mswindows_report_winsock_error):
+	* process-nt.c (nt_create_process):
+	* process-nt.c (get_internet_address):
+	* process-nt.c (nt_canonicalize_host_name):
+	* process-nt.c (nt_open_network_stream):
+	* process-unix.c (get_internet_address):
+	* process-unix.c (unix_create_process):
+	* process-unix.c (unix_send_process):
+	* process-unix.c (unix_kill_child_process):
+	* process-unix.c (unix_canonicalize_host_name):
+	* process-unix.c (unix_open_network_stream):
+	* process-unix.c (unix_open_multicast_group):
+	* process.c:
+	* process.c (print_process):
+	* process.c (get_process):
+	* process.c (report_process_error):
+	* process.c (init_process_io_handles):
+	* process.c (Fstart_process_internal):
+	* process.c (send_process):
+	* process.c (decode_signal):
+	* process.c (process_send_signal):
+	* process.c (Fkill_process):
+	* process.c (Fquit_process):
+	* process.c (Fstop_process):
+	* process.c (Fcontinue_process):
+	* process.c (Fprocess_send_eof):
+	* process.c (syms_of_process):
+	* ralloc.c (syms_of_ralloc):
+	* rangetab.c (Fput_range_table):
+	* rangetab.c (rangetab_data_validate):
+	* rangetab.c (syms_of_rangetab):
+	* redisplay.c (syms_of_redisplay):
+	* scrollbar.c (syms_of_scrollbar):
+	* search.c (matcher_overflow):
+	* search.c (compile_pattern_1):
+	* search.c (skip_chars):
+	* search.c (search_command):
+	* search.c (Freplace_match):
+	* search.c (Fmatch_data):
+	* search.c (syms_of_search):
+	* select-gtk.c (gtk_get_foreign_selection):
+	* select-gtk.c (gtk_get_window_property_as_lisp_data):
+	* select-gtk.c (lisp_data_to_selection_data):
+	* select-x.c (motif_clipboard_cb):
+	* select-x.c (x_reply_selection_request):
+	* select-x.c (copy_multiple_data):
+	* select-x.c (x_get_foreign_selection):
+	* select-x.c (x_get_window_property_as_lisp_data):
+	* select-x.c (lisp_data_to_selection_data):
+	* select-x.c (CHECK_CUTBUFFER):
+	* select-x.c (Fx_get_cutbuffer_internal):
+	* select-x.c (syms_of_select_x):
+	* select.c (Fown_selection_internal):
+	* select.c (syms_of_select):
+	* sgiplay.c:
+	* sgiplay.c (play_sound_file):
+	* sgiplay.c (play_sound_data):
+	* sgiplay.c (audio_initialize):
+	* sgiplay.c (play_internal):
+	* sgiplay.c (write_mulaw_8_chunk):
+	* sgiplay.c (write_linear_chunk):
+	* sgiplay.c (initialize_audio_port):
+	* sgiplay.c (open_audio_port):
+	* sgiplay.c (set_channels):
+	* sgiplay.c (set_output_format):
+	* sgiplay.c (struct):
+	* sgiplay.c (parse_snd_header):
+	* sheap.c (sheap_adjust_h):
+	* sound.c:
+	* sound.c (report_sound_error):
+	* sound.c (Fplay_sound_file):
+	* sound.c (Fplay_sound):
+	* sound.c (Fding):
+	* sound.c (init_nas_sound):
+	* sound.c (init_native_sound):
+	* sound.c (syms_of_sound):
+	* specifier.c:
+	* specifier.c (print_specifier):
+	* specifier.c (decode_specifier_type):
+	* specifier.c (check_valid_locale_or_locale_type):
+	* specifier.c (decode_locale):
+	* specifier.c (decode_locale_type):
+	* specifier.c (check_valid_domain):
+	* specifier.c (decode_specifier_tag_set):
+	* specifier.c (Fcanonicalize_tag_set):
+	* specifier.c (Fdefine_specifier_tag):
+	* specifier.c (Fspecifier_tag_predicate):
+	* specifier.c (check_valid_inst_list):
+	* specifier.c (check_valid_spec_list):
+	* specifier.c (decode_how_to_add_specification):
+	* specifier.c (check_modifiable_specifier):
+	* specifier.c (Fcopy_specifier):
+	* specifier.c (check_valid_specifier_matchspec):
+	* specifier.c (specifier_instance):
+	* specifier.c (boolean_validate):
+	* specifier.c (syms_of_specifier):
+	* sunplay.c:
+	* sunplay.c (init_device):
+	* sunplay.c (play_sound_file):
+	* sunplay.c (play_sound_data):
+	* symbols.c (oblookup):
+	* symbols.c (reject_constant_symbols):
+	* symbols.c (verify_ok_for_buffer_local):
+	* symbols.c (Fset):
+	* symbols.c (decode_magic_handler_type):
+	* symbols.c (handler_type_from_function_symbol):
+	* symbols.c (Fdefvaralias):
+	* symbols.c (init_symbols_once_early):
+	* symeval.h:
+	* symsinit.h:
+	* syntax.c (scan_lists):
+	* syntax.c (scan_sexps_forward):
+	* syntax.c (syms_of_syntax):
+	* sysdep.c (stuff_char):
+	* sysdep.c (sys_subshell):
+	* sysdep.c (dup2):
+	* toolbar-msw.c (mswindows_output_toolbar):
+	* toolbar.c (decode_toolbar_position):
+	* toolbar.c (compute_frame_toolbar_buttons):
+	* toolbar.c (CTB_ERROR):
+	* toolbar.c (check_toolbar_button_keywords):
+	* toolbar.c (toolbar_validate):
+	* toolbar.c (syms_of_toolbar):
+	* tooltalk.c (print_tooltalk_message):
+	* tooltalk.c (print_tooltalk_pattern):
+	* tooltalk.c (check_status):
+	* tooltalk.c (Ftooltalk_open_connection):
+	* tooltalk.c (syms_of_tooltalk):
+	* ui-byhand.c (Fgtk_box_query_child_packing):
+	* ui-byhand.c (Fgtk_button_box_get_child_size):
+	* ui-byhand.c (Fgtk_calendar_get_date):
+	* ui-byhand.c (Fgtk_clist_get_text):
+	* ui-byhand.c (Fgtk_clist_get_selection):
+	* ui-byhand.c (Fgtk_clist_get_pixmap):
+	* ui-byhand.c (Fgtk_clist_get_pixtext):
+	* ui-byhand.c (Fgtk_color_selection_get_color):
+	* ui-byhand.c (Fgtk_editable_insert_text):
+	* ui-byhand.c (Fgtk_pixmap_get):
+	* ui-byhand.c (Fgtk_curve_get_vector):
+	* ui-byhand.c (Fgtk_curve_set_vector):
+	* ui-byhand.c (Fgtk_label_get):
+	* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
+	* ui-byhand.c (Fgtk_widget_get_pointer):
+	* ui-byhand.c (generic_toolbar_insert_item):
+	* ui-gtk.c (Fdll_load):
+	* ui-gtk.c (ffi_object_printer):
+	* ui-gtk.c (Fgtk_import_variable_internal):
+	* ui-gtk.c (Fgtk_import_function_internal):
+	* ui-gtk.c (Fgtk_call_function):
+	* ui-gtk.c (emacs_gtk_object_printer):
+	* ui-gtk.c (object_getprop):
+	* ui-gtk.c (object_putprop):
+	* ui-gtk.c (emacs_gtk_object_finalizer):
+	* ui-gtk.c (emacs_gtk_boxed_printer):
+	* ui-gtk.c (Fgtk_fundamental_type):
+	* ui-gtk.c (Fgtk_describe_type):
+	* ui-gtk.c (syms_of_ui_gtk):
+	* ui-gtk.c (lisp_to_gtk_type):
+	* ui-gtk.c (symbol_to_enum):
+	* ui-gtk.c (enum_to_symbol):
+	* undo.c (Fprimitive_undo):
+	* undo.c (syms_of_undo):
+	* unexaix.c (report_error):
+	* unexaix.c (report_error_1):
+	* unexapollo.c (unexec):
+	* unexapollo.c (CopyData):
+	* unexconvex.c (report_error):
+	* unexconvex.c (a2;):
+	* unexec.c (report_error):
+	* unexec.c (report_error_1):
+	* widget.c (syms_of_widget):
+	* win32.c (Fmswindows_shell_execute):
+	* window.c (print_window):
+	* window.c (Fdelete_window):
+	* window.c (Fdelete_other_windows):
+	* window.c (Fset_window_buffer):
+	* window.c (Fselect_window):
+	* window.c (Fsplit_window):
+	* window.c (change_window_height):
+	* window.c (window_scroll):
+	* window.c (Fother_window_for_scrolling):
+	* window.c (print_window_config):
+	* window.c (syms_of_window):
+	-- defsymbol -> DEFSYMBOL.
+	-- add an error type to all errors.
+	-- eliminate the error functions in eval.c that let you just
+	   use Qerror as the type.
+	-- redo the error API to be more consistent, sensibly named,
+	   and easier to use.
+	-- redo the error hierarchy somewhat.  create new errors:
+	   structure-formation-error, gui-error, invalid-constant,
+	   stack-overflow, out-of-memory, process-error, network-error,
+	   sound-error, printing-unreadable-object, base64-conversion-
+	   error; coding-system-error renamed to text-conversion error;
+	   some others.
+	-- fix Mule problems in error strings in emodules.c, tooltalk.c.
+	-- fix error handling in mswin open-network-stream.
+	-- Mule-ize all sound files and clean up the headers.
+	-- nativesound.h -> sound.h and used for all sound files.
+	-- move some shared stuff into glyphs-shared.c: first attempt
+	   at eliminating some of the massive GTK code duplication.
+
 2001-05-23  Ben Wing  <ben@xemacs.org>
 
 	* event-msw.c (winsock_writer):

--- a/src/Makefile.in.in	Thu May 24 06:30:21 2001 +0000
+++ b/src/Makefile.in.in	Thu May 24 07:51:33 2001 +0000
@@ -190,7 +190,7 @@
  eval.o events.o $(extra_objs)\
  event-stream.o extents.o faces.o\
  fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o font-lock.o\
- frame.o general.o glyphs.o glyphs-eimage.o glyphs-widget.o\
+ frame.o general.o glyphs.o glyphs-eimage.o glyphs-shared.o glyphs-widget.o\
  gui.o gutter.o $(gui_objs) hash.o imgproc.o indent.o insdel.o intl.o\
  keymap.o $(RTC_patch_objs) line-number.o lread.o lstream.o\
  macros.o marker.o md5.o minibuf.o objects.o opaque.o\

--- a/src/abbrev.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/abbrev.c	Thu May 24 07:51:33 2001 +0000
@@ -404,7 +404,7 @@
 void
 syms_of_abbrev (void)
 {
-  defsymbol (&Qpre_abbrev_expand_hook, "pre-abbrev-expand-hook");
+  DEFSYMBOL (Qpre_abbrev_expand_hook);
   DEFSUBR (Fexpand_abbrev);
 }
 

--- a/src/alloc.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/alloc.c	Thu May 24 07:51:33 2001 +0000
@@ -236,7 +236,7 @@
     Fset (Qvalues, Qnil);
   Vcommand_history = Qnil;
 
-  error ("Memory exhausted");
+  out_of_memory ("Memory exhausted", Qunbound);
 }
 
 /* like malloc and realloc but check for no memory left, and block input. */
@@ -1433,7 +1433,7 @@
 	if (EQ (symbol, Qt)   ||
 	    EQ (symbol, Qnil) ||
 	    SYMBOL_IS_KEYWORD (symbol))
-	  signal_simple_error_2
+	  invalid_constant_2
 	    ("Invalid constant symbol in formal parameter list",
 	     symbol, arglist);
       }
@@ -3271,7 +3271,7 @@
       return;
     frame = DEVICE_SELECTED_FRAME (XDEVICE (device));
     if (NILP (frame))
-      signal_simple_error ("No frames exist on device", device);
+      invalid_state ("No frames exist on device", device);
     f = XFRAME (frame);
   }
 

--- a/src/buffer.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/buffer.c	Thu May 24 07:51:33 2001 +0000
@@ -260,10 +260,9 @@
   if (print_readably)
     {
       if (!BUFFER_LIVE_P (b))
-	error ("printing unreadable object #<killed buffer>");
+	printing_unreadable_object ("#<killed buffer>");
       else
-	error ("printing unreadable object #<buffer %s>",
-	       XSTRING_DATA (b->name));
+	printing_unreadable_object ("#<buffer %s>", XSTRING_DATA (b->name));
     }
   else if (!BUFFER_LIVE_P (b))
     write_c_string ("#<killed buffer>", printcharfun);
@@ -306,8 +305,8 @@
 nsberror (Lisp_Object spec)
 {
   if (STRINGP (spec))
-    error ("No buffer named %s", XSTRING_DATA (spec));
-  signal_simple_error ("Invalid buffer argument", spec);
+    invalid_argument ("No buffer named", spec);
+  invalid_argument ("Invalid buffer argument", spec);
 }
 
 DEFUN ("buffer-list", Fbuffer_list, 0, 1, 0, /*
@@ -619,7 +618,8 @@
     return buf;
 
   if (XSTRING_LENGTH (name) == 0)
-    error ("Empty string for buffer name is not allowed");
+    invalid_argument ("Empty string for buffer name is not allowed",
+		      Qunbound);
 
   b = allocate_buffer ();
 
@@ -660,9 +660,9 @@
   CHECK_STRING (name);
   name = LISP_GETTEXT (name);
   if (!NILP (Fget_buffer (name)))
-    signal_simple_error ("Buffer name already in use", name);
+    invalid_argument ("Buffer name already in use", name);
   if (XSTRING_LENGTH (name) == 0)
-    error ("Empty string for buffer name is not allowed");
+    invalid_argument ("Empty string for buffer name is not allowed", Qunbound);
 
   b = allocate_buffer ();
 
@@ -948,7 +948,7 @@
   newname = LISP_GETTEXT (newname);
 
   if (XSTRING_LENGTH (newname) == 0)
-    error ("Empty string is invalid as a buffer name");
+    invalid_argument ("Empty string is invalid as a buffer name", Qunbound);
 
   tem = Fget_buffer (newname);
   /* Don't short-circuit if UNIQUE is t.  That is a useful way to rename
@@ -963,8 +963,7 @@
       if (!NILP (unique))
 	newname = Fgenerate_new_buffer_name (newname, current_buffer->name);
       else
-	error ("Buffer name \"%s\" is in use",
-	       XSTRING_DATA (newname));
+	invalid_argument ("Buffer name is in use", newname);
     }
 
   current_buffer->name = newname;
@@ -1498,7 +1497,7 @@
 {
   buffer = get_buffer (buffer, 0);
   if (NILP (buffer))
-    error ("Selecting deleted or non-existent buffer");
+    invalid_operation ("Selecting deleted or non-existent buffer", Qunbound);
   set_buffer_internal (XBUFFER (buffer));
   return buffer;
 }
@@ -1586,7 +1585,7 @@
     before = get_buffer (before, 1);
 
   if (EQ (before, buffer))
-    error ("Cannot place a buffer before itself");
+    invalid_operation ("Cannot place a buffer before itself", Qunbound);
 
   bury_buffer_1 (buffer, before, &Vbuffer_alist);
   bury_buffer_1 (buffer, before, &selected_frame ()->buffer_alist);
@@ -1925,12 +1924,12 @@
           if (size_in_bytes == 0)
             break;
 	  else if (size_in_bytes < 0)
-	    error ("Error converting to external format");
+	    signal_error (Qtext_conversion_error, "Error converting to external format", Qunbound);
 
 	  size_in_bytes = Lstream_write (writer, tempbuf, size_in_bytes);
 
 	  if (size_in_bytes <= 0)
-	    error ("Error converting to external format");
+	    signal_error (Qtext_conversion_error, "Error converting to external format", Qunbound);
         }
 
       /* Closing writer will close any stream at the other end of writer. */
@@ -2063,12 +2062,12 @@
           if (size_in_bytes == 0)
             break;
 	  else if (size_in_bytes < 0)
-	    error ("Error converting to internal format");
+	    signal_error (Qtext_conversion_error, "Error converting to internal format", Qunbound);
 
 	  size_in_bytes = Lstream_write (writer, tempbuf, size_in_bytes);
 
 	  if (size_in_bytes <= 0)
-	    error ("Error converting to internal format");
+	    signal_error (Qtext_conversion_error, "Error converting to internal format", Qunbound);
         }
 
       /* Closing writer will close any stream at the other end of writer. */
@@ -2097,31 +2096,31 @@
 {
   INIT_LRECORD_IMPLEMENTATION (buffer);
 
-  defsymbol (&Qbuffer_live_p, "buffer-live-p");
-  defsymbol (&Qbuffer_or_string_p, "buffer-or-string-p");
-  defsymbol (&Qmode_class, "mode-class");
-  defsymbol (&Qrename_auto_save_file, "rename-auto-save-file");
-  defsymbol (&Qkill_buffer_hook, "kill-buffer-hook");
-  defsymbol (&Qpermanent_local, "permanent-local");
-
-  defsymbol (&Qfirst_change_hook, "first-change-hook");
-  defsymbol (&Qbefore_change_functions, "before-change-functions");
-  defsymbol (&Qafter_change_functions, "after-change-functions");
+  DEFSYMBOL (Qbuffer_live_p);
+  DEFSYMBOL (Qbuffer_or_string_p);
+  DEFSYMBOL (Qmode_class);
+  DEFSYMBOL (Qrename_auto_save_file);
+  DEFSYMBOL (Qkill_buffer_hook);
+  DEFSYMBOL (Qpermanent_local);
+
+  DEFSYMBOL (Qfirst_change_hook);
+  DEFSYMBOL (Qbefore_change_functions);
+  DEFSYMBOL (Qafter_change_functions);
 
   /* #### Obsolete, for compatibility */
-  defsymbol (&Qbefore_change_function, "before-change-function");
-  defsymbol (&Qafter_change_function, "after-change-function");
-
-  defsymbol (&Qdefault_directory, "default-directory");
-
-  defsymbol (&Qget_file_buffer, "get-file-buffer");
-  defsymbol (&Qchange_major_mode_hook, "change-major-mode-hook");
-
-  defsymbol (&Qfundamental_mode, "fundamental-mode");
-
-  defsymbol (&Qfind_file_compare_truenames, "find-file-compare-truenames");
-
-  defsymbol (&Qswitch_to_buffer, "switch-to-buffer");
+  DEFSYMBOL (Qbefore_change_function);
+  DEFSYMBOL (Qafter_change_function);
+
+  DEFSYMBOL (Qdefault_directory);
+
+  DEFSYMBOL (Qget_file_buffer);
+  DEFSYMBOL (Qchange_major_mode_hook);
+
+  DEFSYMBOL (Qfundamental_mode);
+
+  DEFSYMBOL (Qfind_file_compare_truenames);
+
+  DEFSYMBOL (Qswitch_to_buffer);
 
   DEFSUBR (Fbufferp);
   DEFSUBR (Fbuffer_live_p);

--- a/src/bytecode.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/bytecode.c	Thu May 24 07:51:33 2001 +0000
@@ -211,8 +211,6 @@
 typedef unsigned char Opbyte;
 
 
-static void invalid_byte_code_error (char *error_message, ...);
-
 Lisp_Object * execute_rare_opcode (Lisp_Object *stack_ptr,
 				   const Opbyte *program_ptr,
 				   Opcode opcode);
@@ -634,9 +632,9 @@
       REGISTER Opcode opcode = (Opcode) READ_UINT_1;
 #ifdef ERROR_CHECK_BYTE_CODE
       if (stack_ptr > stack_end)
-	invalid_byte_code_error ("byte code stack overflow");
+	stack_overflow ("byte code stack overflow", Qunbound);
       if (stack_ptr < stack_beg)
-	invalid_byte_code_error ("byte code stack underflow");
+	stack_overflow ("byte code stack underflow", Qunbound);
 #endif
 
 #ifdef BYTE_CODE_METER
@@ -842,7 +840,7 @@
 #ifdef ERROR_CHECK_BYTE_CODE
 	  /* Binds and unbinds are supposed to be compiled balanced.  */
 	  if (specpdl_depth() != speccount)
-	    invalid_byte_code_error ("unbalanced specbinding stack");
+	    invalid_byte_code ("unbalanced specbinding stack", Qunbound);
 #endif
 	  return TOP;
 
@@ -1481,20 +1479,10 @@
 }
 
 
-static void
-invalid_byte_code_error (char *error_message, ...)
+DOESNT_RETURN
+invalid_byte_code (const char *reason, Lisp_Object frob)
 {
-  Lisp_Object obj;
-  va_list args;
-  char *buf = alloca_array (char, strlen (error_message) + 128);
-
-  sprintf (buf, "%s", error_message);
-  va_start (args, error_message);
-  obj = emacs_doprnt_string_va ((const Bufbyte *) GETTEXT (buf), Qnil, -1,
-				args);
-  va_end (args);
-
-  signal_error (Qinvalid_byte_code, list1 (obj));
+  signal_error (Qinvalid_byte_code, reason, frob);
 }
 
 /* Check for valid opcodes.  Change this when adding new opcodes.  */
@@ -1504,8 +1492,8 @@
   if ((opcode < Bvarref) ||
       (opcode == 0251)   ||
       (opcode > Bassq && opcode < Bconstant))
-    invalid_byte_code_error
-      ("invalid opcode %d in instruction stream", opcode);
+    invalid_byte_code ("invalid opcode in instruction stream",
+		       make_int (opcode));
 }
 
 /* Check that IDX is a valid offset into the `constants' vector */
@@ -1513,19 +1501,20 @@
 check_constants_index (int idx, Lisp_Object constants)
 {
   if (idx < 0 || idx >= XVECTOR_LENGTH (constants))
-    invalid_byte_code_error
-      ("reference %d to constants array out of range 0, %d",
+    signal_ferror
+      (Qinvalid_byte_code,
+       "reference %d to constants array out of range 0, %ld",
        idx, XVECTOR_LENGTH (constants) - 1);
 }
 
 /* Get next character from Lisp instructions string. */
-#define READ_INSTRUCTION_CHAR(lvalue) do {		\
-  (lvalue) = charptr_emchar (ptr);			\
-  INC_CHARPTR (ptr);					\
-  *icounts_ptr++ = program_ptr - program;		\
-  if (lvalue > UCHAR_MAX)				\
-    invalid_byte_code_error				\
-      ("Invalid character %c in byte code string");	\
+#define READ_INSTRUCTION_CHAR(lvalue) do {				\
+  (lvalue) = charptr_emchar (ptr);					\
+  INC_CHARPTR (ptr);							\
+  *icounts_ptr++ = program_ptr - program;				\
+  if (lvalue > UCHAR_MAX)						\
+    invalid_byte_code							\
+      ("Invalid character in byte code string", make_char (lvalue));	\
 } while (0)
 
 /* Get opcode from Lisp instructions string. */
@@ -1653,10 +1642,9 @@
 	  check_constants_index (arg, constants);
 	   val = XVECTOR_DATA (constants) [arg];
 	   if (!SYMBOLP (val))
-	     invalid_byte_code_error ("variable reference to non-symbol %S", val);
+	     invalid_byte_code ("variable reference to non-symbol", val);
 	   if (EQ (val, Qnil) || EQ (val, Qt) || (SYMBOL_IS_KEYWORD (val)))
-	     invalid_byte_code_error ("variable reference to constant symbol %s",
-				      string_data (XSYMBOL (val)->name));
+	     invalid_byte_code ("variable reference to constant symbol", val);
 	   WRITE_NARGS (Bvarref);
 	   break;
 
@@ -1669,10 +1657,9 @@
 	  check_constants_index (arg, constants);
 	  val = XVECTOR_DATA (constants) [arg];
 	  if (!SYMBOLP (val))
-	    invalid_byte_code_error ("attempt to set non-symbol %S", val);
+	    wtaerror ("attempt to set non-symbol", val);
 	  if (EQ (val, Qnil) || EQ (val, Qt))
-	    invalid_byte_code_error ("attempt to set constant symbol %s",
-				     string_data (XSYMBOL (val)->name));
+	    signal_error (Qsetting_constant, 0, val);
 	  /* Ignore assignments to keywords by converting to Bdiscard.
 	     For backward compatibility only - we'd like to make this an error.  */
 	  if (SYMBOL_IS_KEYWORD (val))
@@ -1691,10 +1678,10 @@
 	  check_constants_index (arg, constants);
 	  val = XVECTOR_DATA (constants) [arg];
 	  if (!SYMBOLP (val))
-	    invalid_byte_code_error ("attempt to let-bind non-symbol %S", val);
+	    wtaerror ("attempt to let-bind non-symbol", val);
 	  if (EQ (val, Qnil) || EQ (val, Qt) || (SYMBOL_IS_KEYWORD (val)))
-	    invalid_byte_code_error ("attempt to let-bind constant symbol %s",
-				     string_data (XSYMBOL (val)->name));
+	    signal_error (Qsetting_constant,
+			  "attempt to let-bind constant symbol", val);
 	  WRITE_NARGS (Bvarbind);
 	  break;
 
@@ -1740,8 +1727,7 @@
 	  jumps_ptr->to   = jumps_ptr->from + arg;
 	  jumps_ptr++;
 	  if (arg >= -1 && arg <= argsize)
-	    invalid_byte_code_error
-	      ("goto instruction is its own target");
+	    invalid_byte_code ("goto instruction is its own target", Qunbound);
 	  if (arg <= SCHAR_MIN ||
 	      arg >  SCHAR_MAX)
 	    {
@@ -2347,7 +2333,8 @@
     {
       Lisp_Object tem = read_doc_string (f->instructions);
       if (!CONSP (tem))
-	signal_simple_error ("Invalid lazy-loaded byte code", tem);
+	signal_error (Qinvalid_byte_code,
+			   "Invalid lazy-loaded byte code", tem);
       /* v18 or v19 bytecode file.  Need to Ebolify. */
       if (f->flags.ebolified && VECTORP (XCDR (tem)))
 	ebolify_bytecode_constants (XCDR (tem));
@@ -2412,8 +2399,8 @@
   INIT_LRECORD_IMPLEMENTATION (compiled_function);
 
   DEFERROR_STANDARD (Qinvalid_byte_code, Qinvalid_state);
-  defsymbol (&Qbyte_code, "byte-code");
-  defsymbol (&Qcompiled_functionp, "compiled-function-p");
+  DEFSYMBOL (Qbyte_code);
+  DEFSYMBOL_MULTIWORD_PREDICATE (Qcompiled_functionp);
 
   DEFSUBR (Fbyte_code);
   DEFSUBR (Ffetch_bytecode);
@@ -2432,7 +2419,7 @@
 #endif
 
 #ifdef BYTE_CODE_METER
-  defsymbol (&Qbyte_code_meter, "byte-code-meter");
+  DEFSYMBOL (Qbyte_code_meter);
 #endif
 }
 

--- a/src/callint.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/callint.c	Thu May 24 07:51:33 2001 +0000
@@ -254,11 +254,11 @@
   Lisp_Object tem;
 
   if (zmacs_regions && !zmacs_region_active_p)
-    error ("The region is not active now");
+    invalid_operation ("The region is not active now", Qunbound);
 
   tem = Fmarker_buffer (current_buffer->mark);
   if (NILP (tem) || (XBUFFER (tem) != current_buffer))
-    error ("The mark is not set now");
+    invalid_operation ("The mark is not set now", Qunbound);
 
   return marker_position (current_buffer->mark);
 }
@@ -499,7 +499,7 @@
 	  prompt_data = (const char *) XSTRING_DATA (specs);
 
 	if (prompt_data[prompt_index] == '+')
-	  error ("`+' is not used in `interactive' for ordinary commands");
+	  syntax_error ("`+' is not used in `interactive' for ordinary commands", Qunbound);
 	else if (prompt_data[prompt_index] == '*')
 	  {
 	    prompt_index++;
@@ -528,7 +528,7 @@
 		    if (MINI_WINDOW_P (XWINDOW (window))
 			&& ! (minibuf_level > 0 && EQ (window,
 						       minibuf_window)))
-		      error ("Attempt to select inactive minibuffer window");
+		      invalid_operation ("Attempt to select inactive minibuffer window", Qunbound);
 
 #if 0 /* unclean! see event-stream.c */
 		    /* If the current buffer wants to clean up, let it.  */
@@ -737,10 +737,9 @@
 #endif
 
 	      if (NILP (event))
-		error ("%s must be bound to a mouse or misc-user event",
-		       (SYMBOLP (function)
-			? (char *) string_data (XSYMBOL (function)->name)
-			: "command"));
+		signal_error (Qinvalid_operation,
+			      "function must be bound to a mouse or misc-user event",
+			      function);
 	      args[argnum] = event;
 	      mouse_event_count++;
 	      break;
@@ -959,9 +958,10 @@
 	  case '+':
 	  default:
 	    {
-	      error ("Invalid `interactive' control letter \"%c\" (#o%03o).",
-		     prompt_data[prompt_index],
-		     prompt_data[prompt_index]);
+	      signal_ferror (Qsyntax_error,
+			  "Invalid `interactive' control letter \"%c\" (#o%03o).",
+			  prompt_data[prompt_index],
+			  prompt_data[prompt_index]);
 	    }
 	  }
 #undef PROMPT
@@ -1035,30 +1035,30 @@
 void
 syms_of_callint (void)
 {
-  defsymbol (&Qcall_interactively, "call-interactively");
-  defsymbol (&Qread_from_minibuffer, "read-from-minibuffer");
-  defsymbol (&Qcompleting_read, "completing-read");
-  defsymbol (&Qread_file_name, "read-file-name");
-  defsymbol (&Qread_directory_name, "read-directory-name");
-  defsymbol (&Qread_string, "read-string");
-  defsymbol (&Qread_buffer, "read-buffer");
-  defsymbol (&Qread_variable, "read-variable");
-  defsymbol (&Qread_function, "read-function");
-  defsymbol (&Qread_command, "read-command");
-  defsymbol (&Qread_number, "read-number");
-  defsymbol (&Qread_expression, "read-expression");
+  DEFSYMBOL (Qcall_interactively);
+  DEFSYMBOL (Qread_from_minibuffer);
+  DEFSYMBOL (Qcompleting_read);
+  DEFSYMBOL (Qread_file_name);
+  DEFSYMBOL (Qread_directory_name);
+  DEFSYMBOL (Qread_string);
+  DEFSYMBOL (Qread_buffer);
+  DEFSYMBOL (Qread_variable);
+  DEFSYMBOL (Qread_function);
+  DEFSYMBOL (Qread_command);
+  DEFSYMBOL (Qread_number);
+  DEFSYMBOL (Qread_expression);
 #if defined(MULE) || defined(FILE_CODING)
-  defsymbol (&Qread_coding_system, "read-coding-system");
-  defsymbol (&Qread_non_nil_coding_system, "read-non-nil-coding-system");
+  DEFSYMBOL (Qread_coding_system);
+  DEFSYMBOL (Qread_non_nil_coding_system);
 #endif
-  defsymbol (&Qevents_to_keys, "events-to-keys");
-  defsymbol (&Qcommand_debug_status, "command-debug-status");
-  defsymbol (&Qenable_recursive_minibuffers, "enable-recursive-minibuffers");
+  DEFSYMBOL (Qevents_to_keys);
+  DEFSYMBOL (Qcommand_debug_status);
+  DEFSYMBOL (Qenable_recursive_minibuffers);
 
   defsymbol (&QletX, "let*");
-  defsymbol (&Qsave_excursion, "save-excursion");
+  DEFSYMBOL (Qsave_excursion);
 #if 0 /* ill-conceived */
-  defsymbol (&Qmouse_leave_buffer_hook, "mouse-leave-buffer-hook");
+  DEFSYMBOL (Qmouse_leave_buffer_hook);
 #endif
 
   DEFSUBR (Finteractive);

--- a/src/callproc.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/callproc.c	Thu May 24 07:51:33 2001 +0000
@@ -138,20 +138,6 @@
   return Qnil;
 }
 
-static Lisp_Object fork_error;
-#if 0 /* UNUSED */
-static void
-report_fork_error (char *string, Lisp_Object data)
-{
-  Lisp_Object errstring = lisp_strerror (errno);
-
-  fork_error = Fcons (build_string (string), Fcons (errstring, data));
-
-  /* terminate this branch of the fork, without closing stdin/out/etc. */
-  _exit (1);
-}
-#endif /* unused */
-
 DEFUN ("old-call-process-internal", Fold_call_process_internal, 1, MANY, 0, /*
 Call PROGRAM synchronously in separate process, with coding-system specified.
 Arguments are
@@ -202,7 +188,7 @@
 #if defined (NO_SUBPROCESSES)
   /* Without asynchronous processes we cannot have BUFFER == 0.  */
   if (nargs >= 3 && !INTP (args[2]))
-    error ("Operating system cannot handle asynchronous subprocesses");
+    signal_error (Qunimplemented, "Operating system cannot handle asynchronous subprocesses", Qunbound);
 #endif /* NO_SUBPROCESSES */
 
   /* Do all filename munging before building new_argv because GC in
@@ -233,8 +219,8 @@
     /* This is in FSF, but it breaks everything in the presence of
        ange-ftp-visited files, so away with it.  */
     if (NILP (Ffile_accessible_directory_p (current_dir)))
-      report_file_error ("Setting current directory",
-                         Fcons (current_buffer->directory, Qnil));
+      signal_error (Qprocess_error, "Setting current directory",
+		    current_buffer->directory);
 #endif /* 0 */
     NUNGCPRO;
   }
@@ -308,12 +294,12 @@
   new_argv[max(nargs - 3,1)] = 0;
 
   if (NILP (path))
-    report_file_error ("Searching for program", Fcons (args[0], Qnil));
+    signal_error (Qprocess_error, "Searching for program", args[0]);
   new_argv[0] = (char *) XSTRING_DATA (path);
 
   filefd = open ((char *) XSTRING_DATA (infile), O_RDONLY | OPEN_BINARY, 0);
   if (filefd < 0)
-    report_file_error ("Opening process input file", Fcons (infile, Qnil));
+    report_process_error ("Opening process input file", infile);
 
   if (INTP (buffer))
     {
@@ -368,10 +354,9 @@
 	if (fd1 >= 0)
 	  close (fd1);
 	errno = save_errno;
-	report_file_error ("Cannot open", Fcons(error_file, Qnil));
+	report_process_error ("Cannot open", error_file);
       }
 
-    fork_error = Qnil;
 #ifdef WIN32_NATIVE
     pid = child_setup (filefd, fd1, fd_error, new_argv,
                        (char *) XSTRING_DATA (current_dir));
@@ -424,9 +409,6 @@
       close (fd1);
   }
 
-  if (!NILP (fork_error))
-    signal_error (Qfile_error, fork_error);
-
 #ifndef WIN32_NATIVE
   if (pid < 0)
     {
@@ -434,7 +416,7 @@
       if (fd[0] >= 0)
 	close (fd[0]);
       errno = save_errno;
-      report_file_error ("Doing fork", Qnil);
+      report_process_error ("Doing fork", Qunbound);
     }
 #endif
 
@@ -787,7 +769,7 @@
 		  (const char* const*)env);
   if (cpid == -1)
     /* An error occurred while trying to spawn the process.  */
-    report_file_error ("Spawning child process", Qnil);
+    report_process_error ("Spawning child process", Qunbound);
   reset_standard_handles (in, out, err, handles);
   return cpid;
 #else /* not WIN32_NATIVE */

--- a/src/casetab.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/casetab.c	Thu May 24 07:51:33 2001 +0000
@@ -74,7 +74,7 @@
   Lisp_Case_Table *ct = XCASE_TABLE (obj);
   char buf[200];
   if (print_readably)
-    error ("printing unreadable object #<case-table 0x%x", ct->header.uid);
+    printing_unreadable_object ("#<case-table 0x%x", ct->header.uid);
   write_c_string ("#<case-table ", printcharfun);
   sprintf (buf, "0x%x>", ct->header.uid);
   write_c_string (buf, printcharfun);
@@ -176,7 +176,7 @@
   else if (EQ (char_case, Qupcase))
     return case_table_char (character, XCASE_TABLE_UPCASE (case_table));
   else
-    signal_simple_error ("Char case must be downcase or upcase", char_case);
+    invalid_constant ("Char case must be downcase or upcase", char_case);
 
   return Qnil; /* Not reached. */
 }
@@ -212,7 +212,7 @@
       Fput_char_table (character, value, XCASE_TABLE_EQV (case_table));
     }
   else
-    signal_simple_error ("Char case must be downcase or upcase", char_case);
+    invalid_constant ("Char case must be downcase or upcase", char_case);
 
   return Qnil;
 }
@@ -447,9 +447,9 @@
 {
   INIT_LRECORD_IMPLEMENTATION (case_table);
 
-  defsymbol (&Qcase_tablep, "case-table-p");
-  defsymbol (&Qdowncase, "downcase");
-  defsymbol (&Qupcase, "upcase");
+  DEFSYMBOL_MULTIWORD_PREDICATE (Qcase_tablep);
+  DEFSYMBOL (Qdowncase);
+  DEFSYMBOL (Qupcase);
 
   DEFSUBR (Fcase_table_p);
   DEFSUBR (Fget_case_table);

--- a/src/chartab.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/chartab.c	Thu May 24 07:51:33 2001 +0000
@@ -211,7 +211,7 @@
   if (EQ (symbol, Qcategory)) return CHAR_TABLE_TYPE_CATEGORY;
 #endif
 
-  signal_simple_error ("Unrecognized char table type", symbol);
+  invalid_constant ("Unrecognized char table type", symbol);
   return CHAR_TABLE_TYPE_GENERIC; /* not reached */
 }
 
@@ -729,14 +729,14 @@
     }
 #ifndef MULE
   else
-    signal_simple_error ("Range must be t or a character", range);
+    sferror ("Range must be t or a character", range);
 #else /* MULE */
   else if (VECTORP (range))
     {
       Lisp_Vector *vec = XVECTOR (range);
       Lisp_Object *elts = vector_data (vec);
       if (vector_length (vec) != 2)
-	signal_simple_error ("Length of charset row vector must be 2",
+	sferror ("Length of charset row vector must be 2",
 			     range);
       outrange->type = CHARTAB_RANGE_ROW;
       outrange->charset = Fget_charset (elts[0]);
@@ -746,7 +746,7 @@
 	{
 	case CHARSET_TYPE_94:
 	case CHARSET_TYPE_96:
-	  signal_simple_error ("Charset in row vector must be multi-byte",
+	  sferror ("Charset in row vector must be multi-byte",
 			       outrange->charset);
 	case CHARSET_TYPE_94X94:
 	  check_int_range (outrange->row, 33, 126);
@@ -761,7 +761,7 @@
   else
     {
       if (!CHARSETP (range) && !SYMBOLP (range))
-	signal_simple_error
+	sferror
 	  ("Char table range must be t, charset, char, or vector", range);
       outrange->type = CHARTAB_RANGE_CHARSET;
       outrange->charset = Fget_charset (range);
@@ -979,8 +979,9 @@
 
     case CHAR_TABLE_TYPE_DISPLAY:
       /* #### fix this */
-      maybe_signal_simple_error ("Display char tables not yet implemented",
-				 value, Qchar_table, errb);
+      maybe_signal_error (Qunimplemented,
+			       "Display char tables not yet implemented",
+			       value, Qchar_table, errb);
       return 0;
 
     case CHAR_TABLE_TYPE_CHAR:
@@ -1494,12 +1495,12 @@
 
       rest = XCDR (rest);
       if (!CONSP (rest))
-	signal_simple_error ("Invalid list format", value);
+	signal_error (Qlist_formation_error, "Invalid list format", value);
       if (CONSP (range))
 	{
 	  if (!CONSP (XCDR (range))
 	      || !NILP (XCDR (XCDR (range))))
-	    signal_simple_error ("Invalid range format", range);
+	    sferror ("Invalid range format", range);
 	  decode_char_table_range (XCAR (range), &dummy);
 	  decode_char_table_range (XCAR (XCDR (range)), &dummy);
 	}
@@ -1617,7 +1618,7 @@
   Lisp_Char_Table *ctbl;
 #ifdef ERROR_CHECK_TYPECHECK
   if (NILP (Fcategory_table_p (table)))
-    signal_simple_error ("Expected category table", table);
+    wtaerror ("Expected category table", table);
 #endif
   ctbl = XCHAR_TABLE (table);
   temp = get_char_table (ch, ctbl);
@@ -1806,13 +1807,13 @@
 #ifdef MULE
   INIT_LRECORD_IMPLEMENTATION (char_table_entry);
 
-  defsymbol (&Qcategory_table_p, "category-table-p");
-  defsymbol (&Qcategory_designator_p, "category-designator-p");
-  defsymbol (&Qcategory_table_value_p, "category-table-value-p");
+  DEFSYMBOL (Qcategory_table_p);
+  DEFSYMBOL (Qcategory_designator_p);
+  DEFSYMBOL (Qcategory_table_value_p);
 #endif /* MULE */
 
-  defsymbol (&Qchar_table, "char-table");
-  defsymbol (&Qchar_tablep, "char-table-p");
+  DEFSYMBOL (Qchar_table);
+  DEFSYMBOL_MULTIWORD_PREDICATE (Qchar_tablep);
 
   DEFSUBR (Fchar_table_p);
   DEFSUBR (Fchar_table_type_list);

--- a/src/cmdloop.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/cmdloop.c	Thu May 24 07:51:33 2001 +0000
@@ -248,7 +248,7 @@
    * signal an error here to avoid the loop.
    */
   if (in_menu_callback)
-    error ("Attempt to enter command_loop_3 inside menu callback");
+    invalid_operation ("Attempt to enter command_loop_3 inside menu callback", Qunbound);
 #endif /* LWLIB_MENUBARS_LUCID */
   /* This function can GC */
   for (;;)
@@ -606,10 +606,10 @@
 void
 syms_of_cmdloop (void)
 {
-  defsymbol (&Qcommand_error, "command-error");
-  defsymbol (&Qreally_early_error_handler, "really-early-error-handler");
-  defsymbol (&Qtop_level, "top-level");
-  defsymbol (&Qerrors_deactivate_region, "errors-deactivate-region");
+  DEFSYMBOL (Qcommand_error);
+  DEFSYMBOL (Qreally_early_error_handler);
+  DEFSYMBOL (Qtop_level);
+  DEFSYMBOL (Qerrors_deactivate_region);
 
 #ifndef LISP_COMMAND_LOOP
   DEFSUBR (Frecursive_edit);

--- a/src/cmds.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/cmds.c	Thu May 24 07:51:33 2001 +0000
@@ -276,14 +276,14 @@
       if (n < 0)
 	{
 	  if (pos < BUF_BEGV (buf))
-	    signal_error (Qbeginning_of_buffer, Qnil);
+	    signal_error (Qbeginning_of_buffer, 0, Qunbound);
 	  else
 	    buffer_delete_range (buf, pos, BUF_PT (buf), 0);
 	}
       else
 	{
 	  if (pos > BUF_ZV (buf))
-	    signal_error (Qend_of_buffer, Qnil);
+	    signal_error (Qend_of_buffer, 0, Qunbound);
 	  else
 	    buffer_delete_range (buf, BUF_PT (buf), pos, 0);
 	}
@@ -340,8 +340,8 @@
     c = Fevent_to_character (Vlast_command_event, Qnil, Qnil, Qt);
 
   if (NILP (c))
-    signal_simple_error ("Last typed character has no ASCII equivalent",
-                         Fcopy_event (Vlast_command_event, Qnil));
+    invalid_operation ("Last typed character has no ASCII equivalent",
+		       Fcopy_event (Vlast_command_event, Qnil));
 
   CHECK_CHAR_COERCE_INT (c);
 
@@ -502,10 +502,10 @@
 void
 syms_of_cmds (void)
 {
-  defsymbol (&Qkill_forward_chars, "kill-forward-chars");
-  defsymbol (&Qself_insert_command, "self-insert-command");
-  defsymbol (&Qoverwrite_mode_binary, "overwrite-mode-binary");
-  defsymbol (&Qno_self_insert, "no-self-insert");
+  DEFSYMBOL (Qkill_forward_chars);
+  DEFSYMBOL (Qself_insert_command);
+  DEFSYMBOL (Qoverwrite_mode_binary);
+  DEFSYMBOL (Qno_self_insert);
 
   DEFSUBR (Fforward_char);
   DEFSUBR (Fbackward_char);

--- a/src/console-msw.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/console-msw.c	Thu May 24 07:51:33 2001 +0000
@@ -1,5 +1,5 @@
 /* Console functions for mswindows.
-   Copyright (C) 1996, 2000 Ben Wing.
+   Copyright (C) 1996, 2000, 2001 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -156,7 +156,7 @@
   if (!NILP (connection))
     {
       if (ERRB_EQ (errb, ERROR_ME))
-	signal_simple_error
+	invalid_argument
 	  ("Invalid (non-nil) connection for mswindows device/console",
 	   connection);
       else
@@ -530,14 +530,14 @@
 #undef FROB
 
       else
-	signal_simple_error ("Unrecognized flag", st);
+	invalid_constant ("Unrecognized flag", st);
     }
 
   {
     int retval = MessageBox (NULL, msgout, titleout, sty);
 
     if (retval == 0)
-      error ("Out of memory when calling `mswindows-message-box'");
+      out_of_memory ("When calling `mswindows-message-box'", Qunbound);
 
 #define FROB(sym, val) if (retval == val) return sym
     FROB (Qabort, IDABORT);
@@ -549,28 +549,51 @@
     FROB (Qyes, IDYES);
 #undef FROB
     
-    signal_simple_error ("Unknown return value from MessageBox()",
-			 make_int (retval));
+    invalid_argument ("Unknown return value from MessageBox()",
+		      make_int (retval));
   }
 
   return Qnil;
 }
 
+Lisp_Object
+mswindows_lisp_error (int errnum)
+{
+  LPTSTR lpMsgBuf;
+  Lisp_Object result;
+  Bufbyte *inres;
+  Bytecount len;
+  
+  FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER
+		 | FORMAT_MESSAGE_FROM_SYSTEM,
+		 NULL, errnum,
+		 /* !!#### not Mule-correct */
+		 MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
+		 /* yeah, i'm casting a char ** to a char *.  ya gotta
+		    problem widdat? */
+		 (LPTSTR) &lpMsgBuf,
+		 0,
+		 NULL);
+
+  TO_INTERNAL_FORMAT (C_STRING, lpMsgBuf, ALLOCA, (inres, len),
+		      Qmswindows_tstr);
+  /* Messages tend to end with a period and newline */
+  if (len >= 3 && !strcmp (inres + len - 3, ".\r\n"))
+    len -= 3;
+  result = make_string (inres, len);
+  
+  LocalFree (lpMsgBuf);
+  return result;
+}
+
 void
 mswindows_output_last_error (char *frob)
 {
-  LPVOID lpMsgBuf;
-  int errval = GetLastError();
+  int errval = GetLastError ();
+  Lisp_Object errmess = mswindows_lisp_error (errval);
   
-  FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER
-		 | FORMAT_MESSAGE_FROM_SYSTEM,
-		 NULL, errval,
-		 MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
-		 (LPTSTR) &lpMsgBuf,
-		 0,
-		 NULL);
   stderr_out ("last error during %s is %d: %s\n",
-	      frob, errval, (char*)lpMsgBuf);
+	      frob, errval, XSTRING_DATA (errmess));
 }
 
 static Lisp_Object
@@ -585,7 +608,8 @@
       if (NILP (connection))
 	{
 	  if (ERRB_EQ (errb, ERROR_ME))
-	    error ("There is no default printer in the system");
+	    invalid_state ("There is no default printer in the system",
+			   Qunbound);
 	  else
 	    return Qunbound;
 	}
@@ -612,40 +636,40 @@
 {
   DEFSUBR (Fmswindows_debugging_output);
 
-  defsymbol (&Qabortretryignore, "abortretryignore");
-  defsymbol (&Qapplmodal, "applmodal");
-  defsymbol (&Qdefault_desktop_only, "default-desktop-only");
-  defsymbol (&Qdefbutton1, "defbutton1");
-  defsymbol (&Qdefbutton2, "defbutton2");
-  defsymbol (&Qdefbutton3, "defbutton3");
-  defsymbol (&Qdefbutton4, "defbutton4");
-  /* defsymbol (&Qhelp, "help"); */
-  defsymbol (&Qiconasterisk, "iconasterisk");
-  defsymbol (&Qiconexclamation, "iconexclamation");
-  defsymbol (&Qiconhand, "iconhand");
-  defsymbol (&Qiconinformation, "iconinformation");
-  defsymbol (&Qiconquestion, "iconquestion");
-  defsymbol (&Qiconstop, "iconstop");
-  /* defsymbol (&Qok, "ok"); */
-  defsymbol (&Qokcancel, "okcancel");
-  defsymbol (&Qretrycancel, "retrycancel");
-  /* defsymbol (&Qright, "right"); */
-  defsymbol (&Qrtlreading, "rtlreading");
-  defsymbol (&Qservice_notification, "service-notification");
-  defsymbol (&Qsetforeground, "setforeground");
-  defsymbol (&Qsystemmodal, "systemmodal");
-  defsymbol (&Qtaskmodal, "taskmodal");
-  defsymbol (&Qtopmost, "topmost");
-  defsymbol (&Qyesno, "yesno");
-  defsymbol (&Qyesnocancel, "yesnocancel");
+  DEFSYMBOL (Qabortretryignore);
+  DEFSYMBOL (Qapplmodal);
+  DEFSYMBOL (Qdefault_desktop_only);
+  DEFSYMBOL (Qdefbutton1);
+  DEFSYMBOL (Qdefbutton2);
+  DEFSYMBOL (Qdefbutton3);
+  DEFSYMBOL (Qdefbutton4);
+  /* DEFSYMBOL (Qhelp); */
+  DEFSYMBOL (Qiconasterisk);
+  DEFSYMBOL (Qiconexclamation);
+  DEFSYMBOL (Qiconhand);
+  DEFSYMBOL (Qiconinformation);
+  DEFSYMBOL (Qiconquestion);
+  DEFSYMBOL (Qiconstop);
+  /* DEFSYMBOL (Qok); */
+  DEFSYMBOL (Qokcancel);
+  DEFSYMBOL (Qretrycancel);
+  /* DEFSYMBOL (Qright); */
+  DEFSYMBOL (Qrtlreading);
+  DEFSYMBOL (Qservice_notification);
+  DEFSYMBOL (Qsetforeground);
+  DEFSYMBOL (Qsystemmodal);
+  DEFSYMBOL (Qtaskmodal);
+  DEFSYMBOL (Qtopmost);
+  DEFSYMBOL (Qyesno);
+  DEFSYMBOL (Qyesnocancel);
 
-  /* defsymbol (&Qabort, "abort"); */
-  /* defsymbol (&Qcancel, "cancel"); */
-  /* defsymbol (&Qignore, "ignore"); */
-  /* defsymbol (&Qno, "no"); */
-  /* defsymbol (&Qok, "ok"); */
-  /* defsymbol (&Qretry, "retry"); */
-  /* defsymbol (&Qyes, "yes"); */
+  /* DEFSYMBOL (Qabort); */
+  /* DEFSYMBOL (Qcancel); */
+  /* DEFSYMBOL (Qignore); */
+  /* DEFSYMBOL (Qno); */
+  /* DEFSYMBOL (Qok); */
+  /* DEFSYMBOL (Qretry); */
+  /* DEFSYMBOL (Qyes); */
 
   DEFSUBR (Fmswindows_message_box);
 }

--- a/src/console-msw.h	Thu May 24 06:30:21 2001 +0000
+++ b/src/console-msw.h	Thu May 24 07:51:33 2001 +0000
@@ -371,6 +371,10 @@
 int mswindows_windows9x_p (void);
 
 void mswindows_output_last_error (char *frob);
+DOESNT_RETURN mswindows_report_process_error (const char *string,
+					      Lisp_Object data,
+					      int errnum);
+Lisp_Object mswindows_lisp_error (int errnum);
 
 Lisp_Object mswindows_handle_print_dialog_box (struct frame *f,
 					       Lisp_Object keys);

--- a/src/console-stream.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/console-stream.c	Thu May 24 07:51:33 2001 +0000
@@ -73,7 +73,7 @@
 	   this descriptor. */
 	fopen ((char *) XSTRING_DATA (tty), READ_PLUS_TEXT);
       if (!stream_con->in)
-	error ("Unable to open tty %s", XSTRING_DATA (tty));
+	signal_error (Qio_error, "Unable to open tty", tty);
     }
 }
 
@@ -162,7 +162,7 @@
 #if 0
   struct device *d = XDEVICE (FRAME_DEVICE (f));
   if (!NILP (DEVICE_FRAME_LIST (d)))
-    error ("Only one frame allowed on stream devices");
+    invalid_operation ("Only one frame allowed on stream devices", Qunbound);
 #endif
   f->name = build_string ("stream");
   f->height = 80;

--- a/src/console-tty.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/console-tty.c	Thu May 24 07:51:33 2001 +0000
@@ -83,7 +83,7 @@
 
       if (!temp_type)
 	{
-	  error ("Cannot determine terminal type");
+	  invalid_state ("Cannot determine terminal type", Qunbound);
 	}
       else
 	terminal_type = build_string (temp_type);
@@ -109,7 +109,7 @@
       tty_con->infd = tty_con->outfd =
 	open ((char *) XSTRING_DATA (tty), O_RDWR);
       if (tty_con->infd < 0)
-	error ("Unable to open tty %s", XSTRING_DATA (tty));
+	signal_error (Qio_error, "Unable to open tty", tty);
       tty_con->is_stdio = 0;
     }
 
@@ -339,8 +339,8 @@
 {
   DEFSUBR (Fconsole_tty_terminal_type);
   DEFSUBR (Fconsole_tty_controlling_process);
-  defsymbol (&Qterminal_type, "terminal-type");
-  defsymbol (&Qcontrolling_process, "controlling-process");
+  DEFSYMBOL (Qterminal_type);
+  DEFSYMBOL (Qcontrolling_process);
 #ifdef FILE_CODING
   DEFSUBR (Fconsole_tty_output_coding_system);
   DEFSUBR (Fset_console_tty_output_coding_system);

--- a/src/console-x.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/console-x.c	Thu May 24 07:51:33 2001 +0000
@@ -141,8 +141,7 @@
 	      if (elt + 1 == argc)
 		{
 		  suppress_early_error_handler_backtrace = 1;
-		  type_error (Qinvalid_argument,
-			      "-display specified with no arg");
+		  invalid_argument ("-display specified with no arg", Qunbound);
 		}
 	      else
 		{

--- a/src/console.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/console.c	Thu May 24 07:51:33 2001 +0000
@@ -123,8 +123,8 @@
   char buf[256];
 
   if (print_readably)
-    error ("printing unreadable object #<console %s 0x%x>",
-	   XSTRING_DATA (con->name), con->header.uid);
+    printing_unreadable_object ("#<console %s 0x%x>",
+				XSTRING_DATA (con->name), con->header.uid);
 
   sprintf (buf, "#<%s-console", !CONSOLE_LIVE_P (con) ? "dead" :
 	   CONSOLE_TYPE_NAME (con));
@@ -184,7 +184,7 @@
     if (EQ (type, Dynarr_at (the_console_type_entry_dynarr, i).symbol))
       return Dynarr_at (the_console_type_entry_dynarr, i).meths;
 
-  maybe_signal_simple_error ("Invalid console type", type, Qconsole, errb);
+  maybe_invalid_constant ("Invalid console type", type, Qconsole, errb);
 
   return 0;
 }
@@ -281,10 +281,10 @@
 	  Fselect_window (FRAME_SELECTED_WINDOW (f), Qnil);
 	}
       else
-	error ("Can't select console with no frames.");
+ invalid_operation ("Can't select console with no frames", Qunbound);
     }
   else
-    error ("Can't select a console with no devices");
+    invalid_operation ("Can't select a console with no devices", Qunbound);
   return Qnil;
 }
 
@@ -461,9 +461,9 @@
   if (NILP (console))
     {
       if (NILP (type))
-	signal_simple_error ("No such console", connection);
+	invalid_argument ("No such console", connection);
       else
-	signal_simple_error_2 ("No such console", type, connection);
+	invalid_argument_2 ("No such console", type, connection);
     }
   return console;
 }
@@ -625,7 +625,7 @@
       if (down_we_go)
 	{
 	  if (!force)
-	    error ("Attempt to delete the only frame");
+	    invalid_operation ("Attempt to delete the only frame", Qunbound);
 	  else if (from_io_error)
 	    {
 	      /* Mayday mayday!  We're going down! */
@@ -1107,14 +1107,14 @@
   DEFSUBR (Fset_input_mode);
   DEFSUBR (Fcurrent_input_mode);
 
-  defsymbol (&Qconsolep, "consolep");
-  defsymbol (&Qconsole_live_p, "console-live-p");
+  DEFSYMBOL (Qconsolep);
+  DEFSYMBOL (Qconsole_live_p);
 
-  defsymbol (&Qcreate_console_hook, "create-console-hook");
-  defsymbol (&Qdelete_console_hook, "delete-console-hook");
+  DEFSYMBOL (Qcreate_console_hook);
+  DEFSYMBOL (Qdelete_console_hook);
 
-  defsymbol (&Qsuspend_hook, "suspend-hook");
-  defsymbol (&Qsuspend_resume_hook, "suspend-resume-hook");
+  DEFSYMBOL (Qsuspend_hook);
+  DEFSYMBOL (Qsuspend_resume_hook);
 }
 
 static const struct lrecord_description cte_description_1[] = {

--- a/src/data.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/data.c	Thu May 24 07:51:33 2001 +0000
@@ -1,7 +1,7 @@
 /* Primitive operations on Lisp data types for XEmacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1988, 1992, 1993, 1994, 1995
    Free Software Foundation, Inc.
-   Copyright (C) 2000 Ben Wing.
+   Copyright (C) 2000, 2001 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -41,19 +41,20 @@
 Lisp_Object Qnil, Qt, Qquote, Qlambda, Qunbound;
 Lisp_Object Qerror_conditions, Qerror_message;
 Lisp_Object Qerror, Qquit, Qsyntax_error, Qinvalid_read_syntax;
-Lisp_Object Qlist_formation_error;
+Lisp_Object Qlist_formation_error, Qstructure_formation_error;
 Lisp_Object Qmalformed_list, Qmalformed_property_list;
 Lisp_Object Qcircular_list, Qcircular_property_list;
-Lisp_Object Qinvalid_argument, Qwrong_type_argument, Qargs_out_of_range;
+Lisp_Object Qinvalid_argument, Qinvalid_constant, Qwrong_type_argument;
+Lisp_Object Qargs_out_of_range;
 Lisp_Object Qwrong_number_of_arguments, Qinvalid_function, Qno_catch;
-Lisp_Object Qinternal_error, Qinvalid_state;
+Lisp_Object Qinternal_error, Qinvalid_state, Qstack_overflow, Qout_of_memory;
 Lisp_Object Qvoid_variable, Qcyclic_variable_indirection;
 Lisp_Object Qvoid_function, Qcyclic_function_indirection;
-Lisp_Object Qinvalid_operation, Qinvalid_change;
+Lisp_Object Qinvalid_operation, Qinvalid_change, Qprinting_unreadable_object;
 Lisp_Object Qsetting_constant;
 Lisp_Object Qediting_error;
 Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only;
-Lisp_Object Qio_error, Qend_of_file;
+Lisp_Object Qio_error, Qfile_error, Qconversion_error, Qend_of_file;
 Lisp_Object Qarith_error, Qrange_error, Qdomain_error;
 Lisp_Object Qsingularity_error, Qoverflow_error, Qunderflow_error;
 Lisp_Object Qintegerp, Qnatnump, Qsymbolp;
@@ -65,6 +66,7 @@
 Lisp_Object Qnumberp, Qnumber_char_or_marker_p;
 Lisp_Object Qbit_vectorp, Qbitp, Qcdr;
 
+Lisp_Object Qerror_lacks_explanatory_string;
 Lisp_Object Qfloatp;
 
 #ifdef DEBUG_XEMACS
@@ -113,7 +115,7 @@
 DOESNT_RETURN
 dead_wrong_type_argument (Lisp_Object predicate, Lisp_Object value)
 {
-  signal_error (Qwrong_type_argument, list2 (predicate, value));
+  signal_error_1 (Qwrong_type_argument, list2 (predicate, value));
 }
 
 DEFUN ("wrong-type-argument", Fwrong_type_argument, 2, 2, 0, /*
@@ -131,25 +133,27 @@
 DOESNT_RETURN
 c_write_error (Lisp_Object obj)
 {
-  signal_simple_error ("Attempt to modify read-only object (c)", obj);
+  signal_error (Qsetting_constant,
+		"Attempt to modify read-only object (c)", obj);
 }
 
 DOESNT_RETURN
 lisp_write_error (Lisp_Object obj)
 {
-  signal_simple_error ("Attempt to modify read-only object (lisp)", obj);
+  signal_error (Qsetting_constant,
+		"Attempt to modify read-only object (lisp)", obj);
 }
 
 DOESNT_RETURN
 args_out_of_range (Lisp_Object a1, Lisp_Object a2)
 {
-  signal_error (Qargs_out_of_range, list2 (a1, a2));
+  signal_error_1 (Qargs_out_of_range, list2 (a1, a2));
 }
 
 DOESNT_RETURN
 args_out_of_range_3 (Lisp_Object a1, Lisp_Object a2, Lisp_Object a3)
 {
-  signal_error (Qargs_out_of_range, list3 (a1, a2, a3));
+  signal_error_1 (Qargs_out_of_range, list3 (a1, a2, a3));
 }
 
 void
@@ -1582,7 +1586,7 @@
 print_weak_list (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
   if (print_readably)
-    error ("printing unreadable object #<weak-list>");
+    printing_unreadable_object ("#<weak-list>");
 
   write_c_string ("#<weak-list ", printcharfun);
   print_internal (encode_weak_list_type (XWEAK_LIST (obj)->type),
@@ -1910,7 +1914,7 @@
   if (EQ (symbol, Qvalue_assoc)) return WEAK_LIST_VALUE_ASSOC;
   if (EQ (symbol, Qfull_assoc))  return WEAK_LIST_FULL_ASSOC;
 
-  signal_simple_error ("Invalid weak list type", symbol);
+  invalid_constant ("Invalid weak list type", symbol);
   return WEAK_LIST_SIMPLE; /* not reached */
 }
 
@@ -2011,7 +2015,7 @@
 {
   EMACS_REESTABLISH_SIGNAL (signo, arith_error);
   EMACS_UNBLOCK_SIGNAL (signo);
-  signal_error (Qarith_error, Qnil);
+  signal_error (Qarith_error, 0, Qunbound);
 }
 
 void
@@ -2046,28 +2050,25 @@
   DEFERROR (Qerror, "error", Qnil);
   DEFERROR_STANDARD (Qquit, Qnil);
 
-  DEFERROR (Qunimplemented, "Feature not yet implemented", Qerror);
-  DEFERROR_STANDARD (Qsyntax_error, Qerror);
+  DEFERROR_STANDARD (Qinvalid_argument, Qerror);
+
+  DEFERROR_STANDARD (Qsyntax_error, Qinvalid_argument);
   DEFERROR_STANDARD (Qinvalid_read_syntax, Qsyntax_error);
-  DEFERROR_STANDARD (Qlist_formation_error, Qsyntax_error);
-
-  /* Generated by list traversal macros */
+  DEFERROR_STANDARD (Qstructure_formation_error, Qsyntax_error);
+  DEFERROR_STANDARD (Qlist_formation_error, Qstructure_formation_error);
   DEFERROR_STANDARD (Qmalformed_list, Qlist_formation_error);
   DEFERROR_STANDARD (Qmalformed_property_list, Qmalformed_list);
   DEFERROR_STANDARD (Qcircular_list, Qlist_formation_error);
   DEFERROR_STANDARD (Qcircular_property_list, Qcircular_list);
 
-  DEFERROR_STANDARD (Qinvalid_argument, Qerror);
   DEFERROR_STANDARD (Qwrong_type_argument, Qinvalid_argument);
   DEFERROR_STANDARD (Qargs_out_of_range, Qinvalid_argument);
   DEFERROR_STANDARD (Qwrong_number_of_arguments, Qinvalid_argument);
   DEFERROR_STANDARD (Qinvalid_function, Qinvalid_argument);
+  DEFERROR_STANDARD (Qinvalid_constant, Qinvalid_argument);
   DEFERROR (Qno_catch, "No catch for tag", Qinvalid_argument);
 
-  DEFERROR_STANDARD (Qinternal_error, Qerror);
-
-  DEFERROR (Qinvalid_state, "Properties or values have been set incorrectly",
-	    Qerror);
+  DEFERROR_STANDARD (Qinvalid_state, Qerror);
   DEFERROR (Qvoid_function, "Symbol's function definition is void",
 	    Qinvalid_state);
   DEFERROR (Qcyclic_function_indirection,
@@ -2078,22 +2079,26 @@
   DEFERROR (Qcyclic_variable_indirection,
 	    "Symbol's chain of variable indirections contains a loop",
 	    Qinvalid_state);
+  DEFERROR_STANDARD (Qstack_overflow, Qinvalid_state);
+  DEFERROR_STANDARD (Qinternal_error, Qinvalid_state);
+  DEFERROR_STANDARD (Qout_of_memory, Qinvalid_state);
 
-  DEFERROR (Qinvalid_operation,
-	    "Operation not allowed or error during operation", Qerror);
-  DEFERROR (Qinvalid_change, "Attempt to set properties or values incorrectly",
-	    Qinvalid_operation);
+  DEFERROR_STANDARD (Qinvalid_operation, Qerror);
+  DEFERROR_STANDARD (Qinvalid_change, Qinvalid_operation);
   DEFERROR (Qsetting_constant, "Attempt to set a constant symbol",
 	    Qinvalid_change);
+  DEFERROR_STANDARD (Qprinting_unreadable_object, Qinvalid_operation);
+  DEFERROR (Qunimplemented, "Feature not yet implemented", Qinvalid_operation);
 
-  DEFERROR (Qediting_error, "Invalid operation during editing",
-	    Qinvalid_operation);
+  DEFERROR_STANDARD (Qediting_error, Qinvalid_operation);
   DEFERROR_STANDARD (Qbeginning_of_buffer, Qediting_error);
   DEFERROR_STANDARD (Qend_of_buffer, Qediting_error);
   DEFERROR (Qbuffer_read_only, "Buffer is read-only", Qediting_error);
 
   DEFERROR (Qio_error, "IO Error", Qinvalid_operation);
-  DEFERROR (Qend_of_file, "End of file or stream", Qio_error);
+  DEFERROR_STANDARD (Qfile_error, Qio_error);
+  DEFERROR (Qend_of_file, "End of file or stream", Qfile_error);
+  DEFERROR_STANDARD (Qconversion_error, Qio_error);
 
   DEFERROR (Qarith_error, "Arithmetic error", Qinvalid_operation);
   DEFERROR (Qrange_error, "Arithmetic range error", Qarith_error);
@@ -2133,6 +2138,7 @@
   DEFSYMBOL (Qnumberp);
   DEFSYMBOL (Qnumber_char_or_marker_p);
   DEFSYMBOL (Qcdr);
+  DEFSYMBOL (Qerror_lacks_explanatory_string);
   DEFSYMBOL_MULTIWORD_PREDICATE (Qweak_listp);
 
 #ifdef LISP_FLOAT_TYPE