From 0c2a3cf62a0117586803513ef104ff3ef97c1c3f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 31 May 2015 11:47:35 -0700 Subject: [PATCH] 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. --- src/callint.c | 1 - src/ccl.c | 4 ---- src/charset.c | 4 ---- src/cmds.c | 1 - src/coding.c | 11 ----------- src/composite.c | 1 - src/data.c | 7 ------- src/dbusbind.c | 4 ---- src/decompress.c | 1 - src/eval.c | 1 - src/fileio.c | 1 - src/fns.c | 2 -- src/font.c | 5 ----- src/fontset.c | 1 - src/frame.c | 4 ---- src/ftfont.c | 1 - src/gfilenotify.c | 3 --- src/gnutls.c | 2 -- src/image.c | 2 -- src/keyboard.c | 5 ----- src/keymap.c | 3 --- src/macros.c | 2 -- src/minibuf.c | 5 ----- src/nsfont.m | 1 - src/print.c | 1 - src/process.c | 1 - src/textprop.c | 6 ------ src/w32fns.c | 8 ++++++++ src/window.c | 1 - src/xdisp.c | 2 -- src/xfaces.c | 8 -------- src/xml.c | 2 -- src/xselect.c | 2 -- 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) DEFSYM (Qhandle_shift_selection, "handle-shift-selection"); DEFSYM (Qread_number, "read-number"); DEFSYM (Qfuncall_interactively, "funcall-interactively"); - DEFSYM (Qcommand_debug_status, "command-debug-status"); DEFSYM (Qenable_recursive_minibuffers, "enable-recursive-minibuffers"); DEFSYM (Qmouse_leave_buffer_hook, "mouse-leave-buffer-hook"); 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) DEFSYM (Qccl, "ccl"); DEFSYM (Qcclp, "cclp"); - /* This symbol is a property which associates with ccl program vector. - Ex: (get 'ccl-big5-encoder 'ccl-program) returns ccl program vector. */ - DEFSYM (Qccl_program, "ccl-program"); - /* Symbols of ccl program have this property, a value of the property is an index for Vccl_program_table. */ 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) DEFSYM (Qeight_bit, "eight-bit"); DEFSYM (Qiso_8859_1, "iso-8859-1"); - /* Value of charset attribute `charset-iso-plane'. */ - DEFSYM (Qgl, "gl"); - DEFSYM (Qgr, "gr"); - staticpro (&Vcharset_ordered_list); Vcharset_ordered_list = Qnil; 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) void syms_of_cmds (void) { - DEFSYM (Qkill_backward_chars, "kill-backward-chars"); DEFSYM (Qkill_forward_chars, "kill-forward-chars"); /* 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) /* Target SERVICE is the fourth argument. */ Fput (Qopen_network_stream, Qtarget_idx, make_number (3)); - DEFSYM (Qcoding_system, "coding-system"); - DEFSYM (Qcoding_aliases, "coding-aliases"); - - DEFSYM (Qeol_type, "eol-type"); DEFSYM (Qunix, "unix"); DEFSYM (Qdos, "dos"); DEFSYM (Qmac, "mac"); DEFSYM (Qbuffer_file_coding_system, "buffer-file-coding-system"); - DEFSYM (Qpost_read_conversion, "post-read-conversion"); - DEFSYM (Qpre_write_conversion, "pre-write-conversion"); - DEFSYM (Qdefault_char, "default-char"); DEFSYM (Qundecided, "undecided"); DEFSYM (Qno_conversion, "no-conversion"); DEFSYM (Qraw_text, "raw-text"); @@ -10873,10 +10866,6 @@ syms_of_coding (void) DEFSYM (Qtranslation_table, "translation-table"); Fput (Qtranslation_table, Qchar_table_extra_slots, make_number (2)); DEFSYM (Qtranslation_table_id, "translation-table-id"); - DEFSYM (Qtranslation_table_for_decode, "translation-table-for-decode"); - DEFSYM (Qtranslation_table_for_encode, "translation-table-for-encode"); - - DEFSYM (Qvalid_codes, "valid-codes"); /* Coding system emacs-mule and raw-text are for converting only 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'. */); Vcompose_chars_after_function = intern_c_string ("compose-chars-after"); DEFSYM (Qauto_composed, "auto-composed"); - DEFSYM (Qauto_composition_function, "auto-composition-function"); DEFVAR_LISP ("auto-composition-mode", Vauto_composition_mode, 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) DEFSYM (Qlistp, "listp"); DEFSYM (Qconsp, "consp"); DEFSYM (Qsymbolp, "symbolp"); - DEFSYM (Qkeywordp, "keywordp"); DEFSYM (Qintegerp, "integerp"); DEFSYM (Qnatnump, "natnump"); DEFSYM (Qwholenump, "wholenump"); @@ -3465,7 +3464,6 @@ syms_of_data (void) DEFSYM (Qmarkerp, "markerp"); DEFSYM (Qbuffer_or_string_p, "buffer-or-string-p"); DEFSYM (Qinteger_or_marker_p, "integer-or-marker-p"); - DEFSYM (Qboundp, "boundp"); DEFSYM (Qfboundp, "fboundp"); DEFSYM (Qfloatp, "floatp"); @@ -3481,10 +3479,6 @@ syms_of_data (void) DEFSYM (Qcdr, "cdr"); - /* Handle automatic advice activation. */ - DEFSYM (Qad_advice_info, "ad-advice-info"); - DEFSYM (Qad_activate_internal, "ad-activate-internal"); - error_tail = pure_cons (Qerror, Qnil); /* ERROR is used as a signaler for random errors for which nothing else is @@ -3570,7 +3564,6 @@ syms_of_data (void) DEFSYM (Qchar_table, "char-table"); DEFSYM (Qbool_vector, "bool-vector"); DEFSYM (Qhash_table, "hash-table"); - DEFSYM (Qmisc, "misc"); DEFSYM (Qdefun, "defun"); 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) void syms_of_dbusbind (void) { - - 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"); 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. */) void syms_of_decompress (void) { - DEFSYM (Qzlib_dll, "zlib"); defsubr (&Szlib_decompress_region); defsubr (&Szlib_available_p); } 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. */); DEFSYM (Qautoload, "autoload"); DEFSYM (Qinhibit_debugger, "inhibit-debugger"); DEFSYM (Qmacro, "macro"); - DEFSYM (Qdeclare, "declare"); /* Note that the process handling also uses Qexit, but we don't want 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) DEFSYM (Qcopy_file, "copy-file"); DEFSYM (Qmake_directory_internal, "make-directory-internal"); DEFSYM (Qmake_directory, "make-directory"); - DEFSYM (Qdelete_directory_internal, "delete-directory-internal"); DEFSYM (Qdelete_file, "delete-file"); DEFSYM (Qrename_file, "rename-file"); 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) defsubr (&Sdefine_hash_table_test); DEFSYM (Qstring_lessp, "string-lessp"); - DEFSYM (Qstring_collate_lessp, "string-collate-lessp"); - DEFSYM (Qstring_collate_equalp, "string-collate-equalp"); DEFSYM (Qprovide, "provide"); DEFSYM (Qrequire, "require"); 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) DEFSYM (Qiso8859_1, "iso8859-1"); DEFSYM (Qiso10646_1, "iso10646-1"); DEFSYM (Qunicode_bmp, "unicode-bmp"); - DEFSYM (Qunicode_sip, "unicode-sip"); - - /* Unicode category `Cf'. */ - DEFSYM (QCf, "Cf"); /* Symbols representing keys of font extra info. */ DEFSYM (QCotf, ":otf"); @@ -5151,7 +5147,6 @@ syms_of_font (void) DEFSYM (QCscalable, ":scalable"); DEFSYM (QCavgwidth, ":avgwidth"); DEFSYM (QCfont_entity, ":font-entity"); - DEFSYM (QCfc_unknown_spec, ":fc-unknown-spec"); /* Symbols representing values of font spacing property. */ 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) DEFSYM (Qfontset_info, "fontset-info"); Fput (Qfontset_info, Qchar_table_extra_slots, make_number (1)); - DEFSYM (Qprepend, "prepend"); DEFSYM (Qappend, "append"); DEFSYM (Qlatin, "latin"); 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) DEFSYM (Qframe_inhibit_resize, "frame-inhibit-resize"); DEFSYM (Qx_set_fullscreen, "x-set-fullscreen"); DEFSYM (Qx_check_fullscreen, "x-check-fullscreen"); - DEFSYM (Qx_set_window_size_1, "x-set-window-size-1"); DEFSYM (Qxg_frame_resized, "xg-frame-resized"); DEFSYM (Qxg_frame_set_char_size_1, "xg-frame-set-char-size-1"); DEFSYM (Qxg_frame_set_char_size_2, "xg-frame-set-char-size-2"); @@ -4922,7 +4921,6 @@ syms_of_frame (void) DEFSYM (Qset_window_configuration, "set-window-configuration"); DEFSYM (Qx_create_frame_1, "x-create-frame-1"); DEFSYM (Qx_create_frame_2, "x-create-frame-2"); - DEFSYM (Qtip_frame, "tip-frame"); DEFSYM (Qterminal_frame, "terminal-frame"); #ifdef HAVE_NS @@ -5074,12 +5072,10 @@ The pointer becomes visible again when the mouse is moved. */); DEFVAR_LISP ("focus-in-hook", Vfocus_in_hook, doc: /* Normal hook run when a frame gains input focus. */); Vfocus_in_hook = Qnil; - DEFSYM (Qfocus_in_hook, "focus-in-hook"); DEFVAR_LISP ("focus-out-hook", Vfocus_out_hook, doc: /* Normal hook run when a frame loses input focus. */); Vfocus_out_hook = Qnil; - DEFSYM (Qfocus_out_hook, "focus-out-hook"); DEFVAR_LISP ("delete-frame-functions", Vdelete_frame_functions, 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) /* Fontconfig's generic families and their aliases. */ DEFSYM (Qmonospace, "monospace"); DEFSYM (Qsans_serif, "sans-serif"); - DEFSYM (Qserif, "serif"); DEFSYM (Qsans, "sans"); DEFSYM (Qsans__serif, "sans serif"); 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) void syms_of_gfilenotify (void) { - DEFSYM (Qgfile_add_watch, "gfile-add-watch"); defsubr (&Sgfile_add_watch); - - DEFSYM (Qgfile_rm_watch, "gfile-rm-watch"); defsubr (&Sgfile_rm_watch); /* 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) #ifdef HAVE_GNUTLS gnutls_global_initialized = 0; - DEFSYM (Qgnutls_dll, "gnutls"); DEFSYM (Qgnutls_code, "gnutls-code"); DEFSYM (Qgnutls_anon, "gnutls-anon"); DEFSYM (Qgnutls_x509pki, "gnutls-x509pki"); @@ -1669,7 +1668,6 @@ syms_of_gnutls (void) DEFSYM (QCgnutls_bootprop_trustfiles, ":trustfiles"); DEFSYM (QCgnutls_bootprop_keylist, ":keylist"); DEFSYM (QCgnutls_bootprop_crlfiles, ":crlfiles"); - DEFSYM (QCgnutls_bootprop_callbacks, ":callbacks"); DEFSYM (QCgnutls_bootprop_min_prime_bits, ":min-prime-bits"); DEFSYM (QCgnutls_bootprop_loglevel, ":loglevel"); 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. */); DEFSYM (QCcolor_symbols, ":color-symbols"); DEFSYM (QCheuristic_mask, ":heuristic-mask"); DEFSYM (QCindex, ":index"); - DEFSYM (QCgeometry, ":geometry"); DEFSYM (QCcrop, ":crop"); DEFSYM (QCrotation, ":rotation"); DEFSYM (QCmatrix, ":matrix"); @@ -9792,7 +9791,6 @@ non-numeric, there is no explicit limit on the size of images. */); #ifdef HAVE_GHOSTSCRIPT ADD_IMAGE_TYPE (Qpostscript); DEFSYM (QCloader, ":loader"); - DEFSYM (QCbounding_box, ":bounding-box"); DEFSYM (QCpt_width, ":pt-width"); DEFSYM (QCpt_height, ":pt-height"); #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) tool_bar_items_vector = Qnil; DEFSYM (Qtimer_event_handler, "timer-event-handler"); - DEFSYM (Qdisabled_command_function, "disabled-command-function"); - DEFSYM (Qself_insert_command, "self-insert-command"); - DEFSYM (Qforward_char, "forward-char"); - DEFSYM (Qbackward_char, "backward-char"); /* Non-nil disable property on a command means do not execute it; call disabled-command-function's value instead. */ @@ -11185,7 +11181,6 @@ syms_of_keyboard (void) DEFSYM (Qhandle_switch_frame, "handle-switch-frame"); DEFSYM (Qhandle_select_window, "handle-select-window"); - DEFSYM (Qinput_method_function, "input-method-function"); DEFSYM (Qinput_method_exit_on_first_char, "input-method-exit-on-first-char"); DEFSYM (Qinput_method_use_echo_area, "input-method-use-echo-area"); 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. */); intern_c_string ("mouse-4"), intern_c_string ("mouse-5")); - DEFSYM (Qsingle_key_description, "single-key-description"); - DEFSYM (Qkey_description, "key-description"); - /* Keymap used for minibuffers when doing completion. */ /* Keymap used for minibuffers when doing completion and require a match. */ 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) void syms_of_macros (void) { - DEFSYM (Qexecute_kbd_macro, "execute-kbd-macro"); - DEFVAR_LISP ("kbd-macro-termination-hook", Vkbd_macro_termination_hook, doc: /* Normal hook run whenever a keyboard macro terminates. This 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) staticpro (&minibuf_save_list); DEFSYM (Qcompletion_ignore_case, "completion-ignore-case"); - DEFSYM (Qread_file_name_internal, "read-file-name-internal"); DEFSYM (Qminibuffer_default, "minibuffer-default"); Fset (Qminibuffer_default, Qnil); DEFSYM (Qminibuffer_completion_table, "minibuffer-completion-table"); - DEFSYM (Qminibuffer_completion_confirm, "minibuffer-completion-confirm"); - DEFSYM (Qminibuffer_completion_predicate, "minibuffer-completion-predicate"); staticpro (&last_minibuf_string); last_minibuf_string = Qnil; @@ -1944,8 +1941,6 @@ syms_of_minibuf (void) For example, `eval-expression' uses this. */); Vread_expression_history = Qnil; - DEFSYM (Qread_expression_history, "read-expression-history"); - DEFVAR_LISP ("read-buffer-function", Vread_buffer_function, doc: /* If this is non-nil, `read-buffer' does its work by calling this function. The 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) DEFSYM (Qcondensed, "condensed"); DEFSYM (Qexpanded, "expanded"); DEFSYM (Qapple, "apple"); - DEFSYM (Qroman, "roman"); DEFSYM (Qmedium, "medium"); DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script, 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'. A value of nil means to use the shortest notation that represents the number without losing information. */); Vfloat_output_format = Qnil; - DEFSYM (Qfloat_output_format, "float-output-format"); DEFVAR_LISP ("print-length", Vprint_length, 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) DEFSYM (QClog, ":log"); DEFSYM (QCnoquery, ":noquery"); DEFSYM (QCstop, ":stop"); - DEFSYM (QCoptions, ":options"); DEFSYM (QCplist, ":plist"); DEFSYM (QCcommand, ":command"); 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 /* Common attributes one might give text. */ - DEFSYM (Qforeground, "foreground"); - DEFSYM (Qbackground, "background"); DEFSYM (Qfont, "font"); DEFSYM (Qface, "face"); - DEFSYM (Qstipple, "stipple"); - DEFSYM (Qunderline, "underline"); DEFSYM (Qread_only, "read-only"); DEFSYM (Qinvisible, "invisible"); DEFSYM (Qintangible, "intangible"); @@ -2395,8 +2391,6 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and /* Properties that text might use to specify certain actions. */ - DEFSYM (Qmouse_left, "mouse-left"); - DEFSYM (Qmouse_entered, "mouse-entered"); DEFSYM (Qpoint_left, "point-left"); DEFSYM (Qpoint_entered, "point-entered"); 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) DEFSYM (Qworkarea, "workarea"); DEFSYM (Qmm_size, "mm-size"); DEFSYM (Qframes, "frames"); + DEFSYM (Qtip_frame, "tip-frame"); + DEFSYM (Qunicode_sip, "unicode-sip"); + + /* Symbols used elsewhere, but only in MS-Windows-specific code. */ + DEFSYM (Qgnutls_dll, "gnutls"); + DEFSYM (Qlibxml2_dll, "libxml2"); + DEFSYM (Qserif, "serif"); + DEFSYM (Qzlib_dll, "zlib"); Fput (Qundefined_color, Qerror_conditions, 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) DEFSYM (Qwindow_size, "window-size"); DEFSYM (Qtemp_buffer_show_hook, "temp-buffer-show-hook"); DEFSYM (Qabove, "above"); - DEFSYM (Qbelow, "below"); DEFSYM (Qclone_of, "clone-of"); DEFSYM (Qfloor, "floor"); 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. */); DEFSYM (Qcircle, "circle"); DEFSYM (Qpoly, "poly"); - /* The symbol `inhibit-menubar-update' and its DEFVAR_BOOL variable. */ DEFSYM (Qinhibit_menubar_update, "inhibit-menubar-update"); - DEFSYM (Qmessage_truncate_lines, "message-truncate-lines"); DEFSYM (Qgrow_only, "grow-only"); 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) /* Names of basic faces. */ DEFSYM (Qdefault, "default"); DEFSYM (Qtool_bar, "tool-bar"); - DEFSYM (Qregion, "region"); DEFSYM (Qfringe, "fringe"); DEFSYM (Qheader_line, "header-line"); DEFSYM (Qscroll_bar, "scroll-bar"); @@ -6400,13 +6399,6 @@ syms_of_xfaces (void) /* The name of the function used to compute colors on TTYs. */ DEFSYM (Qtty_color_alist, "tty-color-alist"); - /* Allowed scalable fonts. A value of nil means don't allow any - scalable fonts. A value of t means allow the use of any scalable - font. Otherwise, value must be a list of regular expressions. A - font may be scaled if its name matches a regular expression in the - list. */ - DEFSYM (Qscalable_fonts_allowed, "scalable-fonts-allowed"); - Vparam_value_alist = list1 (Fcons (Qnil, Qnil)); staticpro (&Vparam_value_alist); 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) { defsubr (&Slibxml_parse_html_region); defsubr (&Slibxml_parse_xml_region); - - DEFSYM (Qlibxml2_dll, "libxml2"); } #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 DEFSYM (QEMACS_TMP, "_EMACS_TMP_"); DEFSYM (QTARGETS, "TARGETS"); DEFSYM (QATOM, "ATOM"); - DEFSYM (QATOM_PAIR, "ATOM_PAIR"); DEFSYM (QCLIPBOARD_MANAGER, "CLIPBOARD_MANAGER"); DEFSYM (QSAVE_TARGETS, "SAVE_TARGETS"); DEFSYM (QNULL, "NULL"); - DEFSYM (Qcompound_text_with_extensions, "compound-text-with-extensions"); DEFSYM (Qforeign_selection, "foreign-selection"); DEFSYM (Qx_lost_selection_functions, "x-lost-selection-functions"); DEFSYM (Qx_sent_selection_functions, "x-sent-selection-functions"); -- 2.11.4.GIT