aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2015-05-31 11:47:35 -0700
committerPaul Eggert2015-05-31 11:50:01 -0700
commit0c2a3cf62a0117586803513ef104ff3ef97c1c3f (patch)
tree89247a8b1e9ba9eff229ae1f7e86919c07577e7a /src
parent1e04ea9879eefd0ce15a386f575bdf85cbd4d38d (diff)
downloademacs-0c2a3cf62a0117586803513ef104ff3ef97c1c3f.tar.gz
emacs-0c2a3cf62a0117586803513ef104ff3ef97c1c3f.zip
Remove unused DEFSYMs
Remove DEFSYMs that aren't used at the C level. Also: * src/decompress.c (Qzlib_dll): * src/font.c (Qunicode_sip): * src/frame.c (Qtip_frame): * src/ftfont.c (Qserif): * src/gnutls.c (Qgnutls_dll): * src/xml.c (Qlibxml2_dll): Move from here ... * src/w32fns.c (syms_of_w32fns): ... to here, as these are used only on MS-Windows.
Diffstat (limited to 'src')
-rw-r--r--src/callint.c1
-rw-r--r--src/ccl.c4
-rw-r--r--src/charset.c4
-rw-r--r--src/cmds.c1
-rw-r--r--src/coding.c11
-rw-r--r--src/composite.c1
-rw-r--r--src/data.c7
-rw-r--r--src/dbusbind.c4
-rw-r--r--src/decompress.c1
-rw-r--r--src/eval.c1
-rw-r--r--src/fileio.c1
-rw-r--r--src/fns.c2
-rw-r--r--src/font.c5
-rw-r--r--src/fontset.c1
-rw-r--r--src/frame.c4
-rw-r--r--src/ftfont.c1
-rw-r--r--src/gfilenotify.c3
-rw-r--r--src/gnutls.c2
-rw-r--r--src/image.c2
-rw-r--r--src/keyboard.c5
-rw-r--r--src/keymap.c3
-rw-r--r--src/macros.c2
-rw-r--r--src/minibuf.c5
-rw-r--r--src/nsfont.m1
-rw-r--r--src/print.c1
-rw-r--r--src/process.c1
-rw-r--r--src/textprop.c6
-rw-r--r--src/w32fns.c8
-rw-r--r--src/window.c1
-rw-r--r--src/xdisp.c2
-rw-r--r--src/xfaces.c8
-rw-r--r--src/xml.c2
-rw-r--r--src/xselect.c2
33 files changed, 8 insertions, 95 deletions
diff --git a/src/callint.c b/src/callint.c
index cf50e0c3788..2ff2f80d740 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -904,7 +904,6 @@ syms_of_callint (void)
904 DEFSYM (Qhandle_shift_selection, "handle-shift-selection"); 904 DEFSYM (Qhandle_shift_selection, "handle-shift-selection");
905 DEFSYM (Qread_number, "read-number"); 905 DEFSYM (Qread_number, "read-number");
906 DEFSYM (Qfuncall_interactively, "funcall-interactively"); 906 DEFSYM (Qfuncall_interactively, "funcall-interactively");
907 DEFSYM (Qcommand_debug_status, "command-debug-status");
908 DEFSYM (Qenable_recursive_minibuffers, "enable-recursive-minibuffers"); 907 DEFSYM (Qenable_recursive_minibuffers, "enable-recursive-minibuffers");
909 DEFSYM (Qmouse_leave_buffer_hook, "mouse-leave-buffer-hook"); 908 DEFSYM (Qmouse_leave_buffer_hook, "mouse-leave-buffer-hook");
910 909
diff --git a/src/ccl.c b/src/ccl.c
index 88307a30aa6..bf2aa1254d4 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -2283,10 +2283,6 @@ syms_of_ccl (void)
2283 DEFSYM (Qccl, "ccl"); 2283 DEFSYM (Qccl, "ccl");
2284 DEFSYM (Qcclp, "cclp"); 2284 DEFSYM (Qcclp, "cclp");
2285 2285
2286 /* This symbol is a property which associates with ccl program vector.
2287 Ex: (get 'ccl-big5-encoder 'ccl-program) returns ccl program vector. */
2288 DEFSYM (Qccl_program, "ccl-program");
2289
2290 /* Symbols of ccl program have this property, a value of the property 2286 /* Symbols of ccl program have this property, a value of the property
2291 is an index for Vccl_program_table. */ 2287 is an index for Vccl_program_table. */
2292 DEFSYM (Qccl_program_idx, "ccl-program-idx"); 2288 DEFSYM (Qccl_program_idx, "ccl-program-idx");
diff --git a/src/charset.c b/src/charset.c
index f1aa07471c5..b19e34400fe 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2339,10 +2339,6 @@ syms_of_charset (void)
2339 DEFSYM (Qeight_bit, "eight-bit"); 2339 DEFSYM (Qeight_bit, "eight-bit");
2340 DEFSYM (Qiso_8859_1, "iso-8859-1"); 2340 DEFSYM (Qiso_8859_1, "iso-8859-1");
2341 2341
2342 /* Value of charset attribute `charset-iso-plane'. */
2343 DEFSYM (Qgl, "gl");
2344 DEFSYM (Qgr, "gr");
2345
2346 staticpro (&Vcharset_ordered_list); 2342 staticpro (&Vcharset_ordered_list);
2347 Vcharset_ordered_list = Qnil; 2343 Vcharset_ordered_list = Qnil;
2348 2344
diff --git a/src/cmds.c b/src/cmds.c
index 6f9982eebb2..a975a8ed4e0 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -526,7 +526,6 @@ internal_self_insert (int c, EMACS_INT n)
526void 526void
527syms_of_cmds (void) 527syms_of_cmds (void)
528{ 528{
529 DEFSYM (Qkill_backward_chars, "kill-backward-chars");
530 DEFSYM (Qkill_forward_chars, "kill-forward-chars"); 529 DEFSYM (Qkill_forward_chars, "kill-forward-chars");
531 530
532 /* A possible value for a buffer's overwrite-mode variable. */ 531 /* A possible value for a buffer's overwrite-mode variable. */
diff --git a/src/coding.c b/src/coding.c
index 4b41355595c..776ecac62d9 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -10828,18 +10828,11 @@ syms_of_coding (void)
10828 /* Target SERVICE is the fourth argument. */ 10828 /* Target SERVICE is the fourth argument. */
10829 Fput (Qopen_network_stream, Qtarget_idx, make_number (3)); 10829 Fput (Qopen_network_stream, Qtarget_idx, make_number (3));
10830 10830
10831 DEFSYM (Qcoding_system, "coding-system");
10832 DEFSYM (Qcoding_aliases, "coding-aliases");
10833
10834 DEFSYM (Qeol_type, "eol-type");
10835 DEFSYM (Qunix, "unix"); 10831 DEFSYM (Qunix, "unix");
10836 DEFSYM (Qdos, "dos"); 10832 DEFSYM (Qdos, "dos");
10837 DEFSYM (Qmac, "mac"); 10833 DEFSYM (Qmac, "mac");
10838 10834
10839 DEFSYM (Qbuffer_file_coding_system, "buffer-file-coding-system"); 10835 DEFSYM (Qbuffer_file_coding_system, "buffer-file-coding-system");
10840 DEFSYM (Qpost_read_conversion, "post-read-conversion");
10841 DEFSYM (Qpre_write_conversion, "pre-write-conversion");
10842 DEFSYM (Qdefault_char, "default-char");
10843 DEFSYM (Qundecided, "undecided"); 10836 DEFSYM (Qundecided, "undecided");
10844 DEFSYM (Qno_conversion, "no-conversion"); 10837 DEFSYM (Qno_conversion, "no-conversion");
10845 DEFSYM (Qraw_text, "raw-text"); 10838 DEFSYM (Qraw_text, "raw-text");
@@ -10873,10 +10866,6 @@ syms_of_coding (void)
10873 DEFSYM (Qtranslation_table, "translation-table"); 10866 DEFSYM (Qtranslation_table, "translation-table");
10874 Fput (Qtranslation_table, Qchar_table_extra_slots, make_number (2)); 10867 Fput (Qtranslation_table, Qchar_table_extra_slots, make_number (2));
10875 DEFSYM (Qtranslation_table_id, "translation-table-id"); 10868 DEFSYM (Qtranslation_table_id, "translation-table-id");
10876 DEFSYM (Qtranslation_table_for_decode, "translation-table-for-decode");
10877 DEFSYM (Qtranslation_table_for_encode, "translation-table-for-encode");
10878
10879 DEFSYM (Qvalid_codes, "valid-codes");
10880 10869
10881 /* Coding system emacs-mule and raw-text are for converting only 10870 /* Coding system emacs-mule and raw-text are for converting only
10882 end-of-line format. */ 10871 end-of-line format. */
diff --git a/src/composite.c b/src/composite.c
index 577b97920f4..1c9c62bf910 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1930,7 +1930,6 @@ The default value is the function `compose-chars-after'. */);
1930 Vcompose_chars_after_function = intern_c_string ("compose-chars-after"); 1930 Vcompose_chars_after_function = intern_c_string ("compose-chars-after");
1931 1931
1932 DEFSYM (Qauto_composed, "auto-composed"); 1932 DEFSYM (Qauto_composed, "auto-composed");
1933 DEFSYM (Qauto_composition_function, "auto-composition-function");
1934 1933
1935 DEFVAR_LISP ("auto-composition-mode", Vauto_composition_mode, 1934 DEFVAR_LISP ("auto-composition-mode", Vauto_composition_mode,
1936 doc: /* Non-nil if Auto-Composition mode is enabled. 1935 doc: /* Non-nil if Auto-Composition mode is enabled.
diff --git a/src/data.c b/src/data.c
index 7bc080fdf84..9b1c12a4b29 100644
--- a/src/data.c
+++ b/src/data.c
@@ -3451,7 +3451,6 @@ syms_of_data (void)
3451 DEFSYM (Qlistp, "listp"); 3451 DEFSYM (Qlistp, "listp");
3452 DEFSYM (Qconsp, "consp"); 3452 DEFSYM (Qconsp, "consp");
3453 DEFSYM (Qsymbolp, "symbolp"); 3453 DEFSYM (Qsymbolp, "symbolp");
3454 DEFSYM (Qkeywordp, "keywordp");
3455 DEFSYM (Qintegerp, "integerp"); 3454 DEFSYM (Qintegerp, "integerp");
3456 DEFSYM (Qnatnump, "natnump"); 3455 DEFSYM (Qnatnump, "natnump");
3457 DEFSYM (Qwholenump, "wholenump"); 3456 DEFSYM (Qwholenump, "wholenump");
@@ -3465,7 +3464,6 @@ syms_of_data (void)
3465 DEFSYM (Qmarkerp, "markerp"); 3464 DEFSYM (Qmarkerp, "markerp");
3466 DEFSYM (Qbuffer_or_string_p, "buffer-or-string-p"); 3465 DEFSYM (Qbuffer_or_string_p, "buffer-or-string-p");
3467 DEFSYM (Qinteger_or_marker_p, "integer-or-marker-p"); 3466 DEFSYM (Qinteger_or_marker_p, "integer-or-marker-p");
3468 DEFSYM (Qboundp, "boundp");
3469 DEFSYM (Qfboundp, "fboundp"); 3467 DEFSYM (Qfboundp, "fboundp");
3470 3468
3471 DEFSYM (Qfloatp, "floatp"); 3469 DEFSYM (Qfloatp, "floatp");
@@ -3481,10 +3479,6 @@ syms_of_data (void)
3481 3479
3482 DEFSYM (Qcdr, "cdr"); 3480 DEFSYM (Qcdr, "cdr");
3483 3481
3484 /* Handle automatic advice activation. */
3485 DEFSYM (Qad_advice_info, "ad-advice-info");
3486 DEFSYM (Qad_activate_internal, "ad-activate-internal");
3487
3488 error_tail = pure_cons (Qerror, Qnil); 3482 error_tail = pure_cons (Qerror, Qnil);
3489 3483
3490 /* ERROR is used as a signaler for random errors for which nothing else is 3484 /* ERROR is used as a signaler for random errors for which nothing else is
@@ -3570,7 +3564,6 @@ syms_of_data (void)
3570 DEFSYM (Qchar_table, "char-table"); 3564 DEFSYM (Qchar_table, "char-table");
3571 DEFSYM (Qbool_vector, "bool-vector"); 3565 DEFSYM (Qbool_vector, "bool-vector");
3572 DEFSYM (Qhash_table, "hash-table"); 3566 DEFSYM (Qhash_table, "hash-table");
3573 DEFSYM (Qmisc, "misc");
3574 3567
3575 DEFSYM (Qdefun, "defun"); 3568 DEFSYM (Qdefun, "defun");
3576 3569
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 54b0217799d..be1b89095ef 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -1718,11 +1718,7 @@ init_dbusbind (void)
1718void 1718void
1719syms_of_dbusbind (void) 1719syms_of_dbusbind (void)
1720{ 1720{
1721
1722 DEFSYM (Qdbus__init_bus, "dbus--init-bus");
1723 defsubr (&Sdbus__init_bus); 1721 defsubr (&Sdbus__init_bus);
1724
1725 DEFSYM (Qdbus_get_unique_name, "dbus-get-unique-name");
1726 defsubr (&Sdbus_get_unique_name); 1722 defsubr (&Sdbus_get_unique_name);
1727 1723
1728 DEFSYM (Qdbus_message_internal, "dbus-message-internal"); 1724 DEFSYM (Qdbus_message_internal, "dbus-message-internal");
diff --git a/src/decompress.c b/src/decompress.c
index b14f0a2cd79..460d4fe7670 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -209,7 +209,6 @@ This function can be called only in unibyte buffers. */)
209void 209void
210syms_of_decompress (void) 210syms_of_decompress (void)
211{ 211{
212 DEFSYM (Qzlib_dll, "zlib");
213 defsubr (&Szlib_decompress_region); 212 defsubr (&Szlib_decompress_region);
214 defsubr (&Szlib_available_p); 213 defsubr (&Szlib_available_p);
215} 214}
diff --git a/src/eval.c b/src/eval.c
index 490226149ff..46550955d44 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3670,7 +3670,6 @@ before making `inhibit-quit' nil. */);
3670 DEFSYM (Qautoload, "autoload"); 3670 DEFSYM (Qautoload, "autoload");
3671 DEFSYM (Qinhibit_debugger, "inhibit-debugger"); 3671 DEFSYM (Qinhibit_debugger, "inhibit-debugger");
3672 DEFSYM (Qmacro, "macro"); 3672 DEFSYM (Qmacro, "macro");
3673 DEFSYM (Qdeclare, "declare");
3674 3673
3675 /* Note that the process handling also uses Qexit, but we don't want 3674 /* Note that the process handling also uses Qexit, but we don't want
3676 to staticpro it twice, so we just do it here. */ 3675 to staticpro it twice, so we just do it here. */
diff --git a/src/fileio.c b/src/fileio.c
index f0f862a4344..aad0270a1d2 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5819,7 +5819,6 @@ syms_of_fileio (void)
5819 DEFSYM (Qcopy_file, "copy-file"); 5819 DEFSYM (Qcopy_file, "copy-file");
5820 DEFSYM (Qmake_directory_internal, "make-directory-internal"); 5820 DEFSYM (Qmake_directory_internal, "make-directory-internal");
5821 DEFSYM (Qmake_directory, "make-directory"); 5821 DEFSYM (Qmake_directory, "make-directory");
5822 DEFSYM (Qdelete_directory_internal, "delete-directory-internal");
5823 DEFSYM (Qdelete_file, "delete-file"); 5822 DEFSYM (Qdelete_file, "delete-file");
5824 DEFSYM (Qrename_file, "rename-file"); 5823 DEFSYM (Qrename_file, "rename-file");
5825 DEFSYM (Qadd_name_to_file, "add-name-to-file"); 5824 DEFSYM (Qadd_name_to_file, "add-name-to-file");
diff --git a/src/fns.c b/src/fns.c
index 939760b7394..235a4f63624 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -5073,8 +5073,6 @@ syms_of_fns (void)
5073 defsubr (&Sdefine_hash_table_test); 5073 defsubr (&Sdefine_hash_table_test);
5074 5074
5075 DEFSYM (Qstring_lessp, "string-lessp"); 5075 DEFSYM (Qstring_lessp, "string-lessp");
5076 DEFSYM (Qstring_collate_lessp, "string-collate-lessp");
5077 DEFSYM (Qstring_collate_equalp, "string-collate-equalp");
5078 DEFSYM (Qprovide, "provide"); 5076 DEFSYM (Qprovide, "provide");
5079 DEFSYM (Qrequire, "require"); 5077 DEFSYM (Qrequire, "require");
5080 DEFSYM (Qyes_or_no_p_history, "yes-or-no-p-history"); 5078 DEFSYM (Qyes_or_no_p_history, "yes-or-no-p-history");
diff --git a/src/font.c b/src/font.c
index 2ccfd15d436..1405d437241 100644
--- a/src/font.c
+++ b/src/font.c
@@ -5133,10 +5133,6 @@ syms_of_font (void)
5133 DEFSYM (Qiso8859_1, "iso8859-1"); 5133 DEFSYM (Qiso8859_1, "iso8859-1");
5134 DEFSYM (Qiso10646_1, "iso10646-1"); 5134 DEFSYM (Qiso10646_1, "iso10646-1");
5135 DEFSYM (Qunicode_bmp, "unicode-bmp"); 5135 DEFSYM (Qunicode_bmp, "unicode-bmp");
5136 DEFSYM (Qunicode_sip, "unicode-sip");
5137
5138 /* Unicode category `Cf'. */
5139 DEFSYM (QCf, "Cf");
5140 5136
5141 /* Symbols representing keys of font extra info. */ 5137 /* Symbols representing keys of font extra info. */
5142 DEFSYM (QCotf, ":otf"); 5138 DEFSYM (QCotf, ":otf");
@@ -5151,7 +5147,6 @@ syms_of_font (void)
5151 DEFSYM (QCscalable, ":scalable"); 5147 DEFSYM (QCscalable, ":scalable");
5152 DEFSYM (QCavgwidth, ":avgwidth"); 5148 DEFSYM (QCavgwidth, ":avgwidth");
5153 DEFSYM (QCfont_entity, ":font-entity"); 5149 DEFSYM (QCfont_entity, ":font-entity");
5154 DEFSYM (QCfc_unknown_spec, ":fc-unknown-spec");
5155 5150
5156 /* Symbols representing values of font spacing property. */ 5151 /* Symbols representing values of font spacing property. */
5157 DEFSYM (Qc, "c"); 5152 DEFSYM (Qc, "c");
diff --git a/src/fontset.c b/src/fontset.c
index 763d84628b5..e957c38eb60 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -2143,7 +2143,6 @@ syms_of_fontset (void)
2143 DEFSYM (Qfontset_info, "fontset-info"); 2143 DEFSYM (Qfontset_info, "fontset-info");
2144 Fput (Qfontset_info, Qchar_table_extra_slots, make_number (1)); 2144 Fput (Qfontset_info, Qchar_table_extra_slots, make_number (1));
2145 2145
2146 DEFSYM (Qprepend, "prepend");
2147 DEFSYM (Qappend, "append"); 2146 DEFSYM (Qappend, "append");
2148 DEFSYM (Qlatin, "latin"); 2147 DEFSYM (Qlatin, "latin");
2149 2148
diff --git a/src/frame.c b/src/frame.c
index 478bb00337b..e3ad82f5f80 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4905,7 +4905,6 @@ syms_of_frame (void)
4905 DEFSYM (Qframe_inhibit_resize, "frame-inhibit-resize"); 4905 DEFSYM (Qframe_inhibit_resize, "frame-inhibit-resize");
4906 DEFSYM (Qx_set_fullscreen, "x-set-fullscreen"); 4906 DEFSYM (Qx_set_fullscreen, "x-set-fullscreen");
4907 DEFSYM (Qx_check_fullscreen, "x-check-fullscreen"); 4907 DEFSYM (Qx_check_fullscreen, "x-check-fullscreen");
4908 DEFSYM (Qx_set_window_size_1, "x-set-window-size-1");
4909 DEFSYM (Qxg_frame_resized, "xg-frame-resized"); 4908 DEFSYM (Qxg_frame_resized, "xg-frame-resized");
4910 DEFSYM (Qxg_frame_set_char_size_1, "xg-frame-set-char-size-1"); 4909 DEFSYM (Qxg_frame_set_char_size_1, "xg-frame-set-char-size-1");
4911 DEFSYM (Qxg_frame_set_char_size_2, "xg-frame-set-char-size-2"); 4910 DEFSYM (Qxg_frame_set_char_size_2, "xg-frame-set-char-size-2");
@@ -4922,7 +4921,6 @@ syms_of_frame (void)
4922 DEFSYM (Qset_window_configuration, "set-window-configuration"); 4921 DEFSYM (Qset_window_configuration, "set-window-configuration");
4923 DEFSYM (Qx_create_frame_1, "x-create-frame-1"); 4922 DEFSYM (Qx_create_frame_1, "x-create-frame-1");
4924 DEFSYM (Qx_create_frame_2, "x-create-frame-2"); 4923 DEFSYM (Qx_create_frame_2, "x-create-frame-2");
4925 DEFSYM (Qtip_frame, "tip-frame");
4926 DEFSYM (Qterminal_frame, "terminal-frame"); 4924 DEFSYM (Qterminal_frame, "terminal-frame");
4927 4925
4928#ifdef HAVE_NS 4926#ifdef HAVE_NS
@@ -5074,12 +5072,10 @@ The pointer becomes visible again when the mouse is moved. */);
5074 DEFVAR_LISP ("focus-in-hook", Vfocus_in_hook, 5072 DEFVAR_LISP ("focus-in-hook", Vfocus_in_hook,
5075 doc: /* Normal hook run when a frame gains input focus. */); 5073 doc: /* Normal hook run when a frame gains input focus. */);
5076 Vfocus_in_hook = Qnil; 5074 Vfocus_in_hook = Qnil;
5077 DEFSYM (Qfocus_in_hook, "focus-in-hook");
5078 5075
5079 DEFVAR_LISP ("focus-out-hook", Vfocus_out_hook, 5076 DEFVAR_LISP ("focus-out-hook", Vfocus_out_hook,
5080 doc: /* Normal hook run when a frame loses input focus. */); 5077 doc: /* Normal hook run when a frame loses input focus. */);
5081 Vfocus_out_hook = Qnil; 5078 Vfocus_out_hook = Qnil;
5082 DEFSYM (Qfocus_out_hook, "focus-out-hook");
5083 5079
5084 DEFVAR_LISP ("delete-frame-functions", Vdelete_frame_functions, 5080 DEFVAR_LISP ("delete-frame-functions", Vdelete_frame_functions,
5085 doc: /* Functions run before deleting a frame. 5081 doc: /* Functions run before deleting a frame.
diff --git a/src/ftfont.c b/src/ftfont.c
index f19933c7ef2..afeaecac60c 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2674,7 +2674,6 @@ syms_of_ftfont (void)
2674 /* Fontconfig's generic families and their aliases. */ 2674 /* Fontconfig's generic families and their aliases. */
2675 DEFSYM (Qmonospace, "monospace"); 2675 DEFSYM (Qmonospace, "monospace");
2676 DEFSYM (Qsans_serif, "sans-serif"); 2676 DEFSYM (Qsans_serif, "sans-serif");
2677 DEFSYM (Qserif, "serif");
2678 DEFSYM (Qsans, "sans"); 2677 DEFSYM (Qsans, "sans");
2679 DEFSYM (Qsans__serif, "sans serif"); 2678 DEFSYM (Qsans__serif, "sans serif");
2680 2679
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index e03bec93541..08713a8fce3 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -236,10 +236,7 @@ globals_of_gfilenotify (void)
236void 236void
237syms_of_gfilenotify (void) 237syms_of_gfilenotify (void)
238{ 238{
239 DEFSYM (Qgfile_add_watch, "gfile-add-watch");
240 defsubr (&Sgfile_add_watch); 239 defsubr (&Sgfile_add_watch);
241
242 DEFSYM (Qgfile_rm_watch, "gfile-rm-watch");
243 defsubr (&Sgfile_rm_watch); 240 defsubr (&Sgfile_rm_watch);
244 241
245 /* Filter objects. */ 242 /* Filter objects. */
diff --git a/src/gnutls.c b/src/gnutls.c
index 9c2d86ecdfc..cab24048e56 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1658,7 +1658,6 @@ syms_of_gnutls (void)
1658#ifdef HAVE_GNUTLS 1658#ifdef HAVE_GNUTLS
1659 gnutls_global_initialized = 0; 1659 gnutls_global_initialized = 0;
1660 1660
1661 DEFSYM (Qgnutls_dll, "gnutls");
1662 DEFSYM (Qgnutls_code, "gnutls-code"); 1661 DEFSYM (Qgnutls_code, "gnutls-code");
1663 DEFSYM (Qgnutls_anon, "gnutls-anon"); 1662 DEFSYM (Qgnutls_anon, "gnutls-anon");
1664 DEFSYM (Qgnutls_x509pki, "gnutls-x509pki"); 1663 DEFSYM (Qgnutls_x509pki, "gnutls-x509pki");
@@ -1669,7 +1668,6 @@ syms_of_gnutls (void)
1669 DEFSYM (QCgnutls_bootprop_trustfiles, ":trustfiles"); 1668 DEFSYM (QCgnutls_bootprop_trustfiles, ":trustfiles");
1670 DEFSYM (QCgnutls_bootprop_keylist, ":keylist"); 1669 DEFSYM (QCgnutls_bootprop_keylist, ":keylist");
1671 DEFSYM (QCgnutls_bootprop_crlfiles, ":crlfiles"); 1670 DEFSYM (QCgnutls_bootprop_crlfiles, ":crlfiles");
1672 DEFSYM (QCgnutls_bootprop_callbacks, ":callbacks");
1673 DEFSYM (QCgnutls_bootprop_min_prime_bits, ":min-prime-bits"); 1671 DEFSYM (QCgnutls_bootprop_min_prime_bits, ":min-prime-bits");
1674 DEFSYM (QCgnutls_bootprop_loglevel, ":loglevel"); 1672 DEFSYM (QCgnutls_bootprop_loglevel, ":loglevel");
1675 DEFSYM (QCgnutls_bootprop_verify_flags, ":verify-flags"); 1673 DEFSYM (QCgnutls_bootprop_verify_flags, ":verify-flags");
diff --git a/src/image.c b/src/image.c
index 87029bfa1b0..dfa8941ab3c 100644
--- a/src/image.c
+++ b/src/image.c
@@ -9773,7 +9773,6 @@ non-numeric, there is no explicit limit on the size of images. */);
9773 DEFSYM (QCcolor_symbols, ":color-symbols"); 9773 DEFSYM (QCcolor_symbols, ":color-symbols");
9774 DEFSYM (QCheuristic_mask, ":heuristic-mask"); 9774 DEFSYM (QCheuristic_mask, ":heuristic-mask");
9775 DEFSYM (QCindex, ":index"); 9775 DEFSYM (QCindex, ":index");
9776 DEFSYM (QCgeometry, ":geometry");
9777 DEFSYM (QCcrop, ":crop"); 9776 DEFSYM (QCcrop, ":crop");
9778 DEFSYM (QCrotation, ":rotation"); 9777 DEFSYM (QCrotation, ":rotation");
9779 DEFSYM (QCmatrix, ":matrix"); 9778 DEFSYM (QCmatrix, ":matrix");
@@ -9792,7 +9791,6 @@ non-numeric, there is no explicit limit on the size of images. */);
9792#ifdef HAVE_GHOSTSCRIPT 9791#ifdef HAVE_GHOSTSCRIPT
9793 ADD_IMAGE_TYPE (Qpostscript); 9792 ADD_IMAGE_TYPE (Qpostscript);
9794 DEFSYM (QCloader, ":loader"); 9793 DEFSYM (QCloader, ":loader");
9795 DEFSYM (QCbounding_box, ":bounding-box");
9796 DEFSYM (QCpt_width, ":pt-width"); 9794 DEFSYM (QCpt_width, ":pt-width");
9797 DEFSYM (QCpt_height, ":pt-height"); 9795 DEFSYM (QCpt_height, ":pt-height");
9798#endif /* HAVE_GHOSTSCRIPT */ 9796#endif /* HAVE_GHOSTSCRIPT */
diff --git a/src/keyboard.c b/src/keyboard.c
index eb66c445559..ca589dd46f7 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11074,10 +11074,6 @@ syms_of_keyboard (void)
11074 tool_bar_items_vector = Qnil; 11074 tool_bar_items_vector = Qnil;
11075 11075
11076 DEFSYM (Qtimer_event_handler, "timer-event-handler"); 11076 DEFSYM (Qtimer_event_handler, "timer-event-handler");
11077 DEFSYM (Qdisabled_command_function, "disabled-command-function");
11078 DEFSYM (Qself_insert_command, "self-insert-command");
11079 DEFSYM (Qforward_char, "forward-char");
11080 DEFSYM (Qbackward_char, "backward-char");
11081 11077
11082 /* Non-nil disable property on a command means do not execute it; 11078 /* Non-nil disable property on a command means do not execute it;
11083 call disabled-command-function's value instead. */ 11079 call disabled-command-function's value instead. */
@@ -11185,7 +11181,6 @@ syms_of_keyboard (void)
11185 DEFSYM (Qhandle_switch_frame, "handle-switch-frame"); 11181 DEFSYM (Qhandle_switch_frame, "handle-switch-frame");
11186 DEFSYM (Qhandle_select_window, "handle-select-window"); 11182 DEFSYM (Qhandle_select_window, "handle-select-window");
11187 11183
11188 DEFSYM (Qinput_method_function, "input-method-function");
11189 DEFSYM (Qinput_method_exit_on_first_char, "input-method-exit-on-first-char"); 11184 DEFSYM (Qinput_method_exit_on_first_char, "input-method-exit-on-first-char");
11190 DEFSYM (Qinput_method_use_echo_area, "input-method-use-echo-area"); 11185 DEFSYM (Qinput_method_use_echo_area, "input-method-use-echo-area");
11191 11186
diff --git a/src/keymap.c b/src/keymap.c
index e9898051dc7..8f4ac0dd437 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3739,9 +3739,6 @@ be preferred. */);
3739 intern_c_string ("mouse-4"), 3739 intern_c_string ("mouse-4"),
3740 intern_c_string ("mouse-5")); 3740 intern_c_string ("mouse-5"));
3741 3741
3742 DEFSYM (Qsingle_key_description, "single-key-description");
3743 DEFSYM (Qkey_description, "key-description");
3744
3745 /* Keymap used for minibuffers when doing completion. */ 3742 /* Keymap used for minibuffers when doing completion. */
3746 /* Keymap used for minibuffers when doing completion and require a match. */ 3743 /* Keymap used for minibuffers when doing completion and require a match. */
3747 DEFSYM (Qkeymapp, "keymapp"); 3744 DEFSYM (Qkeymapp, "keymapp");
diff --git a/src/macros.c b/src/macros.c
index e5b8ab70870..79ed5b5d1bc 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -358,8 +358,6 @@ init_macros (void)
358void 358void
359syms_of_macros (void) 359syms_of_macros (void)
360{ 360{
361 DEFSYM (Qexecute_kbd_macro, "execute-kbd-macro");
362
363 DEFVAR_LISP ("kbd-macro-termination-hook", Vkbd_macro_termination_hook, 361 DEFVAR_LISP ("kbd-macro-termination-hook", Vkbd_macro_termination_hook,
364 doc: /* Normal hook run whenever a keyboard macro terminates. 362 doc: /* Normal hook run whenever a keyboard macro terminates.
365This is run whether the macro ends normally or prematurely due to an error. */); 363This is run whether the macro ends normally or prematurely due to an error. */);
diff --git a/src/minibuf.c b/src/minibuf.c
index c03316965d3..03be8d1ff9f 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1910,13 +1910,10 @@ syms_of_minibuf (void)
1910 staticpro (&minibuf_save_list); 1910 staticpro (&minibuf_save_list);
1911 1911
1912 DEFSYM (Qcompletion_ignore_case, "completion-ignore-case"); 1912 DEFSYM (Qcompletion_ignore_case, "completion-ignore-case");
1913 DEFSYM (Qread_file_name_internal, "read-file-name-internal");
1914 DEFSYM (Qminibuffer_default, "minibuffer-default"); 1913 DEFSYM (Qminibuffer_default, "minibuffer-default");
1915 Fset (Qminibuffer_default, Qnil); 1914 Fset (Qminibuffer_default, Qnil);
1916 1915
1917 DEFSYM (Qminibuffer_completion_table, "minibuffer-completion-table"); 1916 DEFSYM (Qminibuffer_completion_table, "minibuffer-completion-table");
1918 DEFSYM (Qminibuffer_completion_confirm, "minibuffer-completion-confirm");
1919 DEFSYM (Qminibuffer_completion_predicate, "minibuffer-completion-predicate");
1920 1917
1921 staticpro (&last_minibuf_string); 1918 staticpro (&last_minibuf_string);
1922 last_minibuf_string = Qnil; 1919 last_minibuf_string = Qnil;
@@ -1944,8 +1941,6 @@ syms_of_minibuf (void)
1944For example, `eval-expression' uses this. */); 1941For example, `eval-expression' uses this. */);
1945 Vread_expression_history = Qnil; 1942 Vread_expression_history = Qnil;
1946 1943
1947 DEFSYM (Qread_expression_history, "read-expression-history");
1948
1949 DEFVAR_LISP ("read-buffer-function", Vread_buffer_function, 1944 DEFVAR_LISP ("read-buffer-function", Vread_buffer_function,
1950 doc: /* If this is non-nil, `read-buffer' does its work by calling this function. 1945 doc: /* If this is non-nil, `read-buffer' does its work by calling this function.
1951The function is called with the arguments passed to `read-buffer'. */); 1946The function is called with the arguments passed to `read-buffer'. */);
diff --git a/src/nsfont.m b/src/nsfont.m
index 683ab178836..d450df3c13e 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1528,7 +1528,6 @@ syms_of_nsfont (void)
1528 DEFSYM (Qcondensed, "condensed"); 1528 DEFSYM (Qcondensed, "condensed");
1529 DEFSYM (Qexpanded, "expanded"); 1529 DEFSYM (Qexpanded, "expanded");
1530 DEFSYM (Qapple, "apple"); 1530 DEFSYM (Qapple, "apple");
1531 DEFSYM (Qroman, "roman");
1532 DEFSYM (Qmedium, "medium"); 1531 DEFSYM (Qmedium, "medium");
1533 DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script, 1532 DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script,
1534 doc: /* Internal use: maps font registry to Unicode script. */); 1533 doc: /* Internal use: maps font registry to Unicode script. */);
diff --git a/src/print.c b/src/print.c
index 206466ce68f..a182839ba7d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2174,7 +2174,6 @@ decimal point. 0 is not allowed with `e' or `g'.
2174A value of nil means to use the shortest notation 2174A value of nil means to use the shortest notation
2175that represents the number without losing information. */); 2175that represents the number without losing information. */);
2176 Vfloat_output_format = Qnil; 2176 Vfloat_output_format = Qnil;
2177 DEFSYM (Qfloat_output_format, "float-output-format");
2178 2177
2179 DEFVAR_LISP ("print-length", Vprint_length, 2178 DEFVAR_LISP ("print-length", Vprint_length,
2180 doc: /* Maximum length of list to print before abbreviating. 2179 doc: /* Maximum length of list to print before abbreviating.
diff --git a/src/process.c b/src/process.c
index bb068943b4a..17fe708a954 100644
--- a/src/process.c
+++ b/src/process.c
@@ -7574,7 +7574,6 @@ syms_of_process (void)
7574 DEFSYM (QClog, ":log"); 7574 DEFSYM (QClog, ":log");
7575 DEFSYM (QCnoquery, ":noquery"); 7575 DEFSYM (QCnoquery, ":noquery");
7576 DEFSYM (QCstop, ":stop"); 7576 DEFSYM (QCstop, ":stop");
7577 DEFSYM (QCoptions, ":options");
7578 DEFSYM (QCplist, ":plist"); 7577 DEFSYM (QCplist, ":plist");
7579 DEFSYM (QCcommand, ":command"); 7578 DEFSYM (QCcommand, ":command");
7580 DEFSYM (QCconnection_type, ":connection-type"); 7579 DEFSYM (QCconnection_type, ":connection-type");
diff --git a/src/textprop.c b/src/textprop.c
index 96d88edebd2..f6dbab09228 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -2377,12 +2377,8 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and
2377 2377
2378 /* Common attributes one might give text. */ 2378 /* Common attributes one might give text. */
2379 2379
2380 DEFSYM (Qforeground, "foreground");
2381 DEFSYM (Qbackground, "background");
2382 DEFSYM (Qfont, "font"); 2380 DEFSYM (Qfont, "font");
2383 DEFSYM (Qface, "face"); 2381 DEFSYM (Qface, "face");
2384 DEFSYM (Qstipple, "stipple");
2385 DEFSYM (Qunderline, "underline");
2386 DEFSYM (Qread_only, "read-only"); 2382 DEFSYM (Qread_only, "read-only");
2387 DEFSYM (Qinvisible, "invisible"); 2383 DEFSYM (Qinvisible, "invisible");
2388 DEFSYM (Qintangible, "intangible"); 2384 DEFSYM (Qintangible, "intangible");
@@ -2395,8 +2391,6 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and
2395 2391
2396 /* Properties that text might use to specify certain actions. */ 2392 /* Properties that text might use to specify certain actions. */
2397 2393
2398 DEFSYM (Qmouse_left, "mouse-left");
2399 DEFSYM (Qmouse_entered, "mouse-entered");
2400 DEFSYM (Qpoint_left, "point-left"); 2394 DEFSYM (Qpoint_left, "point-left");
2401 DEFSYM (Qpoint_entered, "point-entered"); 2395 DEFSYM (Qpoint_entered, "point-entered");
2402 2396
diff --git a/src/w32fns.c b/src/w32fns.c
index 3a6fa624056..c247a9b3b3a 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8347,6 +8347,14 @@ syms_of_w32fns (void)
8347 DEFSYM (Qworkarea, "workarea"); 8347 DEFSYM (Qworkarea, "workarea");
8348 DEFSYM (Qmm_size, "mm-size"); 8348 DEFSYM (Qmm_size, "mm-size");
8349 DEFSYM (Qframes, "frames"); 8349 DEFSYM (Qframes, "frames");
8350 DEFSYM (Qtip_frame, "tip-frame");
8351 DEFSYM (Qunicode_sip, "unicode-sip");
8352
8353 /* Symbols used elsewhere, but only in MS-Windows-specific code. */
8354 DEFSYM (Qgnutls_dll, "gnutls");
8355 DEFSYM (Qlibxml2_dll, "libxml2");
8356 DEFSYM (Qserif, "serif");
8357 DEFSYM (Qzlib_dll, "zlib");
8350 8358
8351 Fput (Qundefined_color, Qerror_conditions, 8359 Fput (Qundefined_color, Qerror_conditions,
8352 listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror)); 8360 listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror));
diff --git a/src/window.c b/src/window.c
index b8281661b4d..ad5ac79bd8e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7329,7 +7329,6 @@ syms_of_window (void)
7329 DEFSYM (Qwindow_size, "window-size"); 7329 DEFSYM (Qwindow_size, "window-size");
7330 DEFSYM (Qtemp_buffer_show_hook, "temp-buffer-show-hook"); 7330 DEFSYM (Qtemp_buffer_show_hook, "temp-buffer-show-hook");
7331 DEFSYM (Qabove, "above"); 7331 DEFSYM (Qabove, "above");
7332 DEFSYM (Qbelow, "below");
7333 DEFSYM (Qclone_of, "clone-of"); 7332 DEFSYM (Qclone_of, "clone-of");
7334 DEFSYM (Qfloor, "floor"); 7333 DEFSYM (Qfloor, "floor");
7335 DEFSYM (Qceiling, "ceiling"); 7334 DEFSYM (Qceiling, "ceiling");
diff --git a/src/xdisp.c b/src/xdisp.c
index 358d7b5e4a7..05862d276ef 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -30536,9 +30536,7 @@ They are still logged to the *Messages* buffer. */);
30536 DEFSYM (Qcircle, "circle"); 30536 DEFSYM (Qcircle, "circle");
30537 DEFSYM (Qpoly, "poly"); 30537 DEFSYM (Qpoly, "poly");
30538 30538
30539 /* The symbol `inhibit-menubar-update' and its DEFVAR_BOOL variable. */
30540 DEFSYM (Qinhibit_menubar_update, "inhibit-menubar-update"); 30539 DEFSYM (Qinhibit_menubar_update, "inhibit-menubar-update");
30541 DEFSYM (Qmessage_truncate_lines, "message-truncate-lines");
30542 30540
30543 DEFSYM (Qgrow_only, "grow-only"); 30541 DEFSYM (Qgrow_only, "grow-only");
30544 DEFSYM (Qinhibit_eval_during_redisplay, "inhibit-eval-during-redisplay"); 30542 DEFSYM (Qinhibit_eval_during_redisplay, "inhibit-eval-during-redisplay");
diff --git a/src/xfaces.c b/src/xfaces.c
index d198c4be1a9..f0b6d393f99 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6378,7 +6378,6 @@ syms_of_xfaces (void)
6378 /* Names of basic faces. */ 6378 /* Names of basic faces. */
6379 DEFSYM (Qdefault, "default"); 6379 DEFSYM (Qdefault, "default");
6380 DEFSYM (Qtool_bar, "tool-bar"); 6380 DEFSYM (Qtool_bar, "tool-bar");
6381 DEFSYM (Qregion, "region");
6382 DEFSYM (Qfringe, "fringe"); 6381 DEFSYM (Qfringe, "fringe");
6383 DEFSYM (Qheader_line, "header-line"); 6382 DEFSYM (Qheader_line, "header-line");
6384 DEFSYM (Qscroll_bar, "scroll-bar"); 6383 DEFSYM (Qscroll_bar, "scroll-bar");
@@ -6400,13 +6399,6 @@ syms_of_xfaces (void)
6400 /* The name of the function used to compute colors on TTYs. */ 6399 /* The name of the function used to compute colors on TTYs. */
6401 DEFSYM (Qtty_color_alist, "tty-color-alist"); 6400 DEFSYM (Qtty_color_alist, "tty-color-alist");
6402 6401
6403 /* Allowed scalable fonts. A value of nil means don't allow any
6404 scalable fonts. A value of t means allow the use of any scalable
6405 font. Otherwise, value must be a list of regular expressions. A
6406 font may be scaled if its name matches a regular expression in the
6407 list. */
6408 DEFSYM (Qscalable_fonts_allowed, "scalable-fonts-allowed");
6409
6410 Vparam_value_alist = list1 (Fcons (Qnil, Qnil)); 6402 Vparam_value_alist = list1 (Fcons (Qnil, Qnil));
6411 staticpro (&Vparam_value_alist); 6403 staticpro (&Vparam_value_alist);
6412 Vface_alternative_font_family_alist = Qnil; 6404 Vface_alternative_font_family_alist = Qnil;
diff --git a/src/xml.c b/src/xml.c
index a3f92395792..9e68fff2b4d 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -287,8 +287,6 @@ syms_of_xml (void)
287{ 287{
288 defsubr (&Slibxml_parse_html_region); 288 defsubr (&Slibxml_parse_html_region);
289 defsubr (&Slibxml_parse_xml_region); 289 defsubr (&Slibxml_parse_xml_region);
290
291 DEFSYM (Qlibxml2_dll, "libxml2");
292} 290}
293 291
294#endif /* HAVE_LIBXML2 */ 292#endif /* HAVE_LIBXML2 */
diff --git a/src/xselect.c b/src/xselect.c
index 2a865e7cb8c..19ace065698 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2687,11 +2687,9 @@ A value of 0 means wait as long as necessary. This is initialized from the
2687 DEFSYM (QEMACS_TMP, "_EMACS_TMP_"); 2687 DEFSYM (QEMACS_TMP, "_EMACS_TMP_");
2688 DEFSYM (QTARGETS, "TARGETS"); 2688 DEFSYM (QTARGETS, "TARGETS");
2689 DEFSYM (QATOM, "ATOM"); 2689 DEFSYM (QATOM, "ATOM");
2690 DEFSYM (QATOM_PAIR, "ATOM_PAIR");
2691 DEFSYM (QCLIPBOARD_MANAGER, "CLIPBOARD_MANAGER"); 2690 DEFSYM (QCLIPBOARD_MANAGER, "CLIPBOARD_MANAGER");
2692 DEFSYM (QSAVE_TARGETS, "SAVE_TARGETS"); 2691 DEFSYM (QSAVE_TARGETS, "SAVE_TARGETS");
2693 DEFSYM (QNULL, "NULL"); 2692 DEFSYM (QNULL, "NULL");
2694 DEFSYM (Qcompound_text_with_extensions, "compound-text-with-extensions");
2695 DEFSYM (Qforeign_selection, "foreign-selection"); 2693 DEFSYM (Qforeign_selection, "foreign-selection");
2696 DEFSYM (Qx_lost_selection_functions, "x-lost-selection-functions"); 2694 DEFSYM (Qx_lost_selection_functions, "x-lost-selection-functions");
2697 DEFSYM (Qx_sent_selection_functions, "x-sent-selection-functions"); 2695 DEFSYM (Qx_sent_selection_functions, "x-sent-selection-functions");