From: BT Templeton Date: Fri, 3 Aug 2012 06:12:23 +0000 (-0400) Subject: use guile-snarf for subr definition X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/fe6aa7a1f05e241a438ca3fa85969b7381d89a0e use guile-snarf for subr definition * src/Makefile.in: Run guile-snarf on files that previously contained `defsubr' calls. * src/alloc.c (syms_of_alloc): * src/buffer.c (syms_of_buffer): * src/bytecode.c (syms_of_bytecode): * src/callint.c (syms_of_callint): * src/callproc.c (syms_of_callproc): * src/casefiddle.c (syms_of_casefiddle): * src/casetab.c (syms_of_casetab): * src/category.c (syms_of_category): * src/ccl.c (syms_of_ccl): * src/character.c (syms_of_character): * src/charset.c (syms_of_charset): * src/chartab.c (syms_of_chartab): * src/cmds.c (syms_of_cmds): * src/coding.c (syms_of_coding): * src/composite.c (syms_of_composite): * src/data.c (syms_of_data): * src/dbusbind.c (syms_of_dbusbind): * src/dired.c (syms_of_dired): * src/dispnew.c (syms_of_display): * src/doc.c (syms_of_doc): * src/dosfns.c (syms_of_dosfns): * src/editfns.c (syms_of_editfns): * src/emacs.c (syms_of_emacs): * src/eval.c (syms_of_eval): * src/fileio.c (syms_of_fileio): * src/filelock.c (syms_of_filelock): * src/floatfns.c (syms_of_floatfns): * src/fns.c (syms_of_fns): * src/font.c (syms_of_font): * src/fontset.c (syms_of_fontset): * src/frame.c (syms_of_frame): * src/fringe.c (syms_of_fringe): * src/gnutls.c (syms_of_gnutls): * src/image.c (syms_of_image): * src/indent.c (syms_of_indent): * src/insdel.c (syms_of_insdel): * src/keyboard.c (syms_of_keyboard): * src/keymap.c (syms_of_keymap): * src/lread.c (syms_of_lread): * src/macros.c (syms_of_macros): * src/marker.c (syms_of_marker): * src/menu.c (syms_of_menu): * src/minibuf.c (syms_of_minibuf): * src/msdos.c (syms_of_msdos): * src/nsfns.m (syms_of_nsfns): * src/nsmenu.m (syms_of_nsmenu): * src/nsselect.m (syms_of_nsselect): * src/print.c (syms_of_print): * src/process.c (syms_of_process): * src/search.c (syms_of_search): * src/sound.c (syms_of_sound): * src/syntax.c (syms_of_syntax): * src/term.c (syms_of_term): * src/terminal.c (syms_of_terminal): * src/textprop.c (syms_of_textprop): * src/undo.c (syms_of_undo): * src/w16select.c (syms_of_win16select): * src/w32console.c (syms_of_ntterm): * src/w32fns.c (syms_of_w32fns): * src/w32font.c (syms_of_w32font): * src/w32menu.c (syms_of_w32menu): * src/w32proc.c (syms_of_ntproc): * src/w32select.c (syms_of_w32select): * src/window.c (syms_of_window): * src/xdisp.c (syms_of_xdisp): * src/xfaces.c (syms_of_xfaces): * src/xfns.c (syms_of_xfns): * src/xmenu.c (syms_of_xmenu): * src/xml.c (syms_of_xml): * src/xselect.c (syms_of_xselect): * src/xsettings.c (syms_of_xsettings): * src/xsmfns.c (syms_of_xsmfns): Include guile-snarf files for subr definition. --- diff --git a/src/Makefile.in b/src/Makefile.in index 7f8af80054..b48f9d32f4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -492,6 +492,7 @@ gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) echo timestamp > $@ $(ALLOBJS): globals.h +$(ALLOBJS:.o=.x): globals.h $(lib)/libgnu.a: $(config_h) $(MAKE) -C $(lib) libgnu.a @@ -541,6 +542,7 @@ ns-app: emacs$(EXEEXT) mostlyclean: rm -f temacs$(EXEEXT) core *.core \#* *.o + rm -f *.x rm -f ../etc/DOC rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT) rm -f buildobj.h @@ -648,6 +650,85 @@ bootstrap-emacs$(EXEEXT): temacs$(EXEEXT) @: Compile some files earlier to speed up further compilation. $(MAKE) -C ../lisp compile-first EMACS="$(bootstrap_exe)" +alloc.o: alloc.x +buffer.o: buffer.x +bytecode.o: bytecode.x +callint.o: callint.x +callproc.o: callproc.x +casefiddle.o: casefiddle.x +casetab.o: casetab.x +category.o: category.x +ccl.o: ccl.x +character.o: character.x +charset.o: charset.x +chartab.o: chartab.x +cmds.o: cmds.x +coding.o: coding.x +composite.o: composite.x +cygw32.o: cygw32.x +data.o: data.x +dbusbind.o: dbusbind.x +decompress.o: decompress.x +dired.o: dired.x +dispnew.o: dispnew.x +doc.o: doc.x +dosfns.o: dosfns.x +editfns.o: editfns.x +emacs.o: emacs.x +eval.o: eval.x +fileio.o: fileio.x +filelock.o: filelock.x +floatfns.o: floatfns.x +fns.o: fns.x +font.o: font.x +fontset.o: fontset.x +frame.o: frame.x +fringe.o: fringe.x +gfilenotify.o: gfilenotify.x +gnutls.o: gnutls.x +image.o: image.x +indent.o: indent.x +inotify.o: inotify.x +insdel.o: insdel.x +keyboard.o: keyboard.x +keymap.o: keymap.x +lread.o: lread.x +macros.o: macros.x +marker.o: marker.x +menu.o: menu.x +minibuf.o: minibuf.x +msdos.o: msdos.x +nsfns.o: nsfns.x +nsmenu.o: nsmenu.x +nsselect.o: nsselect.x +print.o: print.x +process.o: process.x +profiler.o: profiler.x +search.o: search.x +sound.o: sound.x +syntax.o: syntax.x +term.o: term.x +terminal.o: terminal.x +textprop.o: textprop.x +undo.o: undo.x +w16select.o: w16select.x +w32console.o: w32console.x +w32fns.o: w32fns.x +w32font.o: w32font.x +w32menu.o: w32menu.x +w32notify.o: w32notify.x +w32proc.o: w32proc.x +w32select.o: w32select.x +window.o: window.x +xdisp.o: xdisp.x +xfaces.o: xfaces.x +xfns.o: xfns.x +xmenu.o: xmenu.x +xml.o: xml.x +xselect.o: xselect.x +xsettings.o: xsettings.x +xsmfns.o: xsmfns.x + ## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. @deps_frag@ diff --git a/src/alloc.c b/src/alloc.c index 7976669ee4..1530269f24 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1678,6 +1678,8 @@ init_alloc (void) void syms_of_alloc (void) { +#include "alloc.x" + DEFVAR_INT ("gc-cons-threshold", gc_cons_threshold, doc: /* Number of bytes of consing between garbage collections. Garbage collection can happen automatically once this many bytes have been @@ -1734,20 +1736,6 @@ do hash-consing of the objects allocated to pure space. */); The time is in seconds as a floating point value. */); DEFVAR_INT ("gcs-done", gcs_done, doc: /* Accumulated number of garbage collections done. */); - - defsubr (&Scons); - defsubr (&Slist); - defsubr (&Svector); - defsubr (&Sbool_vector); - defsubr (&Smake_byte_code); - defsubr (&Smake_list); - defsubr (&Smake_vector); - defsubr (&Smake_string); - defsubr (&Smake_bool_vector); - defsubr (&Smake_symbol); - defsubr (&Smake_marker); - defsubr (&Spurecopy); - defsubr (&Sgarbage_collect); } /* When compiled with GCC, GDB might say "No enum type named diff --git a/src/buffer.c b/src/buffer.c index 2ec2061743..7b735aef38 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5410,6 +5410,8 @@ defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, const char *namestring, void syms_of_buffer (void) { +#include "buffer.x" + staticpro (&last_overlay_modification_hooks); last_overlay_modification_hooks = Fmake_vector (make_number (10), Qnil); @@ -6286,56 +6288,6 @@ Functions running this hook are, `get-buffer-create', `bury-buffer-internal' and `select-window'. */); Vbuffer_list_update_hook = Qnil; DEFSYM (Qbuffer_list_update_hook, "buffer-list-update-hook"); - - defsubr (&Sbuffer_live_p); - defsubr (&Sbuffer_list); - defsubr (&Sget_buffer); - defsubr (&Sget_file_buffer); - defsubr (&Sget_buffer_create); - defsubr (&Smake_indirect_buffer); - defsubr (&Sgenerate_new_buffer_name); - defsubr (&Sbuffer_name); - defsubr (&Sbuffer_file_name); - defsubr (&Sbuffer_base_buffer); - defsubr (&Sbuffer_local_value); - defsubr (&Sbuffer_local_variables); - defsubr (&Sbuffer_modified_p); - defsubr (&Sforce_mode_line_update); - defsubr (&Sset_buffer_modified_p); - defsubr (&Sbuffer_modified_tick); - defsubr (&Sbuffer_chars_modified_tick); - defsubr (&Srename_buffer); - defsubr (&Sother_buffer); - defsubr (&Sbuffer_enable_undo); - defsubr (&Skill_buffer); - defsubr (&Sbury_buffer_internal); - defsubr (&Sset_buffer_major_mode); - defsubr (&Scurrent_buffer); - defsubr (&Sset_buffer); - defsubr (&Sbarf_if_buffer_read_only); - defsubr (&Serase_buffer); - defsubr (&Sbuffer_swap_text); - defsubr (&Sset_buffer_multibyte); - defsubr (&Skill_all_local_variables); - - defsubr (&Soverlayp); - defsubr (&Smake_overlay); - defsubr (&Sdelete_overlay); - defsubr (&Sdelete_all_overlays); - defsubr (&Smove_overlay); - defsubr (&Soverlay_start); - defsubr (&Soverlay_end); - defsubr (&Soverlay_buffer); - defsubr (&Soverlay_properties); - defsubr (&Soverlays_at); - defsubr (&Soverlays_in); - defsubr (&Snext_overlay_change); - defsubr (&Sprevious_overlay_change); - defsubr (&Soverlay_recenter); - defsubr (&Soverlay_lists); - defsubr (&Soverlay_get); - defsubr (&Soverlay_put); - defsubr (&Srestore_buffer_modified_p); } void diff --git a/src/bytecode.c b/src/bytecode.c index 796f5354bf..cf71fd1fde 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -1952,7 +1952,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth, void syms_of_bytecode (void) { - defsubr (&Sbyte_code); +#include "bytecode.x" #ifdef BYTE_CODE_METER diff --git a/src/callint.c b/src/callint.c index 817f84d897..d46ab231c3 100644 --- a/src/callint.c +++ b/src/callint.c @@ -901,6 +901,8 @@ Its numeric meaning is what you would get from `(interactive "p")'. */) void syms_of_callint (void) { +#include "callint.x" + point_marker = Fmake_marker (); staticpro (&point_marker); @@ -979,9 +981,4 @@ behave as if the mark were still active. */); Its purpose is to give temporary modes such as Isearch mode a way to turn themselves off when a mouse command switches windows. */); Vmouse_leave_buffer_hook = Qnil; - - defsubr (&Sinteractive); - defsubr (&Scall_interactively); - defsubr (&Sfuncall_interactively); - defsubr (&Sprefix_numeric_value); } diff --git a/src/callproc.c b/src/callproc.c index 9fbc7e5b71..98ffc2fed0 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1660,6 +1660,8 @@ set_initial_environment (void) void syms_of_callproc (void) { +#include "callproc.x" + #ifndef DOS_NT Vtemp_file_name_pattern = build_string ("emacsXXXXXX"); #else /* DOS_NT */ @@ -1747,8 +1749,4 @@ use. See `setenv' and `getenv'. */); Vprocess_environment = Qnil; - - defsubr (&Scall_process); - defsubr (&Sgetenv_internal); - defsubr (&Scall_process_region); } diff --git a/src/casefiddle.c b/src/casefiddle.c index a7477bb64b..8b3b552901 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -425,18 +425,9 @@ With negative argument, capitalize previous words but do not move. */) void syms_of_casefiddle (void) { +#include "casefiddle.x" + DEFSYM (Qidentity, "identity"); - defsubr (&Supcase); - defsubr (&Sdowncase); - defsubr (&Scapitalize); - defsubr (&Supcase_initials); - defsubr (&Supcase_region); - defsubr (&Sdowncase_region); - defsubr (&Scapitalize_region); - defsubr (&Supcase_initials_region); - defsubr (&Supcase_word); - defsubr (&Sdowncase_word); - defsubr (&Scapitalize_word); } void diff --git a/src/casetab.c b/src/casetab.c index aea1f2f045..d5e68624f0 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -289,16 +289,12 @@ init_casetab_once (void) void syms_of_casetab (void) { +#include "casetab.x" + DEFSYM (Qcase_table_p, "case-table-p"); staticpro (&Vascii_canon_table); staticpro (&Vascii_downcase_table); staticpro (&Vascii_eqv_table); staticpro (&Vascii_upcase_table); - - defsubr (&Scase_table_p); - defsubr (&Scurrent_case_table); - defsubr (&Sstandard_case_table); - defsubr (&Sset_case_table); - defsubr (&Sset_standard_case_table); } diff --git a/src/category.c b/src/category.c index 851ae1a4c2..39c039dd53 100644 --- a/src/category.c +++ b/src/category.c @@ -455,6 +455,8 @@ init_category_once (void) void syms_of_category (void) { +#include "category.x" + DEFSYM (Qcategoryp, "categoryp"); DEFSYM (Qcategorysetp, "categorysetp"); DEFSYM (Qcategory_table_p, "category-table-p"); @@ -503,19 +505,5 @@ See the documentation of the variable `word-combining-categories'. */); Vword_separating_categories = Qnil; - defsubr (&Smake_category_set); - defsubr (&Sdefine_category); - defsubr (&Scategory_docstring); - defsubr (&Sget_unused_category); - defsubr (&Scategory_table_p); - defsubr (&Scategory_table); - defsubr (&Sstandard_category_table); - defsubr (&Scopy_category_table); - defsubr (&Smake_category_table); - defsubr (&Sset_category_table); - defsubr (&Schar_category_set); - defsubr (&Scategory_set_mnemonics); - defsubr (&Smodify_category_entry); - category_table_version = 0; } diff --git a/src/ccl.c b/src/ccl.c index 6dedaf68cb..daff3c6e41 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -2292,6 +2292,8 @@ Return index number of the registered map. */) void syms_of_ccl (void) { +#include "ccl.x" + staticpro (&Vccl_program_table); Vccl_program_table = Fmake_vector (make_number (32), Qnil); @@ -2325,10 +2327,4 @@ Comprises pairs (SYMBOL . TABLE) where SYMBOL and TABLE were set up by calls to `define-translation-hash-table'. The vector is indexed by the table id used by CCL. */); Vtranslation_hash_table_vector = Qnil; - - defsubr (&Sccl_program_p); - defsubr (&Sccl_execute); - defsubr (&Sccl_execute_on_string); - defsubr (&Sregister_ccl_program); - defsubr (&Sregister_code_conversion_map); } diff --git a/src/character.c b/src/character.c index a8e48dfd77..28ac442d4e 100644 --- a/src/character.c +++ b/src/character.c @@ -991,23 +991,14 @@ character is not ASCII nor 8-bit character, an error is signaled. */) void syms_of_character (void) { +#include "character.x" + DEFSYM (Qcharacterp, "characterp"); DEFSYM (Qauto_fill_chars, "auto-fill-chars"); staticpro (&Vchar_unify_table); Vchar_unify_table = Qnil; - defsubr (&Smax_char); - defsubr (&Scharacterp); - defsubr (&Sunibyte_char_to_multibyte); - defsubr (&Smultibyte_char_to_unibyte); - defsubr (&Schar_width); - defsubr (&Sstring_width); - defsubr (&Sstring); - defsubr (&Sunibyte_string); - defsubr (&Schar_resolve_modifiers); - defsubr (&Sget_byte); - DEFVAR_LISP ("translation-table-vector", Vtranslation_table_vector, doc: /* Vector recording all translation tables ever defined. diff --git a/src/charset.c b/src/charset.c index 57437b8bf3..ad37778153 100644 --- a/src/charset.c +++ b/src/charset.c @@ -2353,6 +2353,8 @@ static struct charset charset_table_init[180]; void syms_of_charset (void) { +#include "charset.x" + DEFSYM (Qcharsetp, "charsetp"); DEFSYM (Qascii, "ascii"); @@ -2389,30 +2391,6 @@ syms_of_charset (void) charset_table_size = ARRAYELTS (charset_table_init); charset_table_used = 0; - defsubr (&Scharsetp); - defsubr (&Smap_charset_chars); - defsubr (&Sdefine_charset_internal); - defsubr (&Sdefine_charset_alias); - defsubr (&Scharset_plist); - defsubr (&Sset_charset_plist); - defsubr (&Sunify_charset); - defsubr (&Sget_unused_iso_final_char); - defsubr (&Sdeclare_equiv_charset); - defsubr (&Sfind_charset_region); - defsubr (&Sfind_charset_string); - defsubr (&Sdecode_char); - defsubr (&Sencode_char); - defsubr (&Ssplit_char); - defsubr (&Smake_char); - defsubr (&Schar_charset); - defsubr (&Scharset_after); - defsubr (&Siso_charset); - defsubr (&Sclear_charset_maps); - defsubr (&Scharset_priority_list); - defsubr (&Sset_charset_priority); - defsubr (&Scharset_id_internal); - defsubr (&Ssort_charsets); - DEFVAR_LISP ("charset-map-path", Vcharset_map_path, doc: /* List of directories to search for charset map files. */); Vcharset_map_path = Qnil; diff --git a/src/chartab.c b/src/chartab.c index 4d4e6381b1..3abe3224ee 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -1409,21 +1409,9 @@ CHAR-TABLE must be what returned by `unicode-property-table-internal'. */) void syms_of_chartab (void) { - DEFSYM (Qchar_code_property_table, "char-code-property-table"); +#include "chartab.x" - defsubr (&Smake_char_table); - defsubr (&Schar_table_parent); - defsubr (&Schar_table_subtype); - defsubr (&Sset_char_table_parent); - defsubr (&Schar_table_extra_slot); - defsubr (&Sset_char_table_extra_slot); - defsubr (&Schar_table_range); - defsubr (&Sset_char_table_range); - defsubr (&Soptimize_char_table); - defsubr (&Smap_char_table); - defsubr (&Sunicode_property_table_internal); - defsubr (&Sget_unicode_property_internal); - defsubr (&Sput_unicode_property_internal); + DEFSYM (Qchar_code_property_table, "char-code-property-table"); /* Each element has the form (PROP . TABLE). PROP is a symbol representing a character property. diff --git a/src/cmds.c b/src/cmds.c index 2023463877..db1ae7add3 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -522,6 +522,8 @@ internal_self_insert (int c, EMACS_INT n) void syms_of_cmds (void) { +#include "cmds.x" + DEFSYM (Qkill_backward_chars, "kill-backward-chars"); DEFSYM (Qkill_forward_chars, "kill-forward-chars"); DEFSYM (Qoverwrite_mode_binary, "overwrite-mode-binary"); @@ -532,16 +534,6 @@ syms_of_cmds (void) doc: /* Hook run at the end of `self-insert-command'. This is run after inserting the character. */); Vpost_self_insert_hook = Qnil; - - defsubr (&Sforward_point); - defsubr (&Sforward_char); - defsubr (&Sbackward_char); - defsubr (&Sforward_line); - defsubr (&Sbeginning_of_line); - defsubr (&Send_of_line); - - defsubr (&Sdelete_char); - defsubr (&Sself_insert_command); } void diff --git a/src/coding.c b/src/coding.c index 3fffeb49c5..55e2145999 100644 --- a/src/coding.c +++ b/src/coding.c @@ -10797,6 +10797,8 @@ init_coding_once (void) void syms_of_coding (void) { +#include "coding.x" + staticpro (&Vcoding_system_hash_table); { Lisp_Object args[2]; @@ -10958,39 +10960,6 @@ syms_of_coding (void) DEFSYM (Qinterrupted, "interrupted"); DEFSYM (Qcoding_system_define_form, "coding-system-define-form"); - defsubr (&Scoding_system_p); - defsubr (&Sread_coding_system); - defsubr (&Sread_non_nil_coding_system); - defsubr (&Scheck_coding_system); - defsubr (&Sdetect_coding_region); - defsubr (&Sdetect_coding_string); - defsubr (&Sfind_coding_systems_region_internal); - defsubr (&Sunencodable_char_position); - defsubr (&Scheck_coding_systems_region); - defsubr (&Sdecode_coding_region); - defsubr (&Sencode_coding_region); - defsubr (&Sdecode_coding_string); - defsubr (&Sencode_coding_string); - defsubr (&Sdecode_sjis_char); - defsubr (&Sencode_sjis_char); - defsubr (&Sdecode_big5_char); - defsubr (&Sencode_big5_char); - defsubr (&Sset_terminal_coding_system_internal); - defsubr (&Sset_safe_terminal_coding_system_internal); - defsubr (&Sterminal_coding_system); - defsubr (&Sset_keyboard_coding_system_internal); - defsubr (&Skeyboard_coding_system); - defsubr (&Sfind_operation_coding_system); - defsubr (&Sset_coding_system_priority); - defsubr (&Sdefine_coding_system_internal); - defsubr (&Sdefine_coding_system_alias); - defsubr (&Scoding_system_put); - defsubr (&Scoding_system_base); - defsubr (&Scoding_system_plist); - defsubr (&Scoding_system_aliases); - defsubr (&Scoding_system_eol_type); - defsubr (&Scoding_system_priority_list); - DEFVAR_LISP ("coding-system-list", Vcoding_system_list, doc: /* List of coding systems. diff --git a/src/composite.c b/src/composite.c index 3dc715ebf6..1c14a052cc 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1896,6 +1896,8 @@ syms_of_composite (void) { int i; +#include "composite.x" + DEFSYM (Qcomposition, "composition"); /* Make a hash table for static composition. */ @@ -2008,9 +2010,4 @@ GSTRING, or modify GSTRING itself and return it. See also the documentation of `auto-composition-mode'. */); Vcomposition_function_table = Fmake_char_table (Qnil, Qnil); - - defsubr (&Scompose_region_internal); - defsubr (&Scompose_string_internal); - defsubr (&Sfind_composition_internal); - defsubr (&Scomposition_get_gstring); } diff --git a/src/cygw32.c b/src/cygw32.c index b7386ab8e1..02f3b795b6 100644 --- a/src/cygw32.c +++ b/src/cygw32.c @@ -134,6 +134,5 @@ For the reverse operation, see `cygwin-convert-file-name-to-windows'. */) void syms_of_cygw32 (void) { - defsubr (&Scygwin_convert_file_name_from_windows); - defsubr (&Scygwin_convert_file_name_to_windows); +#include "cygw32.x" } diff --git a/src/data.c b/src/data.c index 6d329f59b3..84efa20f64 100644 --- a/src/data.c +++ b/src/data.c @@ -3383,6 +3383,8 @@ syms_of_data (void) { Lisp_Object error_tail, arith_tail; +#include "data.x" + DEFSYM (Qquote, "quote"); DEFSYM (Qlambda, "lambda"); DEFSYM (Qsubr, "subr"); @@ -3550,109 +3552,6 @@ syms_of_data (void) DEFSYM (Qinteractive_form, "interactive-form"); DEFSYM (Qdefalias_fset_function, "defalias-fset-function"); - defsubr (&Sindirect_variable); - defsubr (&Sinteractive_form); - defsubr (&Seq); - defsubr (&Snull); - defsubr (&Stype_of); - defsubr (&Slistp); - defsubr (&Snlistp); - defsubr (&Sconsp); - defsubr (&Satom); - defsubr (&Sintegerp); - defsubr (&Sinteger_or_marker_p); - defsubr (&Snumberp); - defsubr (&Snumber_or_marker_p); - defsubr (&Sfloatp); - defsubr (&Snatnump); - defsubr (&Ssymbolp); - defsubr (&Skeywordp); - defsubr (&Sstringp); - defsubr (&Smultibyte_string_p); - defsubr (&Svectorp); - defsubr (&Schar_table_p); - defsubr (&Svector_or_char_table_p); - defsubr (&Sbool_vector_p); - defsubr (&Sarrayp); - defsubr (&Ssequencep); - defsubr (&Sbufferp); - defsubr (&Smarkerp); - defsubr (&Ssubrp); - defsubr (&Sbyte_code_function_p); - defsubr (&Schar_or_string_p); - defsubr (&Scar); - defsubr (&Scdr); - defsubr (&Scar_safe); - defsubr (&Scdr_safe); - defsubr (&Ssetcar); - defsubr (&Ssetcdr); - defsubr (&Ssymbol_function); - defsubr (&Sindirect_function); - defsubr (&Ssymbol_plist); - defsubr (&Ssymbol_name); - defsubr (&Smakunbound); - defsubr (&Sfmakunbound); - defsubr (&Sboundp); - defsubr (&Sfboundp); - defsubr (&Sfset); - defsubr (&Sdefalias); - defsubr (&Ssetplist); - defsubr (&Ssymbol_value); - defsubr (&Sset); - defsubr (&Sdefault_boundp); - defsubr (&Sdefault_value); - defsubr (&Sset_default); - defsubr (&Ssetq_default); - defsubr (&Smake_variable_buffer_local); - defsubr (&Smake_local_variable); - defsubr (&Skill_local_variable); - defsubr (&Smake_variable_frame_local); - defsubr (&Slocal_variable_p); - defsubr (&Slocal_variable_if_set_p); - defsubr (&Svariable_binding_locus); -#if 0 /* XXX Remove this. --lorentey */ - defsubr (&Sterminal_local_value); - defsubr (&Sset_terminal_local_value); -#endif - defsubr (&Saref); - defsubr (&Saset); - defsubr (&Snumber_to_string); - defsubr (&Sstring_to_number); - defsubr (&Seqlsign); - defsubr (&Slss); - defsubr (&Sgtr); - defsubr (&Sleq); - defsubr (&Sgeq); - defsubr (&Sneq); - defsubr (&Splus); - defsubr (&Sminus); - defsubr (&Stimes); - defsubr (&Squo); - defsubr (&Srem); - defsubr (&Smod); - defsubr (&Smax); - defsubr (&Smin); - defsubr (&Slogand); - defsubr (&Slogior); - defsubr (&Slogxor); - defsubr (&Slsh); - defsubr (&Sash); - defsubr (&Sadd1); - defsubr (&Ssub1); - defsubr (&Slognot); - defsubr (&Sbyteorder); - defsubr (&Ssubr_arity); - defsubr (&Ssubr_name); - - defsubr (&Sbool_vector_exclusive_or); - defsubr (&Sbool_vector_union); - defsubr (&Sbool_vector_intersection); - defsubr (&Sbool_vector_set_difference); - defsubr (&Sbool_vector_not); - defsubr (&Sbool_vector_subsetp); - defsubr (&Sbool_vector_count_consecutive); - defsubr (&Sbool_vector_count_population); - set_symbol_function (Qwholenump, XSYMBOL (Qnatnump)->function); DEFVAR_LISP ("most-positive-fixnum", Vmost_positive_fixnum, diff --git a/src/dbusbind.c b/src/dbusbind.c index 8997e01b06..58513e1874 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -1740,22 +1740,16 @@ xd_read_queued_messages (int fd, void *data) void syms_of_dbusbind (void) { +#include "dbusbind.x" DEFSYM (Qdbus__init_bus, "dbus--init-bus"); - defsubr (&Sdbus__init_bus); - DEFSYM (Qdbus_get_unique_name, "dbus-get-unique-name"); - defsubr (&Sdbus_get_unique_name); - DEFSYM (Qdbus_message_internal, "dbus-message-internal"); - defsubr (&Sdbus_message_internal); - DEFSYM (Qdbus_error, "dbus-error"); Fput (Qdbus_error, Qerror_conditions, list2 (Qdbus_error, Qerror)); Fput (Qdbus_error, Qerror_message, build_pure_c_string ("D-Bus error")); - DEFSYM (QCdbus_system_bus, ":system"); DEFSYM (QCdbus_session_bus, ":session"); DEFSYM (QCdbus_timeout, ":timeout"); diff --git a/src/decompress.c b/src/decompress.c index cd8a3d1e96..540c39d74e 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -224,9 +224,9 @@ This function can be called only in unibyte buffers. */) void syms_of_decompress (void) { +#include "decompress.x" + DEFSYM (Qzlib_dll, "zlib"); - defsubr (&Szlib_decompress_region); - defsubr (&Szlib_available_p); } #endif /* HAVE_ZLIB */ diff --git a/src/dired.c b/src/dired.c index d3fe5b4943..f2784f7177 100644 --- a/src/dired.c +++ b/src/dired.c @@ -1041,6 +1041,8 @@ The value may be nil if not supported on this platform. */) void syms_of_dired (void) { +#include "dired.x" + DEFSYM (Qdirectory_files, "directory-files"); DEFSYM (Qdirectory_files_and_attributes, "directory-files-and-attributes"); DEFSYM (Qfile_name_completion, "file-name-completion"); @@ -1049,15 +1051,6 @@ syms_of_dired (void) DEFSYM (Qfile_attributes_lessp, "file-attributes-lessp"); DEFSYM (Qdefault_directory, "default-directory"); - defsubr (&Sdirectory_files); - defsubr (&Sdirectory_files_and_attributes); - defsubr (&Sfile_name_completion); - defsubr (&Sfile_name_all_completions); - defsubr (&Sfile_attributes); - defsubr (&Sfile_attributes_lessp); - defsubr (&Ssystem_users); - defsubr (&Ssystem_groups); - DEFVAR_LISP ("completion-ignored-extensions", Vcompletion_ignored_extensions, doc: /* Completion ignores file names ending in any string in this list. It does not ignore them if all possible completions end in one of diff --git a/src/dispnew.c b/src/dispnew.c index 163780952a..d9ef0172cb 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6223,20 +6223,7 @@ WINDOW nil or omitted means report on the selected window. */) void syms_of_display (void) { - defsubr (&Sredraw_frame); - defsubr (&Sredraw_display); - defsubr (&Sframe_or_buffer_changed_p); - defsubr (&Sopen_termscript); - defsubr (&Sding); - defsubr (&Sredisplay); - defsubr (&Ssleep_for); - defsubr (&Ssend_string_to_terminal); - defsubr (&Sinternal_show_cursor); - defsubr (&Sinternal_show_cursor_p); - -#ifdef GLYPH_DEBUG - defsubr (&Sdump_redisplay_history); -#endif +#include "dispnew.x" frame_and_buffer_state = Fmake_vector (make_number (20), Qlambda); staticpro (&frame_and_buffer_state); diff --git a/src/doc.c b/src/doc.c index d0b28f8cad..ccf58cab69 100644 --- a/src/doc.c +++ b/src/doc.c @@ -957,6 +957,8 @@ Otherwise, return a new string. */) void syms_of_doc (void) { +#include "doc.x" + DEFSYM (Qfunction_documentation, "function-documentation"); DEFVAR_LISP ("internal-doc-file-name", Vdoc_file_name, @@ -966,9 +968,4 @@ syms_of_doc (void) DEFVAR_LISP ("build-files", Vbuild_files, doc: /* A list of files used to build this Emacs binary. */); Vbuild_files = Qnil; - - defsubr (&Sdocumentation); - defsubr (&Sdocumentation_property); - defsubr (&Ssnarf_documentation); - defsubr (&Ssubstitute_command_keys); } diff --git a/src/dosfns.c b/src/dosfns.c index baa0358d72..c517a0ed23 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -674,18 +674,7 @@ dos_cleanup (void) void syms_of_dosfns (void) { - defsubr (&Sint86); - defsubr (&Sdos_memget); - defsubr (&Sdos_memput); - defsubr (&Smsdos_mouse_init); - defsubr (&Smsdos_mouse_enable); - defsubr (&Smsdos_set_keyboard); - defsubr (&Sinsert_startup_screen); - defsubr (&Smsdos_mouse_disable); - defsubr (&Sfile_system_info); -#ifndef HAVE_X_WINDOWS - defsubr (&Smsdos_mouse_p); -#endif +#include "dosfns.x" DEFVAR_INT ("dos-country-code", dos_country_code, doc: /* The country code returned by Dos when Emacs was started. diff --git a/src/editfns.c b/src/editfns.c index 8308d07408..c89267d048 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -4778,6 +4778,8 @@ Transposing beyond buffer boundaries is an error. */) void syms_of_editfns (void) { +#include "editfns.x" + DEFSYM (Qbuffer_access_fontify_functions, "buffer-access-fontify-functions"); DEFVAR_LISP ("inhibit-field-text-motion", Vinhibit_field_text_motion, @@ -4824,95 +4826,6 @@ functions if all the text being accessed has this property. */); DEFVAR_LISP ("operating-system-release", Voperating_system_release, doc: /* The release of the operating system Emacs is running on. */); - defsubr (&Spropertize); - defsubr (&Schar_equal); - defsubr (&Sgoto_char); - defsubr (&Sstring_to_char); - defsubr (&Schar_to_string); - defsubr (&Sbyte_to_string); - defsubr (&Sbuffer_substring); - defsubr (&Sbuffer_substring_no_properties); - defsubr (&Sbuffer_string); - defsubr (&Sget_pos_property); - - defsubr (&Spoint_marker); - defsubr (&Smark_marker); - defsubr (&Spoint); - defsubr (&Sregion_beginning); - defsubr (&Sregion_end); - DEFSYM (Qfield, "field"); DEFSYM (Qboundary, "boundary"); - defsubr (&Sfield_beginning); - defsubr (&Sfield_end); - defsubr (&Sfield_string); - defsubr (&Sfield_string_no_properties); - defsubr (&Sdelete_field); - defsubr (&Sconstrain_to_field); - - defsubr (&Sline_beginning_position); - defsubr (&Sline_end_position); - - defsubr (&Ssave_excursion); - defsubr (&Ssave_current_buffer); - - defsubr (&Sbuffer_size); - defsubr (&Spoint_max); - defsubr (&Spoint_min); - defsubr (&Spoint_min_marker); - defsubr (&Spoint_max_marker); - defsubr (&Sgap_position); - defsubr (&Sgap_size); - defsubr (&Sposition_bytes); - defsubr (&Sbyte_to_position); - - defsubr (&Sbobp); - defsubr (&Seobp); - defsubr (&Sbolp); - defsubr (&Seolp); - defsubr (&Sfollowing_char); - defsubr (&Sprevious_char); - defsubr (&Schar_after); - defsubr (&Schar_before); - defsubr (&Sinsert); - defsubr (&Sinsert_before_markers); - defsubr (&Sinsert_and_inherit); - defsubr (&Sinsert_and_inherit_before_markers); - defsubr (&Sinsert_char); - defsubr (&Sinsert_byte); - - defsubr (&Suser_login_name); - defsubr (&Suser_real_login_name); - defsubr (&Suser_uid); - defsubr (&Suser_real_uid); - defsubr (&Sgroup_gid); - defsubr (&Sgroup_real_gid); - defsubr (&Suser_full_name); - defsubr (&Semacs_pid); - defsubr (&Scurrent_time); - defsubr (&Sget_internal_run_time); - defsubr (&Sformat_time_string); - defsubr (&Sfloat_time); - defsubr (&Sdecode_time); - defsubr (&Sencode_time); - defsubr (&Scurrent_time_string); - defsubr (&Scurrent_time_zone); - defsubr (&Sset_time_zone_rule); - defsubr (&Ssystem_name); - defsubr (&Smessage); - defsubr (&Smessage_box); - defsubr (&Smessage_or_box); - defsubr (&Scurrent_message); - defsubr (&Sformat); - - defsubr (&Sinsert_buffer_substring); - defsubr (&Scompare_buffer_substrings); - defsubr (&Ssubst_char_in_region); - defsubr (&Stranslate_region_internal); - defsubr (&Sdelete_region); - defsubr (&Sdelete_and_extract_region); - defsubr (&Swiden); - defsubr (&Snarrow_to_region); - defsubr (&Ssave_restriction); - defsubr (&Stranspose_regions); } diff --git a/src/emacs.c b/src/emacs.c index 32c5a32774..1a4444211f 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2400,22 +2400,13 @@ from the parent process and its tty file descriptors. */) void syms_of_emacs (void) { +#include "emacs.x" + DEFSYM (Qfile_name_handler_alist, "file-name-handler-alist"); DEFSYM (Qrisky_local_variable, "risky-local-variable"); DEFSYM (Qkill_emacs, "kill-emacs"); DEFSYM (Qkill_emacs_hook, "kill-emacs-hook"); -#ifndef CANNOT_DUMP - defsubr (&Sdump_emacs); -#endif - - defsubr (&Skill_emacs); - - defsubr (&Sinvocation_name); - defsubr (&Sinvocation_directory); - defsubr (&Sdaemonp); - defsubr (&Sdaemon_initialized); - DEFVAR_LISP ("command-line-args", Vcommand_line_args, doc: /* Args passed by shell to Emacs, as a list of strings. Many arguments are deleted from the list as they are processed. */); diff --git a/src/eval.c b/src/eval.c index 985abce809..0aad67559f 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3662,6 +3662,8 @@ Lisp_Object backtrace_top_function (void) void syms_of_eval (void) { +#include "eval.x" + DEFVAR_INT ("max-specpdl-size", max_specpdl_size, doc: /* Limit on number of Lisp variable bindings and `unwind-protect's. If Lisp code tries to increase the total number past this amount, @@ -3806,49 +3808,4 @@ alist of active lexical bindings. */); Vsignaling_function = Qnil; inhibit_lisp_code = Qnil; - - defsubr (&Sor); - defsubr (&Sand); - defsubr (&Sif); - defsubr (&Scond); - defsubr (&Sprogn); - defsubr (&Sprog1); - defsubr (&Sprog2); - defsubr (&Ssetq); - defsubr (&Squote); - defsubr (&Sfunction); - defsubr (&Sdefault_toplevel_value); - defsubr (&Sset_default_toplevel_value); - defsubr (&Sdefvar); - defsubr (&Sdefvaralias); - defsubr (&Sdefconst); - defsubr (&Smake_var_non_special); - defsubr (&Slet); - defsubr (&SletX); - defsubr (&Swhile); - defsubr (&Smacroexpand); - defsubr (&Scatch); - defsubr (&Sthrow); - defsubr (&Sunwind_protect); - defsubr (&Scondition_case); - defsubr (&Ssignal); - defsubr (&Scommandp); - defsubr (&Sautoload); - defsubr (&Sautoload_do_load); - defsubr (&Seval); - defsubr (&Sapply); - defsubr (&Sfuncall); - defsubr (&Srun_hooks); - defsubr (&Srun_hook_with_args); - defsubr (&Srun_hook_with_args_until_success); - defsubr (&Srun_hook_with_args_until_failure); - defsubr (&Srun_hook_wrapped); - defsubr (&Sfetch_bytecode); - defsubr (&Sbacktrace_debug); - defsubr (&Sbacktrace); - defsubr (&Sbacktrace_frame); - defsubr (&Sbacktrace_eval); - defsubr (&Sbacktrace__locals); - defsubr (&Sspecial_variable_p); - defsubr (&Sfunctionp); } diff --git a/src/fileio.c b/src/fileio.c index f0bd75b170..3b4776cc65 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -5795,6 +5795,8 @@ init_fileio (void) void syms_of_fileio (void) { +#include "fileio.x" + DEFSYM (Qoperations, "operations"); DEFSYM (Qexpand_file_name, "expand-file-name"); DEFSYM (Qsubstitute_in_file_name, "substitute-in-file-name"); @@ -6030,58 +6032,4 @@ This includes interactive calls to `delete-file' and DEFSYM (Qcopy_directory, "copy-directory"); DEFSYM (Qdelete_directory, "delete-directory"); DEFSYM (Qsubstitute_env_in_file_name, "substitute-env-in-file-name"); - - defsubr (&Sfind_file_name_handler); - defsubr (&Sfile_name_directory); - defsubr (&Sfile_name_nondirectory); - defsubr (&Sunhandled_file_name_directory); - defsubr (&Sfile_name_as_directory); - defsubr (&Sdirectory_file_name); - defsubr (&Smake_temp_name); - defsubr (&Sexpand_file_name); - defsubr (&Ssubstitute_in_file_name); - defsubr (&Scopy_file); - defsubr (&Smake_directory_internal); - defsubr (&Sdelete_directory_internal); - defsubr (&Sdelete_file); - defsubr (&Srename_file); - defsubr (&Sadd_name_to_file); - defsubr (&Smake_symbolic_link); - defsubr (&Sfile_name_absolute_p); - defsubr (&Sfile_exists_p); - defsubr (&Sfile_executable_p); - defsubr (&Sfile_readable_p); - defsubr (&Sfile_writable_p); - defsubr (&Saccess_file); - defsubr (&Sfile_symlink_p); - defsubr (&Sfile_directory_p); - defsubr (&Sfile_accessible_directory_p); - defsubr (&Sfile_regular_p); - defsubr (&Sfile_modes); - defsubr (&Sset_file_modes); - defsubr (&Sset_file_times); - defsubr (&Sfile_selinux_context); - defsubr (&Sfile_acl); - defsubr (&Sset_file_acl); - defsubr (&Sset_file_selinux_context); - defsubr (&Sset_default_file_modes); - defsubr (&Sdefault_file_modes); - defsubr (&Sfile_newer_than_file_p); - defsubr (&Sinsert_file_contents); - defsubr (&Schoose_write_coding_system); - defsubr (&Swrite_region); - defsubr (&Scar_less_than_car); - defsubr (&Sverify_visited_file_modtime); - defsubr (&Svisited_file_modtime); - defsubr (&Sset_visited_file_modtime); - defsubr (&Sdo_auto_save); - defsubr (&Sset_buffer_auto_saved); - defsubr (&Sclear_buffer_auto_save_failure); - defsubr (&Srecent_auto_save_p); - - defsubr (&Snext_read_file_uses_dialog_p); - -#ifdef HAVE_SYNC - defsubr (&Sunix_sync); -#endif } diff --git a/src/filelock.c b/src/filelock.c index f857c48814..3a268148ea 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -840,6 +840,8 @@ t if it is locked by you, else a string saying which user has locked it. */) void syms_of_filelock (void) { +#include "filelock.x" + DEFVAR_LISP ("temporary-file-directory", Vtemporary_file_directory, doc: /* The directory for writing temporary files. */); Vtemporary_file_directory = Qnil; @@ -847,8 +849,4 @@ syms_of_filelock (void) DEFVAR_BOOL ("create-lockfiles", create_lockfiles, doc: /* Non-nil means use lockfiles to avoid editing collisions. */); create_lockfiles = 1; - - defsubr (&Sunlock_buffer); - defsubr (&Slock_buffer); - defsubr (&Sfile_locked_p); } diff --git a/src/floatfns.c b/src/floatfns.c index 75106a661b..ed0c14926d 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -543,32 +543,5 @@ Rounds the value toward zero. */) void syms_of_floatfns (void) { - defsubr (&Sacos); - defsubr (&Sasin); - defsubr (&Satan); - defsubr (&Scos); - defsubr (&Ssin); - defsubr (&Stan); - defsubr (&Sisnan); -#ifdef HAVE_COPYSIGN - defsubr (&Scopysign); -#endif - defsubr (&Sfrexp); - defsubr (&Sldexp); - defsubr (&Sfceiling); - defsubr (&Sffloor); - defsubr (&Sfround); - defsubr (&Sftruncate); - defsubr (&Sexp); - defsubr (&Sexpt); - defsubr (&Slog); - defsubr (&Ssqrt); - - defsubr (&Sabs); - defsubr (&Sfloat); - defsubr (&Slogb); - defsubr (&Sceiling); - defsubr (&Sfloor); - defsubr (&Sround); - defsubr (&Struncate); +#include "floatfns.x" } diff --git a/src/fns.c b/src/fns.c index 6534f0065a..a9b9299c73 100644 --- a/src/fns.c +++ b/src/fns.c @@ -4712,6 +4712,8 @@ If BINARY is non-nil, returns a string in binary form. */) void syms_of_fns (void) { +#include "fns.x" + DEFSYM (Qmd5, "md5"); DEFSYM (Qsha1, "sha1"); DEFSYM (Qsha224, "sha224"); @@ -4735,23 +4737,6 @@ syms_of_fns (void) DEFSYM (Qkey_or_value, "key-or-value"); DEFSYM (Qkey_and_value, "key-and-value"); - defsubr (&Ssxhash); - defsubr (&Smake_hash_table); - defsubr (&Scopy_hash_table); - defsubr (&Shash_table_count); - defsubr (&Shash_table_rehash_size); - defsubr (&Shash_table_rehash_threshold); - defsubr (&Shash_table_size); - defsubr (&Shash_table_test); - defsubr (&Shash_table_weakness); - defsubr (&Shash_table_p); - defsubr (&Sclrhash); - defsubr (&Sgethash); - defsubr (&Sputhash); - defsubr (&Sremhash); - defsubr (&Smaphash); - defsubr (&Sdefine_hash_table_test); - DEFSYM (Qstring_lessp, "string-lessp"); DEFSYM (Qprovide, "provide"); DEFSYM (Qrequire, "require"); @@ -4798,74 +4783,6 @@ that disables the use of a file dialog, regardless of the value of this variable. */); use_file_dialog = 1; - defsubr (&Sidentity); - defsubr (&Srandom); - defsubr (&Slength); - defsubr (&Ssafe_length); - defsubr (&Sstring_bytes); - defsubr (&Sstring_equal); - defsubr (&Scompare_strings); - defsubr (&Sstring_lessp); - defsubr (&Sappend); - defsubr (&Sconcat); - defsubr (&Svconcat); - defsubr (&Scopy_sequence); - defsubr (&Sstring_make_multibyte); - defsubr (&Sstring_make_unibyte); - defsubr (&Sstring_as_multibyte); - defsubr (&Sstring_as_unibyte); - defsubr (&Sstring_to_multibyte); - defsubr (&Sstring_to_unibyte); - defsubr (&Scopy_alist); - defsubr (&Ssubstring); - defsubr (&Ssubstring_no_properties); - defsubr (&Snthcdr); - defsubr (&Snth); - defsubr (&Selt); - defsubr (&Smember); - defsubr (&Smemq); - defsubr (&Smemql); - defsubr (&Sassq); - defsubr (&Sassoc); - defsubr (&Srassq); - defsubr (&Srassoc); - defsubr (&Sdelq); - defsubr (&Sdelete); - defsubr (&Snreverse); - defsubr (&Sreverse); - defsubr (&Ssort); - defsubr (&Splist_get); - defsubr (&Sget); - defsubr (&Splist_put); - defsubr (&Sput); - defsubr (&Slax_plist_get); - defsubr (&Slax_plist_put); - defsubr (&Seql); - defsubr (&Sequal); - defsubr (&Sequal_including_properties); - defsubr (&Sfillarray); - defsubr (&Sclear_string); - defsubr (&Snconc); - defsubr (&Smapcar); - defsubr (&Smapc); - defsubr (&Smapconcat); - defsubr (&Syes_or_no_p); - defsubr (&Sload_average); - defsubr (&Sfeaturep); - defsubr (&Srequire); - defsubr (&Sprovide); - defsubr (&Splist_member); - defsubr (&Swidget_put); - defsubr (&Swidget_get); - defsubr (&Swidget_apply); - defsubr (&Sbase64_encode_region); - defsubr (&Sbase64_decode_region); - defsubr (&Sbase64_encode_string); - defsubr (&Sbase64_decode_string); - defsubr (&Smd5); - defsubr (&Ssecure_hash); - defsubr (&Slocale_info); - hashtest_eq.name = Qeq; hashtest_eq.user_hash_function = Qnil; hashtest_eq.user_cmp_function = Qnil; diff --git a/src/font.c b/src/font.c index 251d43ba8b..e074c14db6 100644 --- a/src/font.c +++ b/src/font.c @@ -5061,6 +5061,8 @@ font_deferred_log (const char *action, Lisp_Object arg, Lisp_Object result) void syms_of_font (void) { +#include "font.x" + sort_shift_bits[FONT_TYPE_INDEX] = 0; sort_shift_bits[FONT_SLANT_INDEX] = 2; sort_shift_bits[FONT_WEIGHT_INDEX] = 9; @@ -5121,41 +5123,6 @@ syms_of_font (void) #endif /* HAVE_LIBOTF */ #endif /* 0 */ - defsubr (&Sfontp); - defsubr (&Sfont_spec); - defsubr (&Sfont_get); -#ifdef HAVE_WINDOW_SYSTEM - defsubr (&Sfont_face_attributes); -#endif - defsubr (&Sfont_put); - defsubr (&Slist_fonts); - defsubr (&Sfont_family_list); - defsubr (&Sfind_font); - defsubr (&Sfont_xlfd_name); - defsubr (&Sclear_font_cache); - defsubr (&Sfont_shape_gstring); - defsubr (&Sfont_variation_glyphs); -#if 0 - defsubr (&Sfont_drive_otf); - defsubr (&Sfont_otf_alternates); -#endif /* 0 */ - -#ifdef FONT_DEBUG - defsubr (&Sopen_font); - defsubr (&Sclose_font); - defsubr (&Squery_font); - defsubr (&Sfont_get_glyphs); - defsubr (&Sfont_match_p); - defsubr (&Sfont_at); -#if 0 - defsubr (&Sdraw_string); -#endif - defsubr (&Sframe_font_cache); -#endif /* FONT_DEBUG */ -#ifdef HAVE_WINDOW_SYSTEM - defsubr (&Sfont_info); -#endif - DEFVAR_LISP ("font-encoding-alist", Vfont_encoding_alist, doc: /* Alist of fontname patterns vs the corresponding encoding and repertory info. diff --git a/src/fontset.c b/src/fontset.c index e34719e5cd..535062b541 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -2141,6 +2141,8 @@ DEFUN ("fontset-list-all", Ffontset_list_all, Sfontset_list_all, 0, 0, 0, void syms_of_fontset (void) { +#include "fontset.x" + DEFSYM (Qfontset, "fontset"); Fput (Qfontset, Qchar_table_extra_slots, make_number (8)); DEFSYM (Qfontset_info, "fontset-info"); @@ -2220,15 +2222,4 @@ at the vertical center of lines. */); DEFVAR_LISP ("otf-script-alist", Votf_script_alist, doc: /* Alist of OpenType script tags vs the corresponding script names. */); Votf_script_alist = Qnil; - - defsubr (&Squery_fontset); - defsubr (&Snew_fontset); - defsubr (&Sset_fontset_font); - defsubr (&Sinternal_char_font); - defsubr (&Sfontset_info); - defsubr (&Sfontset_font); - defsubr (&Sfontset_list); -#ifdef ENABLE_CHECKING - defsubr (&Sfontset_list_all); -#endif } diff --git a/src/frame.c b/src/frame.c index c67a233f09..d0bbc6262e 100644 --- a/src/frame.c +++ b/src/frame.c @@ -4523,6 +4523,8 @@ make_monitor_attribute_list (struct MonitorInfo *monitors, void syms_of_frame (void) { +#include "frame.x" + DEFSYM (Qframep, "framep"); DEFSYM (Qframe_live_p, "frame-live-p"); DEFSYM (Qexplicit_name, "explicit-name"); @@ -4768,64 +4770,4 @@ set this option to a non-nil value in your init file. */); frame_resize_pixelwise = 0; staticpro (&Vframe_list); - - defsubr (&Sframep); - defsubr (&Sframe_live_p); - defsubr (&Swindow_system); - defsubr (&Smake_terminal_frame); - defsubr (&Shandle_switch_frame); - defsubr (&Sselect_frame); - defsubr (&Sselected_frame); - defsubr (&Sframe_list); - defsubr (&Snext_frame); - defsubr (&Sprevious_frame); - defsubr (&Slast_nonminibuf_frame); - defsubr (&Sdelete_frame); - defsubr (&Smouse_position); - defsubr (&Smouse_pixel_position); - defsubr (&Sset_mouse_position); - defsubr (&Sset_mouse_pixel_position); -#if 0 - defsubr (&Sframe_configuration); - defsubr (&Srestore_frame_configuration); -#endif - defsubr (&Smake_frame_visible); - defsubr (&Smake_frame_invisible); - defsubr (&Siconify_frame); - defsubr (&Sframe_visible_p); - defsubr (&Svisible_frame_list); - defsubr (&Sraise_frame); - defsubr (&Slower_frame); - defsubr (&Sx_focus_frame); - defsubr (&Sredirect_frame_focus); - defsubr (&Sframe_focus); - defsubr (&Sframe_parameters); - defsubr (&Sframe_parameter); - defsubr (&Smodify_frame_parameters); - defsubr (&Sframe_char_height); - defsubr (&Sframe_char_width); - defsubr (&Sframe_pixel_height); - defsubr (&Sframe_pixel_width); - defsubr (&Sframe_text_cols); - defsubr (&Sframe_text_lines); - defsubr (&Sframe_total_cols); - defsubr (&Sframe_text_width); - defsubr (&Sframe_text_height); - defsubr (&Sscroll_bar_width); - defsubr (&Sfringe_width); - defsubr (&Sborder_width); - defsubr (&Sright_divider_width); - defsubr (&Sbottom_divider_width); - defsubr (&Stool_bar_pixel_width); - defsubr (&Sset_frame_height); - defsubr (&Sset_frame_width); - defsubr (&Sset_frame_size); - defsubr (&Sset_frame_position); - defsubr (&Sframe_pointer_visible_p); - -#ifdef HAVE_WINDOW_SYSTEM - defsubr (&Sx_get_resource); - defsubr (&Sx_parse_geometry); -#endif - } diff --git a/src/fringe.c b/src/fringe.c index 1272ea0cef..d70bc71c19 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1773,6 +1773,8 @@ Return nil if POS is not visible in WINDOW. */) void syms_of_fringe (void) { +#include "fringe.x" + DEFSYM (Qtruncation, "truncation"); DEFSYM (Qcontinuation, "continuation"); DEFSYM (Qoverlay_arrow, "overlay-arrow"); @@ -1780,11 +1782,6 @@ syms_of_fringe (void) DEFSYM (Qtop_bottom, "top-bottom"); DEFSYM (Qhollow_small, "hollow-small"); - defsubr (&Sdestroy_fringe_bitmap); - defsubr (&Sdefine_fringe_bitmap); - defsubr (&Sfringe_bitmaps_at_pos); - defsubr (&Sset_fringe_bitmap_face); - DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe, doc: /* Non-nil means that newline may flow into the right fringe. This means that display lines which are exactly as wide as the window diff --git a/src/gfilenotify.c b/src/gfilenotify.c index 9882f27d33..aea6c83444 100644 --- a/src/gfilenotify.c +++ b/src/gfilenotify.c @@ -258,13 +258,10 @@ globals_of_gfilenotify (void) void syms_of_gfilenotify (void) { +#include "gfilenotify.x" DEFSYM (Qgfile_add_watch, "gfile-add-watch"); - defsubr (&Sgfile_add_watch); - DEFSYM (Qgfile_rm_watch, "gfile-rm-watch"); - defsubr (&Sgfile_rm_watch); - DEFSYM (Qwatch_mounts, "watch-mounts"); DEFSYM (Qsend_moved, "send-moved"); DEFSYM (Qchanged, "changed"); diff --git a/src/gnutls.c b/src/gnutls.c index d9b417b46e..ef9367c2af 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1182,6 +1182,8 @@ This function may also return `gnutls-e-again', or void syms_of_gnutls (void) { +#include "gnutls.x" + gnutls_global_initialized = 0; DEFSYM (Qgnutls_dll, "gnutls"); @@ -1216,15 +1218,6 @@ syms_of_gnutls (void) Fput (Qgnutls_e_not_ready_for_handshake, Qgnutls_code, make_number (GNUTLS_E_APPLICATION_ERROR_MIN)); - defsubr (&Sgnutls_get_initstage); - defsubr (&Sgnutls_errorp); - defsubr (&Sgnutls_error_fatalp); - defsubr (&Sgnutls_error_string); - defsubr (&Sgnutls_boot); - defsubr (&Sgnutls_deinit); - defsubr (&Sgnutls_bye); - defsubr (&Sgnutls_available_p); - DEFVAR_INT ("gnutls-log-level", global_gnutls_log_level, doc: /* Logging level used by the GnuTLS functions. Set this larger than 0 to get debug output in the *Messages* buffer. diff --git a/src/image.c b/src/image.c index 60caf84b7d..a741815207 100644 --- a/src/image.c +++ b/src/image.c @@ -9347,6 +9347,8 @@ reset_image_types (void) void syms_of_image (void) { +#include "image.x" + /* Initialize this only once; it will be reset before dumping. */ image_types = NULL; @@ -9480,21 +9482,6 @@ non-numeric, there is no explicit limit on the size of images. */); #endif /* HAVE_NTGUI */ #endif /* HAVE_RSVG */ - defsubr (&Sinit_image_library); -#ifdef HAVE_IMAGEMAGICK - defsubr (&Simagemagick_types); -#endif - defsubr (&Sclear_image_cache); - defsubr (&Simage_flush); - defsubr (&Simage_size); - defsubr (&Simage_mask_p); - defsubr (&Simage_metadata); - -#ifdef GLYPH_DEBUG - defsubr (&Simagep); - defsubr (&Slookup_image); -#endif - DEFVAR_BOOL ("cross-disabled-images", cross_disabled_images, doc: /* Non-nil means always draw a cross over disabled images. Disabled images are those having a `:conversion disabled' property. diff --git a/src/indent.c b/src/indent.c index 79af42c5f7..85ec401b04 100644 --- a/src/indent.c +++ b/src/indent.c @@ -2160,14 +2160,9 @@ whether or not it is currently displayed in some window. */) void syms_of_indent (void) { +#include "indent.x" + DEFVAR_BOOL ("indent-tabs-mode", indent_tabs_mode, doc: /* Indentation can insert tabs if this is non-nil. */); indent_tabs_mode = 1; - - defsubr (&Scurrent_indentation); - defsubr (&Sindent_to); - defsubr (&Scurrent_column); - defsubr (&Smove_to_column); - defsubr (&Svertical_motion); - defsubr (&Scompute_motion); } diff --git a/src/inotify.c b/src/inotify.c index c55b1303fc..533ad44c9a 100644 --- a/src/inotify.c +++ b/src/inotify.c @@ -398,6 +398,8 @@ See inotify_rm_watch(2) for more information. void syms_of_inotify (void) { +#include "inotify.x" + DEFSYM (Qaccess, "access"); DEFSYM (Qattrib, "attrib"); DEFSYM (Qclose_write, "close-write"); @@ -426,9 +428,6 @@ syms_of_inotify (void) DEFSYM (Qq_overflow, "q-overflow"); DEFSYM (Qunmount, "unmount"); - defsubr (&Sinotify_add_watch); - defsubr (&Sinotify_rm_watch); - staticpro (&watch_list); Fprovide (intern_c_string ("inotify"), Qnil); diff --git a/src/insdel.c b/src/insdel.c index 10c53e99f9..f515ed41fa 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -2183,6 +2183,8 @@ DEFUN ("combine-after-change-execute", Fcombine_after_change_execute, void syms_of_insdel (void) { +#include "insdel.x" + staticpro (&combine_after_change_list); staticpro (&combine_after_change_buffer); combine_after_change_list = Qnil; @@ -2200,6 +2202,4 @@ as well as hooks attached to text properties and overlays. */); DEFSYM (Qinhibit_modification_hooks, "inhibit-modification-hooks"); DEFSYM (Qregion_extract_function, "region-extract-function"); - - defsubr (&Scombine_after_change_execute); } diff --git a/src/keyboard.c b/src/keyboard.c index 1deca7e5a2..b09c96d3d6 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -10935,6 +10935,8 @@ static const struct event_head head_table[] = { void syms_of_keyboard (void) { +#include "keyboard.x" + pending_funcalls = Qnil; staticpro (&pending_funcalls); @@ -11114,38 +11116,6 @@ syms_of_keyboard (void) help_form_saved_window_configs = Qnil; staticpro (&help_form_saved_window_configs); - defsubr (&Scurrent_idle_time); - defsubr (&Sevent_symbol_parse_modifiers); - defsubr (&Sevent_convert_list); - defsubr (&Sread_key_sequence); - defsubr (&Sread_key_sequence_vector); - defsubr (&Srecursive_edit); - defsubr (&Strack_mouse); - defsubr (&Sinput_pending_p); - defsubr (&Srecent_keys); - defsubr (&Sthis_command_keys); - defsubr (&Sthis_command_keys_vector); - defsubr (&Sthis_single_command_keys); - defsubr (&Sthis_single_command_raw_keys); - defsubr (&Sreset_this_command_lengths); - defsubr (&Sclear_this_command_keys); - defsubr (&Ssuspend_emacs); - defsubr (&Sabort_recursive_edit); - defsubr (&Sexit_recursive_edit); - defsubr (&Srecursion_depth); - defsubr (&Scommand_error_default_function); - defsubr (&Stop_level); - defsubr (&Sdiscard_input); - defsubr (&Sopen_dribble_file); - defsubr (&Sset_input_interrupt_mode); - defsubr (&Sset_output_flow_control); - defsubr (&Sset_input_meta_mode); - defsubr (&Sset_quit_char); - defsubr (&Sset_input_mode); - defsubr (&Scurrent_input_mode); - defsubr (&Sposn_at_point); - defsubr (&Sposn_at_x_y); - DEFVAR_LISP ("last-command-event", last_command_event, doc: /* Last input event that was part of a command. */); diff --git a/src/keymap.c b/src/keymap.c index 739af68224..85a272bed0 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -3680,6 +3680,8 @@ Return list of symbols found. */) void syms_of_keymap (void) { +#include "keymap.x" + DEFSYM (Qkeymap, "keymap"); staticpro (&apropos_predicate); staticpro (&apropos_accumulate); @@ -3795,38 +3797,6 @@ be preferred. */); where_is_cache = Qnil; staticpro (&where_is_cache); staticpro (&where_is_cache_keymaps); - - defsubr (&Skeymapp); - defsubr (&Skeymap_parent); - defsubr (&Skeymap_prompt); - defsubr (&Sset_keymap_parent); - defsubr (&Smake_keymap); - defsubr (&Smake_sparse_keymap); - defsubr (&Smap_keymap_internal); - defsubr (&Smap_keymap); - defsubr (&Scopy_keymap); - defsubr (&Scommand_remapping); - defsubr (&Skey_binding); - defsubr (&Slocal_key_binding); - defsubr (&Sglobal_key_binding); - defsubr (&Sminor_mode_key_binding); - defsubr (&Sdefine_key); - defsubr (&Slookup_key); - defsubr (&Sdefine_prefix_command); - defsubr (&Suse_global_map); - defsubr (&Suse_local_map); - defsubr (&Scurrent_local_map); - defsubr (&Scurrent_global_map); - defsubr (&Scurrent_minor_mode_maps); - defsubr (&Scurrent_active_maps); - defsubr (&Saccessible_keymaps); - defsubr (&Skey_description); - defsubr (&Sdescribe_vector); - defsubr (&Ssingle_key_description); - defsubr (&Stext_char_description); - defsubr (&Swhere_is_internal); - defsubr (&Sdescribe_buffer_bindings); - defsubr (&Sapropos_internal); } void diff --git a/src/lread.c b/src/lread.c index 71ef776d47..e1bde2e324 100644 --- a/src/lread.c +++ b/src/lread.c @@ -4454,21 +4454,7 @@ dir_warning (char const *use, Lisp_Object dirname) void syms_of_lread (void) { - defsubr (&Sread); - defsubr (&Sread_from_string); - defsubr (&Sintern); - defsubr (&Sintern_soft); - defsubr (&Sunintern); - defsubr (&Sget_load_suffixes); - defsubr (&Sload); - defsubr (&Seval_buffer); - defsubr (&Seval_region); - defsubr (&Sread_char); - defsubr (&Sread_char_exclusive); - defsubr (&Sread_event); - defsubr (&Sget_file_char); - defsubr (&Smapatoms); - defsubr (&Slocate_file_internal); +#include "lread.x" DEFVAR_LISP ("obarray", Vobarray, doc: /* Symbol table for use by `intern' and `read'. diff --git a/src/macros.c b/src/macros.c index acba125edc..768cb54a34 100644 --- a/src/macros.c +++ b/src/macros.c @@ -366,6 +366,8 @@ init_macros (void) void syms_of_macros (void) { +#include "macros.x" + DEFSYM (Qexecute_kbd_macro, "execute-kbd-macro"); DEFVAR_LISP ("kbd-macro-termination-hook", Vkbd_macro_termination_hook, @@ -374,13 +376,6 @@ This is run whether the macro ends normally or prematurely due to an error. */) Vkbd_macro_termination_hook = Qnil; DEFSYM (Qkbd_macro_termination_hook, "kbd-macro-termination-hook"); - defsubr (&Sstart_kbd_macro); - defsubr (&Send_kbd_macro); - defsubr (&Scall_last_kbd_macro); - defsubr (&Sexecute_kbd_macro); - defsubr (&Scancel_kbd_macro_events); - defsubr (&Sstore_kbd_macro_event); - DEFVAR_KBOARD ("defining-kbd-macro", defining_kbd_macro, doc: /* Non-nil while a keyboard macro is being defined. Don't set this! The value is the symbol `append' while appending to the definition of diff --git a/src/marker.c b/src/marker.c index 91fcea5f25..0b1df6d956 100644 --- a/src/marker.c +++ b/src/marker.c @@ -771,11 +771,5 @@ verify_bytepos (ptrdiff_t charpos) void syms_of_marker (void) { - defsubr (&Smarker_position); - defsubr (&Smarker_buffer); - defsubr (&Sset_marker); - defsubr (&Scopy_marker); - defsubr (&Smarker_insertion_type); - defsubr (&Sset_marker_insertion_type); - defsubr (&Sbuffer_has_markers_at); +#include "marker.x" } diff --git a/src/menu.c b/src/menu.c index a523cfc601..31f02f1ffc 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1560,11 +1560,9 @@ for instance using the window manager, then this produces a quit and void syms_of_menu (void) { +#include "menu.x" + staticpro (&menu_items); menu_items = Qnil; menu_items_inuse = Qnil; - - defsubr (&Sx_popup_menu); - defsubr (&Sx_popup_dialog); - defsubr (&Smenu_bar_menu_at_x_y); } diff --git a/src/minibuf.c b/src/minibuf.c index 6f7a103092..4db3398cf3 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1904,6 +1904,8 @@ init_minibuf_once (void) void syms_of_minibuf (void) { +#include "minibuf.x" + minibuf_level = 0; minibuf_prompt = Qnil; staticpro (&minibuf_prompt); @@ -2078,28 +2080,4 @@ properties. */); /* We use `intern' here instead of Qread_only to avoid initialization-order problems. */ Vminibuffer_prompt_properties = list2 (intern_c_string ("read-only"), Qt); - - defsubr (&Sactive_minibuffer_window); - defsubr (&Sset_minibuffer_window); - defsubr (&Sread_from_minibuffer); - defsubr (&Sread_string); - defsubr (&Sread_command); - defsubr (&Sread_variable); - defsubr (&Sinternal_complete_buffer); - defsubr (&Sread_buffer); - defsubr (&Sread_no_blanks_input); - defsubr (&Sminibuffer_depth); - defsubr (&Sminibuffer_prompt); - - defsubr (&Sminibufferp); - defsubr (&Sminibuffer_prompt_end); - defsubr (&Sminibuffer_contents); - defsubr (&Sminibuffer_contents_no_properties); - defsubr (&Sminibuffer_completion_contents); - - defsubr (&Stry_completion); - defsubr (&Sall_completions); - defsubr (&Stest_completion); - defsubr (&Sassoc_string); - defsubr (&Scompleting_read); } diff --git a/src/msdos.c b/src/msdos.c index ccca371583..c1b5a4bfd9 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -4283,6 +4283,8 @@ msdos_fatal_signal (int sig) void syms_of_msdos (void) { +#include "msdos.x" + recent_doskeys = Fmake_vector (make_number (NUM_RECENT_DOSKEYS), Qnil); staticpro (&recent_doskeys); @@ -4297,12 +4299,6 @@ This variable is used only by MS-DOS terminals. */); Vdos_unsupported_char_glyph = make_number ('\177'); #endif - - defsubr (&Srecent_doskeys); - defsubr (&Smsdos_long_file_names); - defsubr (&Smsdos_downcase_filename); - defsubr (&Smsdos_remember_default_colors); - defsubr (&Smsdos_set_mouse_buttons); } #endif /* MSDOS */ diff --git a/src/nsfns.m b/src/nsfns.m index 5f9588aea6..20006b81e6 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -2922,6 +2922,8 @@ handlePanelKeys (NSSavePanel *panel, NSEvent *theEvent) void syms_of_nsfns (void) { +#include "nsfns.x" + Qfontsize = intern_c_string ("fontsize"); staticpro (&Qfontsize); @@ -2950,49 +2952,6 @@ be used as the image of the icon representing the frame. */); doc: /* Toolkit version for NS Windowing. */); Vns_version_string = ns_appkit_version_str (); - defsubr (&Sns_read_file_name); - defsubr (&Sns_get_resource); - defsubr (&Sns_set_resource); - defsubr (&Sxw_display_color_p); /* this and next called directly by C code */ - defsubr (&Sx_display_grayscale_p); - defsubr (&Sns_font_name); - defsubr (&Sns_list_colors); -#ifdef NS_IMPL_COCOA - defsubr (&Sns_do_applescript); -#endif - defsubr (&Sxw_color_defined_p); - defsubr (&Sxw_color_values); - defsubr (&Sx_server_max_request_size); - defsubr (&Sx_server_vendor); - defsubr (&Sx_server_version); - defsubr (&Sx_display_pixel_width); - defsubr (&Sx_display_pixel_height); - defsubr (&Sns_display_monitor_attributes_list); - defsubr (&Sx_display_mm_width); - defsubr (&Sx_display_mm_height); - defsubr (&Sx_display_screens); - defsubr (&Sx_display_planes); - defsubr (&Sx_display_color_cells); - defsubr (&Sx_display_visual_class); - defsubr (&Sx_display_backing_store); - defsubr (&Sx_display_save_under); - defsubr (&Sx_create_frame); - defsubr (&Sx_open_connection); - defsubr (&Sx_close_connection); - defsubr (&Sx_display_list); - - defsubr (&Sns_hide_others); - defsubr (&Sns_hide_emacs); - defsubr (&Sns_emacs_info_panel); - defsubr (&Sns_list_services); - defsubr (&Sns_perform_service); - defsubr (&Sns_convert_utf8_nfd_to_nfc); - defsubr (&Sns_popup_font_panel); - defsubr (&Sns_popup_color_panel); - - defsubr (&Sx_show_tip); - defsubr (&Sx_hide_tip); - as_status = 0; as_script = Qnil; as_result = 0; diff --git a/src/nsmenu.m b/src/nsmenu.m index b6eb21dcb7..8b8362b790 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1875,13 +1875,13 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_ void syms_of_nsmenu (void) { +#include "nsmenu.x" + #ifndef NS_IMPL_COCOA /* Don't know how to keep track of this in Next/Open/GNUstep. Always update menus there. */ trackingMenu = 1; #endif - defsubr (&Sns_reset_menu); - defsubr (&Smenu_or_popup_active_p); Qdebug_on_next_call = intern_c_string ("debug-on-next-call"); staticpro (&Qdebug_on_next_call); diff --git a/src/nsselect.m b/src/nsselect.m index 038849c0ae..342199df2f 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -541,19 +541,13 @@ nxatoms_of_nsselect (void) void syms_of_nsselect (void) { +#include "nsselect.x" + QCLIPBOARD = intern_c_string ("CLIPBOARD"); staticpro (&QCLIPBOARD); QSECONDARY = intern_c_string ("SECONDARY"); staticpro (&QSECONDARY); QTEXT = intern_c_string ("TEXT"); staticpro (&QTEXT); QFILE_NAME = intern_c_string ("FILE_NAME"); staticpro (&QFILE_NAME); - defsubr (&Sx_disown_selection_internal); - defsubr (&Sx_get_selection_internal); - defsubr (&Sx_own_selection_internal); - defsubr (&Sx_selection_exists_p); - defsubr (&Sx_selection_owner_p); - defsubr (&Sns_get_selection_internal); - defsubr (&Sns_store_selection_internal); - Vselection_alist = Qnil; staticpro (&Vselection_alist); diff --git a/src/print.c b/src/print.c index 885394c1b6..5ff3b5bab6 100644 --- a/src/print.c +++ b/src/print.c @@ -2196,6 +2196,8 @@ init_print_once (void) void syms_of_print (void) { +#include "print.x" + DEFSYM (Qtemp_buffer_setup_hook, "temp-buffer-setup-hook"); DEFVAR_LISP ("standard-output", Vstandard_output, @@ -2317,17 +2319,6 @@ priorities. */); /* prin1_to_string_buffer initialized in init_buffer_once in buffer.c */ staticpro (&Vprin1_to_string_buffer); - defsubr (&Sprin1); - defsubr (&Sprin1_to_string); - defsubr (&Serror_message_string); - defsubr (&Sprinc); - defsubr (&Sprint); - defsubr (&Sterpri); - defsubr (&Swrite_char); -#ifdef WITH_REDIRECT_DEBUGGING_OUTPUT - defsubr (&Sredirect_debugging_output); -#endif - DEFSYM (Qprint_escape_newlines, "print-escape-newlines"); DEFSYM (Qprint_escape_multibyte, "print-escape-multibyte"); DEFSYM (Qprint_escape_nonascii, "print-escape-nonascii"); diff --git a/src/process.c b/src/process.c index 3242222a94..82d1773a19 100644 --- a/src/process.c +++ b/src/process.c @@ -7188,6 +7188,8 @@ init_process_emacs (void) void syms_of_process (void) { +#include "process.x" + #ifdef subprocesses DEFSYM (Qprocessp, "processp"); @@ -7322,67 +7324,5 @@ non-nil value means that the delay is not reset on write. The variable takes effect when `start-process' is called. */); Vprocess_adaptive_read_buffering = Qt; #endif - - defsubr (&Sprocessp); - defsubr (&Sget_process); - defsubr (&Sdelete_process); - defsubr (&Sprocess_status); - defsubr (&Sprocess_exit_status); - defsubr (&Sprocess_id); - defsubr (&Sprocess_name); - defsubr (&Sprocess_tty_name); - defsubr (&Sprocess_command); - defsubr (&Sset_process_buffer); - defsubr (&Sprocess_buffer); - defsubr (&Sprocess_mark); - defsubr (&Sset_process_filter); - defsubr (&Sprocess_filter); - defsubr (&Sset_process_sentinel); - defsubr (&Sprocess_sentinel); - defsubr (&Sset_process_window_size); - defsubr (&Sset_process_inherit_coding_system_flag); - defsubr (&Sset_process_query_on_exit_flag); - defsubr (&Sprocess_query_on_exit_flag); - defsubr (&Sprocess_contact); - defsubr (&Sprocess_plist); - defsubr (&Sset_process_plist); - defsubr (&Sprocess_list); - defsubr (&Sstart_process); - defsubr (&Sserial_process_configure); - defsubr (&Smake_serial_process); - defsubr (&Sset_network_process_option); - defsubr (&Smake_network_process); - defsubr (&Sformat_network_address); - defsubr (&Snetwork_interface_list); - defsubr (&Snetwork_interface_info); -#ifdef DATAGRAM_SOCKETS - defsubr (&Sprocess_datagram_address); - defsubr (&Sset_process_datagram_address); -#endif - defsubr (&Saccept_process_output); - defsubr (&Sprocess_send_region); - defsubr (&Sprocess_send_string); - defsubr (&Sinterrupt_process); - defsubr (&Skill_process); - defsubr (&Squit_process); - defsubr (&Sstop_process); - defsubr (&Scontinue_process); - defsubr (&Sprocess_running_child_p); - defsubr (&Sprocess_send_eof); - defsubr (&Ssignal_process); - defsubr (&Swaiting_for_user_input_p); - defsubr (&Sprocess_type); - defsubr (&Sinternal_default_process_sentinel); - defsubr (&Sinternal_default_process_filter); - defsubr (&Sset_process_coding_system); - defsubr (&Sprocess_coding_system); - defsubr (&Sset_process_filter_multibyte); - defsubr (&Sprocess_filter_multibyte_p); - #endif /* subprocesses */ - - defsubr (&Sget_buffer_process); - defsubr (&Sprocess_inherit_coding_system_flag); - defsubr (&Slist_system_processes); - defsubr (&Sprocess_attributes); } diff --git a/src/profiler.c b/src/profiler.c index c42349a94d..f1b62450d9 100644 --- a/src/profiler.c +++ b/src/profiler.c @@ -559,6 +559,8 @@ hashfn_profiler (struct hash_table_test *ht, Lisp_Object bt) void syms_of_profiler (void) { +#include "profiler.x" + DEFVAR_INT ("profiler-max-stack-depth", profiler_max_stack_depth, doc: /* Number of elements from the call-stack recorded in the log. */); profiler_max_stack_depth = 16; @@ -577,22 +579,12 @@ to make room for new entries. */); hashtest_profiler.cmpfn = cmpfn_profiler; hashtest_profiler.hashfn = hashfn_profiler; - defsubr (&Sfunction_equal); - #ifdef PROFILER_CPU_SUPPORT profiler_cpu_running = NOT_RUNNING; cpu_log = Qnil; staticpro (&cpu_log); - defsubr (&Sprofiler_cpu_start); - defsubr (&Sprofiler_cpu_stop); - defsubr (&Sprofiler_cpu_running_p); - defsubr (&Sprofiler_cpu_log); #endif profiler_memory_running = false; memory_log = Qnil; staticpro (&memory_log); - defsubr (&Sprofiler_memory_start); - defsubr (&Sprofiler_memory_stop); - defsubr (&Sprofiler_memory_running_p); - defsubr (&Sprofiler_memory_log); } diff --git a/src/search.c b/src/search.c index 55afb849e8..3abb49cf14 100644 --- a/src/search.c +++ b/src/search.c @@ -3283,6 +3283,8 @@ the buffer. If the buffer doesn't have a cache, the value is nil. */) void syms_of_search (void) { +#include "search.x" + register int i; for (i = 0; i < REGEXP_CACHE_SIZE; ++i) @@ -3334,22 +3336,4 @@ such as `looking-at', `string-match', `re-search-forward', etc., do not set the match data. The proper way to use this variable is to bind it with `let' around a small expression. */); Vinhibit_changing_match_data = Qnil; - - defsubr (&Slooking_at); - defsubr (&Sposix_looking_at); - defsubr (&Sstring_match); - defsubr (&Sposix_string_match); - defsubr (&Ssearch_forward); - defsubr (&Ssearch_backward); - defsubr (&Sre_search_forward); - defsubr (&Sre_search_backward); - defsubr (&Sposix_search_forward); - defsubr (&Sposix_search_backward); - defsubr (&Sreplace_match); - defsubr (&Smatch_beginning); - defsubr (&Smatch_end); - defsubr (&Smatch_data); - defsubr (&Sset_match_data); - defsubr (&Sregexp_quote); - defsubr (&Snewline_cache_check); } diff --git a/src/sound.c b/src/sound.c index 7046f4e8e3..ee43a92ccb 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1423,12 +1423,12 @@ Internal use only, use `play-sound' instead. */) void syms_of_sound (void) { +#include "sound.x" + DEFSYM (QCdevice, ":device"); DEFSYM (QCvolume, ":volume"); DEFSYM (Qsound, "sound"); DEFSYM (Qplay_sound_functions, "play-sound-functions"); - - defsubr (&Splay_sound_internal); } #endif /* HAVE_SOUND */ diff --git a/src/syntax.c b/src/syntax.c index f2451332b1..6ce3551687 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -3569,6 +3569,8 @@ init_syntax_once (void) void syms_of_syntax (void) { +#include "syntax.x" + DEFSYM (Qsyntax_table_p, "syntax-table-p"); staticpro (&Vsyntax_code_object); @@ -3627,28 +3629,4 @@ character of that word. In both cases, LIMIT bounds the search. */); Vfind_word_boundary_function_table = Fmake_char_table (Qnil, Qnil); - - defsubr (&Ssyntax_table_p); - defsubr (&Ssyntax_table); - defsubr (&Sstandard_syntax_table); - defsubr (&Scopy_syntax_table); - defsubr (&Sset_syntax_table); - defsubr (&Schar_syntax); - defsubr (&Smatching_paren); - defsubr (&Sstring_to_syntax); - defsubr (&Smodify_syntax_entry); - defsubr (&Sinternal_describe_syntax_value); - - defsubr (&Sforward_word); - - defsubr (&Sskip_chars_forward); - defsubr (&Sskip_chars_backward); - defsubr (&Sskip_syntax_forward); - defsubr (&Sskip_syntax_backward); - - defsubr (&Sforward_comment); - defsubr (&Sscan_lists); - defsubr (&Sscan_sexps); - defsubr (&Sbackward_prefix_chars); - defsubr (&Sparse_partial_sexp); } diff --git a/src/term.c b/src/term.c index 500c1f2f7d..f374e2b398 100644 --- a/src/term.c +++ b/src/term.c @@ -4541,6 +4541,8 @@ delete_tty (struct terminal *terminal) void syms_of_term (void) { +#include "term.x" + DEFVAR_BOOL ("system-uses-terminfo", system_uses_terminfo, doc: /* Non-nil means the system uses terminfo rather than termcap. This variable can be used by terminal emulator packages. */); @@ -4570,19 +4572,6 @@ What means \"very visible\" is up to your terminal. It may make the cursor bigger, or it may make it blink, or it may do nothing at all. */); visible_cursor = 1; - defsubr (&Stty_display_color_p); - defsubr (&Stty_display_color_cells); - defsubr (&Stty_no_underline); - defsubr (&Stty_type); - defsubr (&Scontrolling_tty_p); - defsubr (&Stty_top_frame); - defsubr (&Ssuspend_tty); - defsubr (&Sresume_tty); -#ifdef HAVE_GPM - defsubr (&Sgpm_mouse_start); - defsubr (&Sgpm_mouse_stop); -#endif /* HAVE_GPM */ - #ifndef DOS_NT default_orig_pair = NULL; default_set_foreground = NULL; diff --git a/src/terminal.c b/src/terminal.c index 23455262cb..682d28e212 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -545,6 +545,7 @@ delete_initial_terminal (struct terminal *terminal) void syms_of_terminal (void) { +#include "terminal.x" DEFVAR_LISP ("ring-bell-function", Vring_bell_function, doc: /* Non-nil means call this function to ring the bell. @@ -562,14 +563,5 @@ or some time later. */); DEFSYM (Qdelete_terminal_functions, "delete-terminal-functions"); DEFSYM (Qrun_hook_with_args, "run-hook-with-args"); - defsubr (&Sdelete_terminal); - defsubr (&Sframe_terminal); - defsubr (&Sterminal_live_p); - defsubr (&Sterminal_list); - defsubr (&Sterminal_name); - defsubr (&Sterminal_parameters); - defsubr (&Sterminal_parameter); - defsubr (&Sset_terminal_parameter); - Fprovide (intern_c_string ("multi-tty"), Qnil); } diff --git a/src/textprop.c b/src/textprop.c index bd09304ba3..0334a980c5 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -2332,6 +2332,8 @@ report_interval_modification (Lisp_Object start, Lisp_Object end) void syms_of_textprop (void) { +#include "textprop.x" + DEFVAR_LISP ("default-text-properties", Vdefault_text_properties, doc: /* Property-list used as default values. The value of a property in this list is seen as the value for every @@ -2397,25 +2399,4 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and DEFSYM (Qmouse_entered, "mouse-entered"); DEFSYM (Qpoint_left, "point-left"); DEFSYM (Qpoint_entered, "point-entered"); - - defsubr (&Stext_properties_at); - defsubr (&Sget_text_property); - defsubr (&Sget_char_property); - defsubr (&Sget_char_property_and_overlay); - defsubr (&Snext_char_property_change); - defsubr (&Sprevious_char_property_change); - defsubr (&Snext_single_char_property_change); - defsubr (&Sprevious_single_char_property_change); - defsubr (&Snext_property_change); - defsubr (&Snext_single_property_change); - defsubr (&Sprevious_property_change); - defsubr (&Sprevious_single_property_change); - defsubr (&Sadd_text_properties); - defsubr (&Sput_text_property); - defsubr (&Sset_text_properties); - defsubr (&Sadd_face_text_property); - defsubr (&Sremove_text_properties); - defsubr (&Sremove_list_of_text_properties); - defsubr (&Stext_property_any); - defsubr (&Stext_property_not_all); } diff --git a/src/undo.c b/src/undo.c index b81f1aed27..6af5b4deac 100644 --- a/src/undo.c +++ b/src/undo.c @@ -458,6 +458,8 @@ truncate_undo_list (struct buffer *b) void syms_of_undo (void) { +#include "undo.x" + DEFSYM (Qinhibit_read_only, "inhibit-read-only"); DEFSYM (Qapply, "apply"); @@ -467,8 +469,6 @@ syms_of_undo (void) last_undo_buffer = NULL; last_boundary_buffer = NULL; - defsubr (&Sundo_boundary); - DEFVAR_INT ("undo-limit", undo_limit, doc: /* Keep no more undo information once it exceeds this size. This limit is applied when garbage collection happens. diff --git a/src/w16select.c b/src/w16select.c index 1e4d35b721..7656fc7038 100644 --- a/src/w16select.c +++ b/src/w16select.c @@ -675,9 +675,7 @@ frame's display, or the first available X display. */) void syms_of_win16select (void) { - defsubr (&Sw16_set_clipboard_data); - defsubr (&Sw16_get_clipboard_data); - defsubr (&Sx_selection_exists_p); +#include "w16select.x" DEFVAR_LISP ("selection-coding-system", Vselection_coding_system, doc: /* Coding system for communicating with other programs. diff --git a/src/w32console.c b/src/w32console.c index 2fbc190ee2..5ded188f00 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -814,6 +814,8 @@ DEFUN ("set-cursor-size", Fset_cursor_size, Sset_cursor_size, 1, 1, 0, void syms_of_ntterm (void) { +#include "w32console.x" + DEFVAR_BOOL ("w32-use-full-screen-buffer", w32_use_full_screen_buffer, doc: /* Non-nil means make terminal frames use the full screen buffer dimensions. @@ -822,8 +824,4 @@ A value of nil means use the current console window dimensions; this may be preferable when working directly at the console with a large scroll-back buffer. */); w32_use_full_screen_buffer = 0; - - defsubr (&Sset_screen_color); - defsubr (&Sget_screen_color); - defsubr (&Sset_cursor_size); } diff --git a/src/w32fns.c b/src/w32fns.c index e24148af4f..0c9657ad91 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -8085,6 +8085,8 @@ frame_parm_handler w32_frame_parm_handlers[] = void syms_of_w32fns (void) { +#include "w32fns.x" + globals_of_w32fns (); track_mouse_window = NULL; @@ -8365,61 +8367,8 @@ Set this to nil to get the old behavior for repainting; this should only be necessary if the default setting causes problems. */); w32_strict_painting = 1; -#if 0 /* TODO: Port to W32 */ - defsubr (&Sx_change_window_property); - defsubr (&Sx_delete_window_property); - defsubr (&Sx_window_property); -#endif - defsubr (&Sxw_display_color_p); - defsubr (&Sx_display_grayscale_p); - defsubr (&Sxw_color_defined_p); - defsubr (&Sxw_color_values); - defsubr (&Sx_server_max_request_size); - defsubr (&Sx_server_vendor); - defsubr (&Sx_server_version); - defsubr (&Sx_display_pixel_width); - defsubr (&Sx_display_pixel_height); - defsubr (&Sx_display_mm_width); - defsubr (&Sx_display_mm_height); - defsubr (&Sx_display_screens); - defsubr (&Sx_display_planes); - defsubr (&Sx_display_color_cells); - defsubr (&Sx_display_visual_class); - defsubr (&Sx_display_backing_store); - defsubr (&Sx_display_save_under); - defsubr (&Sx_create_frame); - defsubr (&Sx_open_connection); - defsubr (&Sx_close_connection); - defsubr (&Sx_display_list); - defsubr (&Sx_synchronize); - - /* W32 specific functions */ - - defsubr (&Sw32_define_rgb_color); - defsubr (&Sw32_default_color_map); - defsubr (&Sw32_display_monitor_attributes_list); - defsubr (&Sw32_send_sys_command); - defsubr (&Sw32_shell_execute); - defsubr (&Sw32_register_hot_key); - defsubr (&Sw32_unregister_hot_key); - defsubr (&Sw32_registered_hot_keys); - defsubr (&Sw32_reconstruct_hot_key); - defsubr (&Sw32_toggle_lock_key); - defsubr (&Sw32_window_exists_p); - defsubr (&Sw32_frame_rect); - defsubr (&Sw32_battery_status); - -#ifdef WINDOWSNT - defsubr (&Sfile_system_info); - defsubr (&Sdefault_printer_name); -#endif - - defsubr (&Sset_message_beep); - hourglass_hwnd = NULL; - defsubr (&Sx_show_tip); - defsubr (&Sx_hide_tip); tip_timer = Qnil; staticpro (&tip_timer); tip_frame = Qnil; @@ -8427,11 +8376,6 @@ only be necessary if the default setting causes problems. */); last_show_tip_args = Qnil; staticpro (&last_show_tip_args); - - defsubr (&Sx_file_dialog); -#ifdef WINDOWSNT - defsubr (&Ssystem_move_file_to_trash); -#endif } diff --git a/src/w32font.c b/src/w32font.c index 5262f38663..66d6fe2d05 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -2577,6 +2577,8 @@ struct font_driver w32font_driver = void syms_of_w32font (void) { +#include "w32font.x" + DEFSYM (Qgdi, "gdi"); DEFSYM (Quniscribe, "uniscribe"); DEFSYM (QCformat, ":format"); @@ -2722,8 +2724,6 @@ versions of Windows) characters. */); DEFSYM (Qw32_charset_thai, "w32-charset-thai"); DEFSYM (Qw32_charset_mac, "w32-charset-mac"); - defsubr (&Sx_select_font); - w32font_driver.type = Qgdi; register_font_driver (&w32font_driver, NULL); } diff --git a/src/w32menu.c b/src/w32menu.c index 6276c840fc..65bd8e05c9 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1570,14 +1570,14 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_ void syms_of_w32menu (void) { +#include "w32menu.x" + globals_of_w32menu (); current_popup_menu = NULL; DEFSYM (Qdebug_on_next_call, "debug-on-next-call"); DEFSYM (Qunsupported__w32_dialog, "unsupported--w32-dialog"); - - defsubr (&Smenu_or_popup_active_p); } /* diff --git a/src/w32notify.c b/src/w32notify.c index 86412b8a97..8491a6f800 100644 --- a/src/w32notify.c +++ b/src/w32notify.c @@ -639,6 +639,8 @@ globals_of_w32notify (void) void syms_of_w32notify (void) { +#include "w32notify.x" + DEFSYM (Qfile_name, "file-name"); DEFSYM (Qdirectory_name, "directory-name"); DEFSYM (Qattributes, "attributes"); @@ -649,9 +651,6 @@ syms_of_w32notify (void) DEFSYM (Qsecurity_desc, "security-desc"); DEFSYM (Qsubtree, "subtree"); - defsubr (&Sw32notify_add_watch); - defsubr (&Sw32notify_rm_watch); - staticpro (&watch_list); Fprovide (intern_c_string ("w32notify"), Qnil); diff --git a/src/w32proc.c b/src/w32proc.c index 426a656f56..13fa24e745 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -3148,32 +3148,11 @@ If successful, the new layout id is returned, otherwise nil. */) void syms_of_ntproc (void) { +#include "w32proc.x" + DEFSYM (Qhigh, "high"); DEFSYM (Qlow, "low"); - defsubr (&Sw32_has_winsock); - defsubr (&Sw32_unload_winsock); - - defsubr (&Sw32_short_file_name); - defsubr (&Sw32_long_file_name); - defsubr (&Sw32_set_process_priority); - defsubr (&Sw32_get_locale_info); - defsubr (&Sw32_get_current_locale_id); - defsubr (&Sw32_get_default_locale_id); - defsubr (&Sw32_get_valid_locale_ids); - defsubr (&Sw32_set_current_locale); - - defsubr (&Sw32_get_console_codepage); - defsubr (&Sw32_set_console_codepage); - defsubr (&Sw32_get_console_output_codepage); - defsubr (&Sw32_set_console_output_codepage); - defsubr (&Sw32_get_valid_codepages); - defsubr (&Sw32_get_codepage_charset); - - defsubr (&Sw32_get_valid_keyboard_layouts); - defsubr (&Sw32_get_keyboard_layout); - defsubr (&Sw32_set_keyboard_layout); - DEFVAR_LISP ("w32-quote-process-args", Vw32_quote_process_args, doc: /* Non-nil enables quoting of process arguments to ensure correct parsing. Because Windows does not directly pass argv arrays to child processes, diff --git a/src/w32select.c b/src/w32select.c index 2ae25858bd..ae484fe687 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -1065,9 +1065,7 @@ frame's display, or the first available X display. */) void syms_of_w32select (void) { - defsubr (&Sw32_set_clipboard_data); - defsubr (&Sw32_get_clipboard_data); - defsubr (&Sx_selection_exists_p); +#include "w32select.x" DEFVAR_LISP ("selection-coding-system", Vselection_coding_system, doc: /* Coding system for communicating with other programs. diff --git a/src/window.c b/src/window.c index 8a608433ed..259ffcd17c 100644 --- a/src/window.c +++ b/src/window.c @@ -7128,6 +7128,8 @@ init_window (void) void syms_of_window (void) { +#include "window.x" + DEFSYM (Qscroll_up, "scroll-up"); DEFSYM (Qscroll_down, "scroll-down"); DEFSYM (Qscroll_command, "scroll-command"); @@ -7316,119 +7318,6 @@ Note that when a frame's pixel size is not a multiple of the frame's character size, at least one window may get resized pixelwise even if this option is nil. */); window_resize_pixelwise = 0; - - defsubr (&Sselected_window); - defsubr (&Sminibuffer_window); - defsubr (&Swindow_minibuffer_p); - defsubr (&Swindowp); - defsubr (&Swindow_valid_p); - defsubr (&Swindow_live_p); - defsubr (&Swindow_frame); - defsubr (&Sframe_root_window); - defsubr (&Sframe_first_window); - defsubr (&Sframe_selected_window); - defsubr (&Sset_frame_selected_window); - defsubr (&Spos_visible_in_window_p); - defsubr (&Swindow_line_height); - defsubr (&Swindow_buffer); - defsubr (&Swindow_parent); - defsubr (&Swindow_top_child); - defsubr (&Swindow_left_child); - defsubr (&Swindow_next_sibling); - defsubr (&Swindow_prev_sibling); - defsubr (&Swindow_combination_limit); - defsubr (&Sset_window_combination_limit); - defsubr (&Swindow_use_time); - defsubr (&Swindow_pixel_width); - defsubr (&Swindow_pixel_height); - defsubr (&Swindow_total_width); - defsubr (&Swindow_total_height); - defsubr (&Swindow_normal_size); - defsubr (&Swindow_new_pixel); - defsubr (&Swindow_new_total); - defsubr (&Swindow_new_normal); - defsubr (&Swindow_pixel_left); - defsubr (&Swindow_pixel_top); - defsubr (&Swindow_left_column); - defsubr (&Swindow_top_line); - defsubr (&Sset_window_new_pixel); - defsubr (&Sset_window_new_total); - defsubr (&Sset_window_new_normal); - defsubr (&Swindow_resize_apply); - defsubr (&Swindow_resize_apply_total); - defsubr (&Swindow_body_height); - defsubr (&Swindow_body_width); - defsubr (&Swindow_hscroll); - defsubr (&Sset_window_hscroll); - defsubr (&Swindow_redisplay_end_trigger); - defsubr (&Sset_window_redisplay_end_trigger); - defsubr (&Swindow_edges); - defsubr (&Swindow_pixel_edges); - defsubr (&Swindow_absolute_pixel_edges); - defsubr (&Swindow_mode_line_height); - defsubr (&Swindow_header_line_height); - defsubr (&Swindow_right_divider_width); - defsubr (&Swindow_bottom_divider_width); - defsubr (&Swindow_scroll_bar_width); - defsubr (&Swindow_inside_edges); - defsubr (&Swindow_inside_pixel_edges); - defsubr (&Swindow_inside_absolute_pixel_edges); - defsubr (&Scoordinates_in_window_p); - defsubr (&Swindow_at); - defsubr (&Swindow_point); - defsubr (&Swindow_start); - defsubr (&Swindow_end); - defsubr (&Sset_window_point); - defsubr (&Sset_window_start); - defsubr (&Swindow_dedicated_p); - defsubr (&Sset_window_dedicated_p); - defsubr (&Swindow_display_table); - defsubr (&Sset_window_display_table); - defsubr (&Snext_window); - defsubr (&Sprevious_window); - defsubr (&Sget_buffer_window); - defsubr (&Sdelete_other_windows_internal); - defsubr (&Sdelete_window_internal); - defsubr (&Sresize_mini_window_internal); - defsubr (&Sset_window_buffer); - defsubr (&Srun_window_configuration_change_hook); - defsubr (&Srun_window_scroll_functions); - defsubr (&Sselect_window); - defsubr (&Sforce_window_update); - defsubr (&Ssplit_window_internal); - defsubr (&Sscroll_up); - defsubr (&Sscroll_down); - defsubr (&Sscroll_left); - defsubr (&Sscroll_right); - defsubr (&Sother_window_for_scrolling); - defsubr (&Sscroll_other_window); - defsubr (&Sminibuffer_selected_window); - defsubr (&Srecenter); - defsubr (&Swindow_text_width); - defsubr (&Swindow_text_height); - defsubr (&Smove_to_window_line); - defsubr (&Swindow_configuration_p); - defsubr (&Swindow_configuration_frame); - defsubr (&Sset_window_configuration); - defsubr (&Scurrent_window_configuration); - defsubr (&Sset_window_margins); - defsubr (&Swindow_margins); - defsubr (&Sset_window_fringes); - defsubr (&Swindow_fringes); - defsubr (&Sset_window_scroll_bars); - defsubr (&Swindow_scroll_bars); - defsubr (&Swindow_vscroll); - defsubr (&Sset_window_vscroll); - defsubr (&Scompare_window_configurations); - defsubr (&Swindow_list); - defsubr (&Swindow_list_1); - defsubr (&Swindow_prev_buffers); - defsubr (&Sset_window_prev_buffers); - defsubr (&Swindow_next_buffers); - defsubr (&Sset_window_next_buffers); - defsubr (&Swindow_parameters); - defsubr (&Swindow_parameter); - defsubr (&Sset_window_parameter); } void diff --git a/src/xdisp.c b/src/xdisp.c index a1a6cbd6cf..0f48534468 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -29955,6 +29955,8 @@ x_intersect_rectangles (XRectangle *r1, XRectangle *r2, XRectangle *result) void syms_of_xdisp (void) { +#include "xdisp.x" + Vwith_echo_area_save_vector = Qnil; staticpro (&Vwith_echo_area_save_vector); @@ -29971,25 +29973,6 @@ syms_of_xdisp (void) message_dolog_marker3 = Fmake_marker (); staticpro (&message_dolog_marker3); -#ifdef GLYPH_DEBUG - defsubr (&Sdump_frame_glyph_matrix); - defsubr (&Sdump_glyph_matrix); - defsubr (&Sdump_glyph_row); - defsubr (&Sdump_tool_bar_row); - defsubr (&Strace_redisplay); - defsubr (&Strace_to_stderr); -#endif -#ifdef HAVE_WINDOW_SYSTEM - defsubr (&Stool_bar_height); - defsubr (&Slookup_image_map); -#endif - defsubr (&Sline_pixel_height); - defsubr (&Sformat_mode_line); - defsubr (&Sinvisible_p); - defsubr (&Scurrent_bidi_paragraph_direction); - defsubr (&Swindow_text_pixel_size); - defsubr (&Smove_point_visually); - DEFSYM (Qmenu_bar_update_hook, "menu-bar-update-hook"); DEFSYM (Qoverriding_terminal_local_map, "overriding-terminal-local-map"); DEFSYM (Qoverriding_local_map, "overriding-local-map"); diff --git a/src/xfaces.c b/src/xfaces.c index 4571137a24..69e7c0518a 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6386,6 +6386,8 @@ DEFUN ("show-face-resources", Fshow_face_resources, Sshow_face_resources, void syms_of_xfaces (void) { +#include "xfaces.x" + DEFSYM (Qface, "face"); DEFSYM (Qface_no_inherit, "face-no-inherit"); DEFSYM (Qbitmap_spec_p, "bitmap-spec-p"); @@ -6465,44 +6467,6 @@ syms_of_xfaces (void) Vface_alternative_font_registry_alist = Qnil; staticpro (&Vface_alternative_font_registry_alist); - defsubr (&Sinternal_make_lisp_face); - defsubr (&Sinternal_lisp_face_p); - defsubr (&Sinternal_set_lisp_face_attribute); -#ifdef HAVE_WINDOW_SYSTEM - defsubr (&Sinternal_set_lisp_face_attribute_from_resource); -#endif - defsubr (&Scolor_gray_p); - defsubr (&Scolor_supported_p); -#ifndef HAVE_X_WINDOWS - defsubr (&Sx_load_color_file); -#endif - defsubr (&Sface_attribute_relative_p); - defsubr (&Smerge_face_attribute); - defsubr (&Sinternal_get_lisp_face_attribute); - defsubr (&Sinternal_lisp_face_attribute_values); - defsubr (&Sinternal_lisp_face_equal_p); - defsubr (&Sinternal_lisp_face_empty_p); - defsubr (&Sinternal_copy_lisp_face); - defsubr (&Sinternal_merge_in_global_face); - defsubr (&Sface_font); - defsubr (&Sframe_face_alist); - defsubr (&Sdisplay_supports_face_attributes_p); - defsubr (&Scolor_distance); - defsubr (&Sinternal_set_font_selection_order); - defsubr (&Sinternal_set_alternative_font_family_alist); - defsubr (&Sinternal_set_alternative_font_registry_alist); - defsubr (&Sface_attributes_as_vector); -#ifdef GLYPH_DEBUG - defsubr (&Sdump_face); - defsubr (&Sshow_face_resources); -#endif /* GLYPH_DEBUG */ - defsubr (&Sclear_face_cache); - defsubr (&Stty_suppress_bold_inverse_default_colors); - -#if defined DEBUG_X_COLORS && defined HAVE_X_WINDOWS - defsubr (&Sdump_colors); -#endif - DEFVAR_LISP ("face-new-frame-defaults", Vface_new_frame_defaults, doc: /* List of global face definitions (for internal use only.) */); Vface_new_frame_defaults = Qnil; @@ -6586,11 +6550,4 @@ RESCALE-RATIO is a floating point number to specify how much larger \(or smaller) font we should use. For instance, if a face requests a font of 10 point, we actually use a font of 10 * RESCALE-RATIO point. */); Vface_font_rescale_alist = Qnil; - -#ifdef HAVE_WINDOW_SYSTEM - defsubr (&Sbitmap_spec_p); - defsubr (&Sx_list_fonts); - defsubr (&Sinternal_face_x_get_resource); - defsubr (&Sx_family_fonts); -#endif } diff --git a/src/xfns.c b/src/xfns.c index e8e3fbe1a1..24e2a5b941 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -6136,6 +6136,8 @@ frame_parm_handler x_frame_parm_handlers[] = void syms_of_xfns (void) { +#include "xfns.x" + DEFSYM (Qundefined_color, "undefined-color"); DEFSYM (Qcompound_text, "compound-text"); DEFSYM (Qcancel_timer, "cancel-timer"); @@ -6287,39 +6289,6 @@ When using Gtk+ tooltips, the tooltip face is not used. */); } #endif /* USE_GTK */ - /* X window properties. */ - defsubr (&Sx_change_window_property); - defsubr (&Sx_delete_window_property); - defsubr (&Sx_window_property); - - defsubr (&Sxw_display_color_p); - defsubr (&Sx_display_grayscale_p); - defsubr (&Sxw_color_defined_p); - defsubr (&Sxw_color_values); - defsubr (&Sx_server_max_request_size); - defsubr (&Sx_server_vendor); - defsubr (&Sx_server_version); - defsubr (&Sx_display_pixel_width); - defsubr (&Sx_display_pixel_height); - defsubr (&Sx_display_mm_width); - defsubr (&Sx_display_mm_height); - defsubr (&Sx_display_screens); - defsubr (&Sx_display_planes); - defsubr (&Sx_display_color_cells); - defsubr (&Sx_display_visual_class); - defsubr (&Sx_display_backing_store); - defsubr (&Sx_display_save_under); - defsubr (&Sx_display_monitor_attributes_list); - defsubr (&Sx_wm_set_size_hint); - defsubr (&Sx_create_frame); - defsubr (&Sx_open_connection); - defsubr (&Sx_close_connection); - defsubr (&Sx_display_list); - defsubr (&Sx_synchronize); - defsubr (&Sx_backspace_delete_keys_p); - - defsubr (&Sx_show_tip); - defsubr (&Sx_hide_tip); tip_timer = Qnil; staticpro (&tip_timer); tip_frame = Qnil; @@ -6327,13 +6296,4 @@ When using Gtk+ tooltips, the tooltip face is not used. */); last_show_tip_args = Qnil; staticpro (&last_show_tip_args); - - defsubr (&Sx_uses_old_gtk_dialog); -#if defined (USE_MOTIF) || defined (USE_GTK) - defsubr (&Sx_file_dialog); -#endif - -#if defined (USE_GTK) && defined (HAVE_FREETYPE) - defsubr (&Sx_select_font); -#endif } diff --git a/src/xmenu.c b/src/xmenu.c index e06f16e316..0f2e9f2296 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -2325,6 +2325,8 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_ void syms_of_xmenu (void) { +#include "xmenu.x" + DEFSYM (Qdebug_on_next_call, "debug-on-next-call"); #ifdef USE_X_TOOLKIT @@ -2332,10 +2334,7 @@ syms_of_xmenu (void) next_menubar_widget_id = 1; #endif - defsubr (&Smenu_or_popup_active_p); - #if defined (USE_GTK) || defined (USE_X_TOOLKIT) - defsubr (&Sx_menu_bar_open_internal); Ffset (intern_c_string ("accelerate-menu"), intern_c_string (Sx_menu_bar_open_internal.symbol_name)); #endif diff --git a/src/xml.c b/src/xml.c index feabe00efa..f8bbb62c6b 100644 --- a/src/xml.c +++ b/src/xml.c @@ -280,8 +280,7 @@ If BASE-URL is non-nil, it is used to expand relative URLs. */) void syms_of_xml (void) { - defsubr (&Slibxml_parse_html_region); - defsubr (&Slibxml_parse_xml_region); +#include "xml.x" DEFSYM (Qlibxml2_dll, "libxml2"); } diff --git a/src/xselect.c b/src/xselect.c index 1ed552fdac..faf8584e12 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -2612,15 +2612,7 @@ x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from, void syms_of_xselect (void) { - defsubr (&Sx_get_selection_internal); - defsubr (&Sx_own_selection_internal); - defsubr (&Sx_disown_selection_internal); - defsubr (&Sx_selection_owner_p); - defsubr (&Sx_selection_exists_p); - - defsubr (&Sx_get_atom_name); - defsubr (&Sx_send_client_message); - defsubr (&Sx_register_dnd_atom); +#include "xselect.x" reading_selection_reply = Fcons (Qnil, Qnil); staticpro (&reading_selection_reply); diff --git a/src/xsettings.c b/src/xsettings.c index 5f4275df54..e9cc960ce8 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -1009,6 +1009,8 @@ known style. Otherwise return image. */) void syms_of_xsettings (void) { +#include "xsettings.x" + current_mono_font = NULL; current_font = NULL; first_dpyinfo = NULL; @@ -1022,8 +1024,6 @@ syms_of_xsettings (void) DEFSYM (Qmonospace_font_name, "monospace-font-name"); DEFSYM (Qfont_name, "font-name"); DEFSYM (Qfont_render, "font-render"); - defsubr (&Sfont_get_system_font); - defsubr (&Sfont_get_system_normal_font); DEFVAR_BOOL ("font-use-system-font", use_system_font, doc: /* Non-nil means to apply the system defined font dynamically. @@ -1045,7 +1045,6 @@ If this variable is nil, Emacs ignores system font changes. */); current_tool_bar_style = Qnil; DEFSYM (Qtool_bar_style, "tool-bar-style"); - defsubr (&Stool_bar_get_system_style); Fprovide (intern_c_string ("dynamic-setting"), Qnil); } diff --git a/src/xsmfns.c b/src/xsmfns.c index 645e19951b..c25096192b 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -531,6 +531,8 @@ Do not call this function yourself. */) void syms_of_xsmfns (void) { +#include "xsmfns.x" + DEFVAR_LISP ("x-session-id", Vx_session_id, doc: /* The session id Emacs got from the session manager for this session. Changing the value does not change the session id used by Emacs. @@ -561,8 +563,6 @@ same, depending on how the session manager works. See also `emacs-save-session-functions', `emacs-session-save' and `emacs-session-restore'." */); Vx_session_previous_id = Qnil; - - defsubr (&Shandle_save_session); } #endif /* HAVE_X_SM */