From 955cbe7b1720f09b2991b7d981147d9cc79d52e3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 10 Apr 2011 20:39:45 -0700 Subject: [PATCH] Declare Lisp_Object Q* variables to be 'static' if not exproted. This makes it easier for human readers (and static analyzers) to see whether these variables are used from other modules. * alloc.c, buffer.c, bytecode.c, callint.c, casetab.c, category.c: * ccl.c, character.c, charset.c, cmds.c, coding.c, composite.c: * data.c, dbusbind.c, dired.c, editfns.c, eval.c, fileio.c, fns.c: * font.c, frame.c, fringe.c, ftfont.c, image.c, keyboard.c, keymap.c: * lread.c, macros.c, minibuf.c, print.c, process.c, search.c: * sound.c, syntax.c, textprop.c, window.c, xdisp.c, xfaces.c, xfns.c: * xmenu.c, xselect.c: Declare Q* vars static if they are not used in other modules. * ccl.h, character.h, charset.h, coding.h, composite.h, font.h: * frame.h, intervals.h, keyboard.h, lisp.h, process.h, syntax.h: Remove decls of unexported vars. * keyboard.h (EVENT_HEAD_UNMODIFIED): Remove now-unused macro. --- src/ChangeLog | 16 +++++++++ src/alloc.c | 5 +-- src/buffer.c | 23 ++++++------ src/bytecode.c | 1 - src/callint.c | 9 ++--- src/casetab.c | 2 +- src/category.c | 2 +- src/ccl.c | 8 ++--- src/ccl.h | 5 --- src/character.c | 2 +- src/character.h | 2 +- src/charset.c | 10 +++--- src/charset.h | 2 +- src/cmds.c | 4 +-- src/coding.c | 35 ++++++++++--------- src/coding.h | 4 +-- src/composite.c | 4 +-- src/composite.h | 2 -- src/data.c | 27 ++++++++------ src/dbusbind.c | 58 +++++++++++++++--------------- src/dired.c | 14 ++++---- src/editfns.c | 4 +-- src/eval.c | 9 ++--- src/fileio.c | 83 +++++++++++++++++++++---------------------- src/fns.c | 16 +++++---- src/font.c | 10 +++--- src/font.h | 3 +- src/frame.c | 17 ++++----- src/frame.h | 3 +- src/fringe.c | 6 ++-- src/ftfont.c | 2 +- src/image.c | 30 +++++++++------- src/intervals.h | 6 ++-- src/keyboard.c | 93 +++++++++++++++++++++++++++---------------------- src/keyboard.h | 13 ++----- src/keymap.c | 9 ++--- src/lisp.h | 34 ++++++++---------- src/lread.c | 25 ++++++------- src/macros.c | 3 +- src/minibuf.c | 28 +++++++-------- src/print.c | 6 ++-- src/process.c | 26 +++++++------- src/process.h | 3 +- src/search.c | 4 +-- src/sound.c | 6 ++-- src/syntax.c | 3 +- src/syntax.h | 2 -- src/textprop.c | 11 +++--- src/window.c | 11 +++--- src/xdisp.c | 63 ++++++++++++++++++--------------- src/xfaces.c | 57 +++++++++++++++++------------- src/xfns.c | 8 ++--- src/xmenu.c | 2 +- src/xselect.c | 8 ++--- 54 files changed, 441 insertions(+), 398 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8d492d1cdf..0be406a6e7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,21 @@ 2011-04-11 Paul Eggert + Declare Lisp_Object Q* variables to be 'static' if not exproted. + This makes it easier for human readers (and static analyzers) + to see whether these variables are used from other modules. + * alloc.c, buffer.c, bytecode.c, callint.c, casetab.c, category.c: + * ccl.c, character.c, charset.c, cmds.c, coding.c, composite.c: + * data.c, dbusbind.c, dired.c, editfns.c, eval.c, fileio.c, fns.c: + * font.c, frame.c, fringe.c, ftfont.c, image.c, keyboard.c, keymap.c: + * lread.c, macros.c, minibuf.c, print.c, process.c, search.c: + * sound.c, syntax.c, textprop.c, window.c, xdisp.c, xfaces.c, xfns.c: + * xmenu.c, xselect.c: + Declare Q* vars static if they are not used in other modules. + * ccl.h, character.h, charset.h, coding.h, composite.h, font.h: + * frame.h, intervals.h, keyboard.h, lisp.h, process.h, syntax.h: + Remove decls of unexported vars. + * keyboard.h (EVENT_HEAD_UNMODIFIED): Remove now-unused macro. + * lisp.h (DEFINE_FUNC): Make sname 'static'. Make Emacs functions such as Fatom 'static' by default. diff --git a/src/alloc.c b/src/alloc.c index 1396586ba3..ad3dfa96cd 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -264,11 +264,12 @@ static size_t stack_copy_size; static int ignore_warnings; -Lisp_Object Qgc_cons_threshold, Qchar_table_extra_slots; +static Lisp_Object Qgc_cons_threshold; +Lisp_Object Qchar_table_extra_slots; /* Hook run after GC has finished. */ -Lisp_Object Qpost_gc_hook; +static Lisp_Object Qpost_gc_hook; static void mark_buffer (Lisp_Object); static void mark_terminals (void); diff --git a/src/buffer.c b/src/buffer.c index a88afbb36e..82913ac20e 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -113,30 +113,31 @@ static void reset_buffer_local_variables (struct buffer *b, int permanent_too); to prevent lossage due to user rplac'ing this alist or its elements. */ Lisp_Object Vbuffer_alist; -Lisp_Object Qkill_buffer_query_functions; +static Lisp_Object Qkill_buffer_query_functions; /* Hook run before changing a major mode. */ -Lisp_Object Qchange_major_mode_hook; +static Lisp_Object Qchange_major_mode_hook; Lisp_Object Qfirst_change_hook; Lisp_Object Qbefore_change_functions; Lisp_Object Qafter_change_functions; -Lisp_Object Qucs_set_table_for_input; +static Lisp_Object Qucs_set_table_for_input; -Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; -Lisp_Object Qpermanent_local_hook; +static Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; +static Lisp_Object Qpermanent_local_hook; -Lisp_Object Qprotected_field; +static Lisp_Object Qprotected_field; -Lisp_Object QSFundamental; /* A string "Fundamental" */ +static Lisp_Object QSFundamental; /* A string "Fundamental" */ -Lisp_Object Qkill_buffer_hook; +static Lisp_Object Qkill_buffer_hook; -Lisp_Object Qget_file_buffer; +static Lisp_Object Qget_file_buffer; -Lisp_Object Qoverlayp; +static Lisp_Object Qoverlayp; -Lisp_Object Qpriority, Qevaporate, Qbefore_string, Qafter_string; +Lisp_Object Qpriority, Qbefore_string, Qafter_string; +static Lisp_Object Qevaporate; Lisp_Object Qmodification_hooks; Lisp_Object Qinsert_in_front_hooks; diff --git a/src/bytecode.c b/src/bytecode.c index b4a5354a0a..581e16678a 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -80,7 +80,6 @@ Lisp_Object Qbyte_code_meter; Lisp_Object Qbytecode; -extern Lisp_Object Qand_optional, Qand_rest; /* Byte codes: */ diff --git a/src/callint.c b/src/callint.c index 1de1f60787..e491e4e595 100644 --- a/src/callint.c +++ b/src/callint.c @@ -30,14 +30,15 @@ along with GNU Emacs. If not, see . */ Lisp_Object Qminus, Qplus; Lisp_Object Qcall_interactively; -Lisp_Object Qcommand_debug_status; -Lisp_Object Qenable_recursive_minibuffers; +static Lisp_Object Qcommand_debug_status; +static Lisp_Object Qenable_recursive_minibuffers; -Lisp_Object Qhandle_shift_selection; +static Lisp_Object Qhandle_shift_selection; Lisp_Object Qmouse_leave_buffer_hook; -Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif, Qwhen; +static Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif; +Lisp_Object Qwhen; static Lisp_Object preserved_fns; /* Marker used within call-interactively to refer to point. */ diff --git a/src/casetab.c b/src/casetab.c index 7acefbceba..691dbc8c08 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -24,7 +24,7 @@ along with GNU Emacs. If not, see . */ #include "buffer.h" #include "character.h" -Lisp_Object Qcase_table_p, Qcase_table; +static Lisp_Object Qcase_table_p, Qcase_table; Lisp_Object Vascii_downcase_table, Vascii_upcase_table; Lisp_Object Vascii_canon_table, Vascii_eqv_table; diff --git a/src/category.c b/src/category.c index bba030360c..5dcc4894f0 100644 --- a/src/category.c +++ b/src/category.c @@ -48,7 +48,7 @@ along with GNU Emacs. If not, see . */ For the moment, we are not using this feature. */ static int category_table_version; -Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p; +static Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p; /* Temporary internal variable used in macro CHAR_HAS_CATEGORY. */ Lisp_Object _temp_category_set; diff --git a/src/ccl.c b/src/ccl.c index 2f7c4b0731..e09cf4f86d 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -38,16 +38,16 @@ Lisp_Object Qccl, Qcclp; /* This symbol is a property which associates with ccl program vector. Ex: (get 'ccl-big5-encoder 'ccl-program) returns ccl program vector. */ -Lisp_Object Qccl_program; +static Lisp_Object Qccl_program; /* These symbols are properties which associate with code conversion map and their ID respectively. */ -Lisp_Object Qcode_conversion_map; -Lisp_Object Qcode_conversion_map_id; +static Lisp_Object Qcode_conversion_map; +static Lisp_Object Qcode_conversion_map_id; /* Symbols of ccl program have this property, a value of the property is an index for Vccl_protram_table. */ -Lisp_Object Qccl_program_idx; +static Lisp_Object Qccl_program_idx; /* Table of registered CCL programs. Each element is a vector of NAME, CCL_PROG, RESOLVEDP, and UPDATEDP, where NAME (symbol) is the diff --git a/src/ccl.h b/src/ccl.h index 8c1f5e5cbd..98a4008e59 100644 --- a/src/ccl.h +++ b/src/ccl.h @@ -105,10 +105,6 @@ extern void ccl_driver (struct ccl_program *, int *, int *, int, int, /* Vector of CCL program names vs corresponding program data. */ extern Lisp_Object Vccl_program_table; -/* Symbols of ccl program have this property, a value of the property - is an index for Vccl_protram_table. */ -extern Lisp_Object Qccl_program_idx; - extern Lisp_Object Qccl, Qcclp; EXFUN (Fccl_program_p, 1); @@ -120,4 +116,3 @@ EXFUN (Fccl_program_p, 1); } while (0); #endif /* EMACS_CCL_H */ - diff --git a/src/character.c b/src/character.c index 636601c745..e00168c6ab 100644 --- a/src/character.c +++ b/src/character.c @@ -50,7 +50,7 @@ along with GNU Emacs. If not, see . */ Lisp_Object Qcharacterp; -Lisp_Object Qauto_fill_chars; +static Lisp_Object Qauto_fill_chars; /* Char-table of information about which character to unify to which Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */ diff --git a/src/character.h b/src/character.h index 7a75ac186f..864882db7f 100644 --- a/src/character.h +++ b/src/character.h @@ -615,7 +615,7 @@ extern EMACS_INT c_string_width (const unsigned char *, EMACS_INT, int, extern EMACS_INT lisp_string_width (Lisp_Object, int, EMACS_INT *, EMACS_INT *); -extern Lisp_Object Qcharacterp, Qauto_fill_chars; +extern Lisp_Object Qcharacterp; extern Lisp_Object Vchar_unify_table; extern Lisp_Object string_escape_byte8 (Lisp_Object); diff --git a/src/charset.c b/src/charset.c index 00206cccf0..dc91cea2e1 100644 --- a/src/charset.c +++ b/src/charset.c @@ -68,10 +68,10 @@ Lisp_Object Qcharsetp; /* Special charset symbols. */ Lisp_Object Qascii; -Lisp_Object Qeight_bit; -Lisp_Object Qiso_8859_1; -Lisp_Object Qunicode; -Lisp_Object Qemacs; +static Lisp_Object Qeight_bit; +static Lisp_Object Qiso_8859_1; +static Lisp_Object Qunicode; +static Lisp_Object Qemacs; /* The corresponding charsets. */ int charset_ascii; @@ -87,7 +87,7 @@ int charset_jisx0208; int charset_ksc5601; /* Value of charset attribute `charset-iso-plane'. */ -Lisp_Object Qgl, Qgr; +static Lisp_Object Qgl, Qgr; /* Charset of unibyte characters. */ int charset_unibyte; diff --git a/src/charset.h b/src/charset.h index 8c87ffe6c3..fef50394e6 100644 --- a/src/charset.h +++ b/src/charset.h @@ -517,7 +517,7 @@ extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL]; extern Lisp_Object Qcharsetp; -extern Lisp_Object Qascii, Qunicode; +extern Lisp_Object Qascii; extern int charset_ascii, charset_eight_bit; extern int charset_iso_8859_1; extern int charset_unicode; diff --git a/src/cmds.c b/src/cmds.c index 6031822583..baf1477814 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -31,10 +31,10 @@ along with GNU Emacs. If not, see . */ #include "dispextern.h" #include "frame.h" -Lisp_Object Qkill_forward_chars, Qkill_backward_chars; +static Lisp_Object Qkill_forward_chars, Qkill_backward_chars; /* A possible value for a buffer's overwrite-mode variable. */ -Lisp_Object Qoverwrite_mode_binary; +static Lisp_Object Qoverwrite_mode_binary; static int internal_self_insert (int, EMACS_INT); diff --git a/src/coding.c b/src/coding.c index 13fcb7fb8a..d2124db73f 100644 --- a/src/coding.c +++ b/src/coding.c @@ -300,27 +300,30 @@ encode_coding_XXX (struct coding_system *coding) Lisp_Object Vcoding_system_hash_table; -Lisp_Object Qcoding_system, Qcoding_aliases, Qeol_type; +static Lisp_Object Qcoding_system, Qeol_type; +static Lisp_Object Qcoding_aliases; Lisp_Object Qunix, Qdos; Lisp_Object Qbuffer_file_coding_system; -Lisp_Object Qpost_read_conversion, Qpre_write_conversion; -Lisp_Object Qdefault_char; +static Lisp_Object Qpost_read_conversion, Qpre_write_conversion; +static Lisp_Object Qdefault_char; Lisp_Object Qno_conversion, Qundecided; -Lisp_Object Qcharset, Qiso_2022, Qutf_8, Qutf_16, Qshift_jis, Qbig5; -Lisp_Object Qbig, Qlittle; -Lisp_Object Qcoding_system_history; -Lisp_Object Qvalid_codes; -Lisp_Object QCcategory, QCmnemonic, QCdefault_char; -Lisp_Object QCdecode_translation_table, QCencode_translation_table; -Lisp_Object QCpost_read_conversion, QCpre_write_conversion; -Lisp_Object QCascii_compatible_p; +Lisp_Object Qcharset, Qutf_8; +static Lisp_Object Qiso_2022; +static Lisp_Object Qutf_16, Qshift_jis, Qbig5; +static Lisp_Object Qbig, Qlittle; +static Lisp_Object Qcoding_system_history; +static Lisp_Object Qvalid_codes; +static Lisp_Object QCcategory, QCmnemonic, QCdefault_char; +static Lisp_Object QCdecode_translation_table, QCencode_translation_table; +static Lisp_Object QCpost_read_conversion, QCpre_write_conversion; +static Lisp_Object QCascii_compatible_p; Lisp_Object Qcall_process, Qcall_process_region; Lisp_Object Qstart_process, Qopen_network_stream; -Lisp_Object Qtarget_idx; +static Lisp_Object Qtarget_idx; -Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source; -Lisp_Object Qinterrupted, Qinsufficient_memory; +static Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source; +static Lisp_Object Qinterrupted, Qinsufficient_memory; /* If a symbol has this property, evaluate the value to define the symbol as a coding system. */ @@ -351,8 +354,8 @@ struct coding_system safe_terminal_coding; Lisp_Object Qtranslation_table; Lisp_Object Qtranslation_table_id; -Lisp_Object Qtranslation_table_for_decode; -Lisp_Object Qtranslation_table_for_encode; +static Lisp_Object Qtranslation_table_for_decode; +static Lisp_Object Qtranslation_table_for_encode; /* Two special coding systems. */ Lisp_Object Vsjis_coding_system; diff --git a/src/coding.h b/src/coding.h index 8414a2fe13..ff7fcc7c3a 100644 --- a/src/coding.h +++ b/src/coding.h @@ -757,10 +757,9 @@ extern Lisp_Object preferred_coding_system (void); extern Lisp_Object Qutf_8, Qutf_8_emacs; -extern Lisp_Object Qcoding_system, Qeol_type, Qcoding_category_index; +extern Lisp_Object Qcoding_category_index; extern Lisp_Object Qcoding_system_p; extern Lisp_Object Qraw_text, Qemacs_mule, Qno_conversion, Qundecided; -extern Lisp_Object Qiso_2022; extern Lisp_Object Qbuffer_file_coding_system; extern Lisp_Object Qunix, Qdos, Qmac; @@ -789,4 +788,3 @@ extern char emacs_mule_bytes[256]; extern int emacs_mule_string_char (unsigned char *); #endif /* EMACS_CODING_H */ - diff --git a/src/composite.c b/src/composite.c index 367606f514..cccc75cc1b 100644 --- a/src/composite.c +++ b/src/composite.c @@ -152,8 +152,8 @@ int n_compositions; COMPOSITION-ID. */ Lisp_Object composition_hash_table; -Lisp_Object Qauto_composed; -Lisp_Object Qauto_composition_function; +static Lisp_Object Qauto_composed; +static Lisp_Object Qauto_composition_function; /* Maximum number of characters to look back for auto-compositions. */ #define MAX_AUTO_COMPOSITION_LOOKBACK 3 diff --git a/src/composite.h b/src/composite.h index 1f708e93b8..5188f981d9 100644 --- a/src/composite.h +++ b/src/composite.h @@ -216,8 +216,6 @@ extern int n_compositions; extern Lisp_Object Qcomposition; extern Lisp_Object composition_hash_table; -extern Lisp_Object Qauto_composed; -extern Lisp_Object Qauto_composition_function; extern int get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT, Lisp_Object, Lisp_Object); extern int find_composition (EMACS_INT, EMACS_INT, EMACS_INT *, EMACS_INT *, diff --git a/src/data.c b/src/data.c index 25e260c868..68ceff4d23 100644 --- a/src/data.c +++ b/src/data.c @@ -52,26 +52,33 @@ along with GNU Emacs. If not, see . */ extern double atof (const char *); #endif /* !atof */ -Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; +Lisp_Object Qnil, Qt, Qquote, Qlambda, Qunbound; +static Lisp_Object Qsubr; Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; -Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; -Lisp_Object Qvoid_variable, Qvoid_function, Qcyclic_function_indirection; -Lisp_Object Qcyclic_variable_indirection, Qcircular_list; -Lisp_Object Qsetting_constant, Qinvalid_read_syntax; +Lisp_Object Qerror, Qquit, Qargs_out_of_range; +static Lisp_Object Qwrong_type_argument; +Lisp_Object Qvoid_variable, Qvoid_function; +static Lisp_Object Qcyclic_function_indirection; +static Lisp_Object Qcyclic_variable_indirection; +Lisp_Object Qcircular_list; +static Lisp_Object Qsetting_constant; +Lisp_Object Qinvalid_read_syntax; Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; Lisp_Object Qtext_read_only; -Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; +Lisp_Object Qintegerp, Qwholenump, Qsymbolp, Qlistp, Qconsp; +static Lisp_Object Qnatnump; Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; -Lisp_Object Qbuffer_or_string_p, Qkeywordp; -Lisp_Object Qboundp, Qfboundp; +Lisp_Object Qbuffer_or_string_p; +static Lisp_Object Qkeywordp, Qboundp; +Lisp_Object Qfboundp; Lisp_Object Qchar_table_p, Qvector_or_char_table_p; Lisp_Object Qcdr; -Lisp_Object Qad_advice_info, Qad_activate_internal; +static Lisp_Object Qad_advice_info, Qad_activate_internal; Lisp_Object Qrange_error, Qdomain_error, Qsingularity_error; Lisp_Object Qoverflow_error, Qunderflow_error; @@ -83,7 +90,7 @@ Lisp_Object Qinteger; static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; Lisp_Object Qwindow; static Lisp_Object Qfloat, Qwindow_configuration; -Lisp_Object Qprocess; +static Lisp_Object Qprocess; static Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector; static Lisp_Object Qchar_table, Qbool_vector, Qhash_table; static Lisp_Object Qsubrp, Qmany, Qunevalled; diff --git a/src/dbusbind.c b/src/dbusbind.c index 8a6870555d..b986724d79 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -30,50 +30,50 @@ along with GNU Emacs. If not, see . */ /* Subroutines. */ -Lisp_Object Qdbus_init_bus; -Lisp_Object Qdbus_close_bus; -Lisp_Object Qdbus_get_unique_name; -Lisp_Object Qdbus_call_method; -Lisp_Object Qdbus_call_method_asynchronously; -Lisp_Object Qdbus_method_return_internal; -Lisp_Object Qdbus_method_error_internal; -Lisp_Object Qdbus_send_signal; -Lisp_Object Qdbus_register_service; -Lisp_Object Qdbus_register_signal; -Lisp_Object Qdbus_register_method; +static Lisp_Object Qdbus_init_bus; +static Lisp_Object Qdbus_close_bus; +static Lisp_Object Qdbus_get_unique_name; +static Lisp_Object Qdbus_call_method; +static Lisp_Object Qdbus_call_method_asynchronously; +static Lisp_Object Qdbus_method_return_internal; +static Lisp_Object Qdbus_method_error_internal; +static Lisp_Object Qdbus_send_signal; +static Lisp_Object Qdbus_register_service; +static Lisp_Object Qdbus_register_signal; +static Lisp_Object Qdbus_register_method; /* D-Bus error symbol. */ -Lisp_Object Qdbus_error; +static Lisp_Object Qdbus_error; /* Lisp symbols of the system and session buses. */ -Lisp_Object QCdbus_system_bus, QCdbus_session_bus; +static Lisp_Object QCdbus_system_bus, QCdbus_session_bus; /* Lisp symbol for method call timeout. */ -Lisp_Object QCdbus_timeout; +static Lisp_Object QCdbus_timeout; /* Lisp symbols for name request flags. */ -Lisp_Object QCdbus_request_name_allow_replacement; -Lisp_Object QCdbus_request_name_replace_existing; -Lisp_Object QCdbus_request_name_do_not_queue; +static Lisp_Object QCdbus_request_name_allow_replacement; +static Lisp_Object QCdbus_request_name_replace_existing; +static Lisp_Object QCdbus_request_name_do_not_queue; /* Lisp symbols for name request replies. */ -Lisp_Object QCdbus_request_name_reply_primary_owner; -Lisp_Object QCdbus_request_name_reply_in_queue; -Lisp_Object QCdbus_request_name_reply_exists; -Lisp_Object QCdbus_request_name_reply_already_owner; +static Lisp_Object QCdbus_request_name_reply_primary_owner; +static Lisp_Object QCdbus_request_name_reply_in_queue; +static Lisp_Object QCdbus_request_name_reply_exists; +static Lisp_Object QCdbus_request_name_reply_already_owner; /* Lisp symbols of D-Bus types. */ -Lisp_Object QCdbus_type_byte, QCdbus_type_boolean; -Lisp_Object QCdbus_type_int16, QCdbus_type_uint16; -Lisp_Object QCdbus_type_int32, QCdbus_type_uint32; -Lisp_Object QCdbus_type_int64, QCdbus_type_uint64; -Lisp_Object QCdbus_type_double, QCdbus_type_string; -Lisp_Object QCdbus_type_object_path, QCdbus_type_signature; +static Lisp_Object QCdbus_type_byte, QCdbus_type_boolean; +static Lisp_Object QCdbus_type_int16, QCdbus_type_uint16; +static Lisp_Object QCdbus_type_int32, QCdbus_type_uint32; +static Lisp_Object QCdbus_type_int64, QCdbus_type_uint64; +static Lisp_Object QCdbus_type_double, QCdbus_type_string; +static Lisp_Object QCdbus_type_object_path, QCdbus_type_signature; #ifdef DBUS_TYPE_UNIX_FD Lisp_Object QCdbus_type_unix_fd; #endif -Lisp_Object QCdbus_type_array, QCdbus_type_variant; -Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; +static Lisp_Object QCdbus_type_array, QCdbus_type_variant; +static Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; /* Whether we are reading a D-Bus event. */ int xd_in_read_queued_messages = 0; diff --git a/src/dired.c b/src/dired.c index f5fc1e3a62..2b0ef275cd 100644 --- a/src/dired.c +++ b/src/dired.c @@ -79,12 +79,12 @@ extern struct direct *readdir (DIR *); #include "regex.h" #include "blockinput.h" -Lisp_Object Qdirectory_files; -Lisp_Object Qdirectory_files_and_attributes; -Lisp_Object Qfile_name_completion; -Lisp_Object Qfile_name_all_completions; -Lisp_Object Qfile_attributes; -Lisp_Object Qfile_attributes_lessp; +static Lisp_Object Qdirectory_files; +static Lisp_Object Qdirectory_files_and_attributes; +static Lisp_Object Qfile_name_completion; +static Lisp_Object Qfile_name_all_completions; +static Lisp_Object Qfile_attributes; +static Lisp_Object Qfile_attributes_lessp; static int scmp (const char *, const char *, int); INFUN (Ffile_attributes, 2); @@ -439,7 +439,7 @@ These are all file names in directory DIRECTORY which begin with FILE. */) } static int file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_addr); -Lisp_Object Qdefault_directory; +static Lisp_Object Qdefault_directory; Lisp_Object file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, Lisp_Object predicate) diff --git a/src/editfns.c b/src/editfns.c index 0c34a95b94..afb1e8ebc1 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -107,7 +107,7 @@ static Lisp_Object subst_char_in_region_unwind_1 (Lisp_Object); static void transpose_markers (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT); -Lisp_Object Qbuffer_access_fontify_functions; +static Lisp_Object Qbuffer_access_fontify_functions; INFUN (Fuser_full_name, 1); /* Symbol for the text property used to mark fields. */ @@ -116,7 +116,7 @@ Lisp_Object Qfield; /* A special value for Qfield properties. */ -Lisp_Object Qboundary; +static Lisp_Object Qboundary; void diff --git a/src/eval.c b/src/eval.c index d6d62aa4af..cefdf784fa 100644 --- a/src/eval.c +++ b/src/eval.c @@ -66,12 +66,13 @@ int gcpro_level; Lisp_Object Qautoload, Qmacro, Qexit, Qinteractive, Qcommandp, Qdefun; Lisp_Object Qinhibit_quit; -Lisp_Object Qand_rest, Qand_optional; -Lisp_Object Qdebug_on_error; -Lisp_Object Qdeclare; +Lisp_Object Qand_rest; +static Lisp_Object Qand_optional; +static Lisp_Object Qdebug_on_error; +static Lisp_Object Qdeclare; Lisp_Object Qinternal_interpreter_environment, Qclosure; -Lisp_Object Qdebug; +static Lisp_Object Qdebug; /* This holds either the symbol `run-hooks' or nil. It is nil at an early stage of startup, and when Emacs diff --git a/src/fileio.c b/src/fileio.c index 5ad8b0a33a..fb16decaaa 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -102,20 +102,20 @@ int auto_save_error_occurred; an actual coding system name, but just an indicator to tell insert-file-contents to use `emacs-mule' with a special flag for auto saving and recovering a file. */ -Lisp_Object Qauto_save_coding; +static Lisp_Object Qauto_save_coding; /* Property name of a file name handler, which gives a list of operations it handles.. */ -Lisp_Object Qoperations; +static Lisp_Object Qoperations; /* Lisp functions for translating file formats */ -Lisp_Object Qformat_decode, Qformat_annotate_function; +static Lisp_Object Qformat_decode, Qformat_annotate_function; /* Lisp function for setting buffer-file-coding-system and the multibyteness of the current buffer after inserting a file. */ -Lisp_Object Qafter_insert_file_set_coding; +static Lisp_Object Qafter_insert_file_set_coding; -Lisp_Object Qwrite_region_annotate_functions; +static Lisp_Object Qwrite_region_annotate_functions; /* Each time an annotation function changes the buffer, the new buffer is added here. */ Lisp_Object Vwrite_region_annotation_buffers; @@ -123,25 +123,26 @@ Lisp_Object Vwrite_region_annotation_buffers; #ifdef HAVE_FSYNC #endif -Lisp_Object Qdelete_by_moving_to_trash; +static Lisp_Object Qdelete_by_moving_to_trash; /* Lisp function for moving files to trash. */ -Lisp_Object Qmove_file_to_trash; +static Lisp_Object Qmove_file_to_trash; /* Lisp function for recursively copying directories. */ -Lisp_Object Qcopy_directory; +static Lisp_Object Qcopy_directory; /* Lisp function for recursively deleting directories. */ -Lisp_Object Qdelete_directory; +static Lisp_Object Qdelete_directory; #ifdef WINDOWSNT #endif -Lisp_Object Qfile_error, Qfile_already_exists, Qfile_date_error; -Lisp_Object Qexcl; +Lisp_Object Qfile_error; +static Lisp_Object Qfile_already_exists, Qfile_date_error; +static Lisp_Object Qexcl; Lisp_Object Qfile_name_history; -Lisp_Object Qcar_less_than_car; +static Lisp_Object Qcar_less_than_car; INFUN (Fmake_symbolic_link, 3); static int a_write (int, Lisp_Object, int, int, @@ -205,40 +206,40 @@ restore_point_unwind (Lisp_Object location) } -Lisp_Object Qexpand_file_name; -Lisp_Object Qsubstitute_in_file_name; -Lisp_Object Qdirectory_file_name; -Lisp_Object Qfile_name_directory; -Lisp_Object Qfile_name_nondirectory; -Lisp_Object Qunhandled_file_name_directory; -Lisp_Object Qfile_name_as_directory; -Lisp_Object Qcopy_file; -Lisp_Object Qmake_directory_internal; -Lisp_Object Qmake_directory; -Lisp_Object Qdelete_directory_internal; +static Lisp_Object Qexpand_file_name; +static Lisp_Object Qsubstitute_in_file_name; +static Lisp_Object Qdirectory_file_name; +static Lisp_Object Qfile_name_directory; +static Lisp_Object Qfile_name_nondirectory; +static Lisp_Object Qunhandled_file_name_directory; +static Lisp_Object Qfile_name_as_directory; +static Lisp_Object Qcopy_file; +static Lisp_Object Qmake_directory_internal; +static Lisp_Object Qmake_directory; +static Lisp_Object Qdelete_directory_internal; Lisp_Object Qdelete_file; -Lisp_Object Qrename_file; -Lisp_Object Qadd_name_to_file; -Lisp_Object Qmake_symbolic_link; +static Lisp_Object Qrename_file; +static Lisp_Object Qadd_name_to_file; +static Lisp_Object Qmake_symbolic_link; Lisp_Object Qfile_exists_p; -Lisp_Object Qfile_executable_p; -Lisp_Object Qfile_readable_p; -Lisp_Object Qfile_writable_p; -Lisp_Object Qfile_symlink_p; -Lisp_Object Qaccess_file; +static Lisp_Object Qfile_executable_p; +static Lisp_Object Qfile_readable_p; +static Lisp_Object Qfile_writable_p; +static Lisp_Object Qfile_symlink_p; +static Lisp_Object Qaccess_file; Lisp_Object Qfile_directory_p; -Lisp_Object Qfile_regular_p; -Lisp_Object Qfile_accessible_directory_p; -Lisp_Object Qfile_modes; -Lisp_Object Qset_file_modes; -Lisp_Object Qset_file_times; -Lisp_Object Qfile_selinux_context; -Lisp_Object Qset_file_selinux_context; -Lisp_Object Qfile_newer_than_file_p; +static Lisp_Object Qfile_regular_p; +static Lisp_Object Qfile_accessible_directory_p; +static Lisp_Object Qfile_modes; +static Lisp_Object Qset_file_modes; +static Lisp_Object Qset_file_times; +static Lisp_Object Qfile_selinux_context; +static Lisp_Object Qset_file_selinux_context; +static Lisp_Object Qfile_newer_than_file_p; Lisp_Object Qinsert_file_contents; Lisp_Object Qwrite_region; -Lisp_Object Qverify_visited_file_modtime; -Lisp_Object Qset_visited_file_modtime; +static Lisp_Object Qverify_visited_file_modtime; +static Lisp_Object Qset_visited_file_modtime; DEFUE ("find-file-name-handler", Ffind_file_name_handler, Sfind_file_name_handler, 2, 2, 0, diff --git a/src/fns.c b/src/fns.c index f4eaaccda3..9ced09c38f 100644 --- a/src/fns.c +++ b/src/fns.c @@ -49,11 +49,12 @@ along with GNU Emacs. If not, see . */ #define NULL ((POINTER_TYPE *)0) #endif -Lisp_Object Qstring_lessp, Qprovide, Qrequire; -Lisp_Object Qyes_or_no_p_history; +Lisp_Object Qstring_lessp; +static Lisp_Object Qprovide, Qrequire; +static Lisp_Object Qyes_or_no_p_history; Lisp_Object Qcursor_in_echo_area; -Lisp_Object Qwidget_type; -Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper; +static Lisp_Object Qwidget_type; +static Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper; static int internal_equal (Lisp_Object , Lisp_Object, int, int); @@ -2541,7 +2542,7 @@ advisable. */) return ret; } -Lisp_Object Qsubfeatures; +static Lisp_Object Qsubfeatures; DEFUN ("featurep", Ffeaturep, Sfeaturep, 1, 2, 0, doc: /* Return t if FEATURE is present in this Emacs. @@ -3354,9 +3355,10 @@ struct Lisp_Hash_Table *weak_hash_tables; /* Various symbols. */ -Lisp_Object Qhash_table_p, Qeq, Qeql, Qequal, Qkey, Qvalue; +static Lisp_Object Qhash_table_p, Qkey, Qvalue; +Lisp_Object Qeq, Qeql, Qequal; Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness; -Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value; +static Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value; /* Function prototypes. */ diff --git a/src/font.c b/src/font.c index a31a418e64..91cb0a2d52 100644 --- a/src/font.c +++ b/src/font.c @@ -48,7 +48,7 @@ along with GNU Emacs. If not, see . */ #include "nsterm.h" #endif /* HAVE_NS */ -Lisp_Object Qopentype; +static Lisp_Object Qopentype; /* Important character set strings. */ Lisp_Object Qascii_0, Qiso8859_1, Qiso10646_1, Qunicode_bmp, Qunicode_sip; @@ -125,14 +125,16 @@ Lisp_Object QCfoundry; static Lisp_Object QCadstyle, QCregistry; /* Symbols representing keys of font extra info. */ Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript, QCavgwidth; -Lisp_Object QCantialias, QCfont_entity, QCfc_unknown_spec; +Lisp_Object QCantialias, QCfont_entity; +static Lisp_Object QCfc_unknown_spec; /* Symbols representing values of font spacing property. */ -Lisp_Object Qc, Qm, Qp, Qd; +static Lisp_Object Qc, Qm, Qd; +Lisp_Object Qp; /* Special ADSTYLE properties to avoid fonts used for Latin characters; used in xfont.c and ftfont.c. */ Lisp_Object Qja, Qko; -Lisp_Object QCuser_spec; +static Lisp_Object QCuser_spec; /* Alist of font registry symbol and the corresponding charsets information. The information is retrieved from diff --git a/src/font.h b/src/font.h index 511a7de3a1..a9b58eb7c7 100644 --- a/src/font.h +++ b/src/font.h @@ -239,7 +239,7 @@ enum font_property_index ASET ((font), prop, make_number (font_style_to_value (prop, val, 1))) extern Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript; -extern Lisp_Object QCavgwidth, QCantialias, QCfont_entity, QCfc_unknown_spec; +extern Lisp_Object QCavgwidth, QCantialias, QCfont_entity; extern Lisp_Object Qp; @@ -871,4 +871,3 @@ extern void font_deferred_log (const char *, Lisp_Object, Lisp_Object); #endif /* not FONT_DEBUG */ #endif /* not EMACS_FONT_H */ - diff --git a/src/frame.c b/src/frame.c index 6e0e9c4ffc..5493600ce5 100644 --- a/src/frame.c +++ b/src/frame.c @@ -69,10 +69,10 @@ Lisp_Object Qonly; Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; Lisp_Object Qvisible; Lisp_Object Qdisplay_type; -Lisp_Object Qbackground_mode; +static Lisp_Object Qbackground_mode; Lisp_Object Qnoelisp; -Lisp_Object Qx_frame_parameter; +static Lisp_Object Qx_frame_parameter; Lisp_Object Qx_resource_name; Lisp_Object Qterminal; Lisp_Object Qterminal_live_p; @@ -82,7 +82,7 @@ Lisp_Object Qterminal_live_p; Lisp_Object Qauto_raise, Qauto_lower; Lisp_Object Qborder_color, Qborder_width; Lisp_Object Qcursor_color, Qcursor_type; -Lisp_Object Qgeometry; /* Not used */ +static Lisp_Object Qgeometry; /* Not used */ Lisp_Object Qheight, Qwidth; Lisp_Object Qleft, Qright; Lisp_Object Qicon_left, Qicon_top, Qicon_type, Qicon_name; @@ -95,19 +95,20 @@ Lisp_Object Qvisibility; Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background; Lisp_Object Qscreen_gamma; Lisp_Object Qline_spacing; -Lisp_Object Quser_position, Quser_size; +static Lisp_Object Quser_position, Quser_size; Lisp_Object Qwait_for_wm; -Lisp_Object Qwindow_id; +static Lisp_Object Qwindow_id; #ifdef HAVE_X_WINDOWS -Lisp_Object Qouter_window_id; +static Lisp_Object Qouter_window_id; #endif Lisp_Object Qparent_id; Lisp_Object Qtitle, Qname; -Lisp_Object Qexplicit_name; +static Lisp_Object Qexplicit_name; Lisp_Object Qunsplittable; Lisp_Object Qmenu_bar_lines, Qtool_bar_lines, Qtool_bar_position; Lisp_Object Qleft_fringe, Qright_fringe; -Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; +Lisp_Object Qbuffer_predicate; +static Lisp_Object Qbuffer_list, Qburied_buffer_list; Lisp_Object Qtty_color_mode; Lisp_Object Qtty, Qtty_type; diff --git a/src/frame.h b/src/frame.h index 756e121f67..a82de35efb 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1047,7 +1047,7 @@ extern Lisp_Object selected_frame; extern Lisp_Object Qauto_raise, Qauto_lower; extern Lisp_Object Qborder_color, Qborder_width; -extern Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; +extern Lisp_Object Qbuffer_predicate; extern Lisp_Object Qcursor_color, Qcursor_type; extern Lisp_Object Qfont; extern Lisp_Object Qbackground_color, Qforeground_color; @@ -1076,7 +1076,6 @@ extern Lisp_Object Qminibuffer, Qmodeline; extern Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; extern Lisp_Object Qvisible; extern Lisp_Object Qdisplay_type; -extern Lisp_Object Qbackground_mode; extern Lisp_Object Qx_resource_name; diff --git a/src/fringe.c b/src/fringe.c index ce75df766e..281b563c9b 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -64,9 +64,9 @@ along with GNU Emacs. If not, see . */ must specify physical bitmap symbols. */ -Lisp_Object Qtruncation, Qcontinuation, Qoverlay_arrow; -Lisp_Object Qempty_line, Qtop_bottom; -Lisp_Object Qhollow_small; +static Lisp_Object Qtruncation, Qcontinuation, Qoverlay_arrow; +static Lisp_Object Qempty_line, Qtop_bottom; +static Lisp_Object Qhollow_small; enum fringe_bitmap_align { diff --git a/src/ftfont.c b/src/ftfont.c index 2e66222d26..47425e853d 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -39,7 +39,7 @@ along with GNU Emacs. If not, see . */ #include "ftfont.h" /* Symbolic type of this font-driver. */ -Lisp_Object Qfreetype; +static Lisp_Object Qfreetype; /* Fontconfig's generic families and their aliases. */ static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif; diff --git a/src/image.c b/src/image.c index 20ca3cf1d6..f1c3d5d84f 100644 --- a/src/image.c +++ b/src/image.c @@ -124,7 +124,7 @@ typedef struct ns_bitmap_record Bitmap_Record; /* The symbol `postscript' identifying images of this type. */ -Lisp_Object Qpostscript; +static Lisp_Object Qpostscript; static void x_disable_image (struct frame *, struct image *); static void x_edge_detection (struct frame *, struct image *, Lisp_Object, @@ -562,17 +562,21 @@ static Lisp_Object Vimage_type_cache; /* The symbol `xbm' which is used as the type symbol for XBM images. */ -Lisp_Object Qxbm; +static Lisp_Object Qxbm; /* Keywords. */ -Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; -Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; -Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask, QCgeometry, QCcrop, QCrotation; +Lisp_Object QCascent, QCmargin, QCrelief; +static Lisp_Object Qcount, Qextension_data; +Lisp_Object QCconversion; +static Lisp_Object QCheuristic_mask; +static Lisp_Object QCcolor_symbols; +static Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask, QCgeometry; +static Lisp_Object QCcrop, QCrotation; /* Other symbols. */ -Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic; +static Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic; /* Function prototypes. */ @@ -3001,7 +3005,7 @@ static int xpm_valid_color_symbols_p (Lisp_Object); #if defined (HAVE_XPM) || defined (HAVE_NS) /* The symbol `xpm' identifying XPM-format images. */ -Lisp_Object Qxpm; +static Lisp_Object Qxpm; /* Indices of image specification fields in xpm_format, below. */ @@ -4925,7 +4929,7 @@ static int pbm_scan_number (unsigned char **, unsigned char *); /* The symbol `pbm' identifying images of this type. */ -Lisp_Object Qpbm; +static Lisp_Object Qpbm; /* Indices of image specification fields in gs_format, below. */ @@ -5342,7 +5346,7 @@ static int png_load (struct frame *f, struct image *img); /* The symbol `png' identifying images of this type. */ -Lisp_Object Qpng; +static Lisp_Object Qpng; /* Indices of image specification fields in png_format, below. */ @@ -5956,7 +5960,7 @@ static int jpeg_load (struct frame *f, struct image *img); /* The symbol `jpeg' identifying images of this type. */ -Lisp_Object Qjpeg; +static Lisp_Object Qjpeg; /* Indices of image specification fields in gs_format, below. */ @@ -6505,7 +6509,7 @@ static int tiff_load (struct frame *f, struct image *img); /* The symbol `tiff' identifying images of this type. */ -Lisp_Object Qtiff; +static Lisp_Object Qtiff; /* Indices of image specification fields in tiff_format, below. */ @@ -6933,7 +6937,7 @@ static void gif_clear_image (struct frame *f, struct image *img); /* The symbol `gif' identifying images of this type. */ -Lisp_Object Qgif; +static Lisp_Object Qgif; /* Indices of image specification fields in gif_format, below. */ @@ -8302,7 +8306,7 @@ static void gs_clear_image (struct frame *f, struct image *img); /* Keyword symbols. */ -Lisp_Object QCloader, QCbounding_box, QCpt_width, QCpt_height; +static Lisp_Object QCloader, QCbounding_box, QCpt_width, QCpt_height; /* Indices of image specification fields in gs_format, below. */ diff --git a/src/intervals.h b/src/intervals.h index b2d755036b..3a9ee87b92 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -295,8 +295,6 @@ extern int invisible_p (Lisp_Object, Lisp_Object); /* Declared in textprop.c */ /* Types of hooks. */ -extern Lisp_Object Qmouse_left; -extern Lisp_Object Qmouse_entered; extern Lisp_Object Qpoint_left; extern Lisp_Object Qpoint_entered; extern Lisp_Object Qmodification_hooks; @@ -305,8 +303,8 @@ extern Lisp_Object Qlocal_map; extern Lisp_Object Qkeymap; /* Visual properties text (including strings) may have. */ -extern Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple; -extern Lisp_Object Qinvisible, Qintangible, Qread_only; +extern Lisp_Object Qfont; +extern Lisp_Object Qinvisible, Qintangible; /* Sticky properties */ extern Lisp_Object Qfront_sticky, Qrear_nonsticky; diff --git a/src/keyboard.c b/src/keyboard.c index 97989fc1c1..f4afe00068 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -100,7 +100,8 @@ int single_kboard; /* Non-nil disable property on a command means do not execute it; call disabled-command-function's value instead. */ -Lisp_Object Qdisabled, Qdisabled_command_function; +Lisp_Object Qdisabled; +static Lisp_Object Qdisabled_command_function; #define NUM_RECENT_KEYS (300) int recent_keys_index; /* Index for storing next element into recent_keys */ @@ -231,36 +232,37 @@ Lisp_Object internal_last_event_frame; X Windows wants this for selection ownership. */ unsigned long last_event_timestamp; -Lisp_Object Qx_set_selection, QPRIMARY, Qhandle_switch_frame; +static Lisp_Object Qx_set_selection, Qhandle_switch_frame; +Lisp_Object QPRIMARY; -Lisp_Object Qself_insert_command; -Lisp_Object Qforward_char; -Lisp_Object Qbackward_char; -Lisp_Object Qundefined; -Lisp_Object Qtimer_event_handler; +static Lisp_Object Qself_insert_command; +static Lisp_Object Qforward_char; +static Lisp_Object Qbackward_char; +static Lisp_Object Qundefined; +static Lisp_Object Qtimer_event_handler; /* read_key_sequence stores here the command definition of the key sequence that it reads. */ Lisp_Object read_key_sequence_cmd; -Lisp_Object Qinput_method_function; +static Lisp_Object Qinput_method_function; -Lisp_Object Qdeactivate_mark; +static Lisp_Object Qdeactivate_mark; Lisp_Object Qrecompute_lucid_menubar, Qactivate_menubar_hook; -Lisp_Object Qecho_area_clear_hook; +static Lisp_Object Qecho_area_clear_hook; /* Hooks to run before and after each command. */ -Lisp_Object Qpre_command_hook; -Lisp_Object Qpost_command_hook; +static Lisp_Object Qpre_command_hook; +static Lisp_Object Qpost_command_hook; -Lisp_Object Qdeferred_action_function; +static Lisp_Object Qdeferred_action_function; -Lisp_Object Qinput_method_exit_on_first_char; -Lisp_Object Qinput_method_use_echo_area; +static Lisp_Object Qinput_method_exit_on_first_char; +static Lisp_Object Qinput_method_use_echo_area; -Lisp_Object Qhelp_form_show; +static Lisp_Object Qhelp_form_show; /* File in which we write all commands we read. */ FILE *dribble; @@ -293,42 +295,49 @@ static struct input_event * volatile kbd_store_ptr; at inopportune times. */ /* Symbols to head events. */ -Lisp_Object Qmouse_movement; -Lisp_Object Qscroll_bar_movement; +static Lisp_Object Qmouse_movement; +static Lisp_Object Qscroll_bar_movement; Lisp_Object Qswitch_frame; -Lisp_Object Qdelete_frame; -Lisp_Object Qiconify_frame; -Lisp_Object Qmake_frame_visible; -Lisp_Object Qselect_window; +static Lisp_Object Qdelete_frame; +static Lisp_Object Qiconify_frame; +static Lisp_Object Qmake_frame_visible; +static Lisp_Object Qselect_window; Lisp_Object Qhelp_echo; #if defined (HAVE_MOUSE) || defined (HAVE_GPM) -Lisp_Object Qmouse_fixup_help_message; +static Lisp_Object Qmouse_fixup_help_message; #endif /* Symbols to denote kinds of events. */ -Lisp_Object Qfunction_key; +static Lisp_Object Qfunction_key; Lisp_Object Qmouse_click; #if defined (WINDOWSNT) Lisp_Object Qlanguage_change; #endif -Lisp_Object Qdrag_n_drop; -Lisp_Object Qsave_session; +static Lisp_Object Qdrag_n_drop; +static Lisp_Object Qsave_session; #ifdef HAVE_DBUS -Lisp_Object Qdbus_event; +static Lisp_Object Qdbus_event; #endif -Lisp_Object Qconfig_changed_event; +static Lisp_Object Qconfig_changed_event; /* Lisp_Object Qmouse_movement; - also an event header */ /* Properties of event headers. */ Lisp_Object Qevent_kind; -Lisp_Object Qevent_symbol_elements; +static Lisp_Object Qevent_symbol_elements; /* menu and tool bar item parts */ -Lisp_Object Qmenu_enable; -Lisp_Object QCenable, QCvisible, QChelp, QCfilter, QCkeys, QCkey_sequence; -Lisp_Object QCbutton, QCtoggle, QCradio, QClabel, QCvert_only; +static Lisp_Object Qmenu_enable; +static Lisp_Object QCenable, QCvisible, QChelp, QCkeys, QCkey_sequence; +Lisp_Object QCfilter; + +/* Non-nil disable property on a command means + do not execute it; call disabled-command-function's value instead. */ +Lisp_Object QCtoggle, QCradio; +static Lisp_Object QCbutton, QClabel; + +static Lisp_Object QCvert_only; /* An event header symbol HEAD may have a property named Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS); @@ -341,22 +350,22 @@ Lisp_Object Qevent_symbol_element_mask; Qmodifier_cache, which is an alist mapping modifier masks onto modified versions of BASE. If present, this helps speed up apply_modifiers. */ -Lisp_Object Qmodifier_cache; +static Lisp_Object Qmodifier_cache; /* Symbols to use for parts of windows. */ Lisp_Object Qmode_line; Lisp_Object Qvertical_line; -Lisp_Object Qvertical_scroll_bar; +static Lisp_Object Qvertical_scroll_bar; Lisp_Object Qmenu_bar; Lisp_Object recursive_edit_unwind (Lisp_Object buffer), command_loop (void); -Lisp_Object Qextended_command_history; +static Lisp_Object Qextended_command_history; EMACS_TIME timer_check (void); static void record_menu_key (Lisp_Object c); static int echo_length (void); -Lisp_Object Qpolling_period; +static Lisp_Object Qpolling_period; /* Incremented whenever a timer is run. */ int timers_run; @@ -5032,9 +5041,11 @@ static const char *const lispy_drag_n_drop_names[] = }; /* Scroll bar parts. */ -Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; -Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; -Lisp_Object Qtop, Qratio; +static Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; +Lisp_Object Qup, Qdown, Qbottom; +static Lisp_Object Qend_scroll; +Lisp_Object Qtop; +static Lisp_Object Qratio; /* An array of scroll bar parts, indexed by an enum scroll_bar_part value. */ static Lisp_Object *const scroll_bar_parts[] = { @@ -7889,8 +7900,8 @@ static int ntool_bar_items; /* The symbols `:image' and `:rtl'. */ -Lisp_Object QCimage; -Lisp_Object Qrtl; +static Lisp_Object QCimage; +static Lisp_Object Qrtl; /* Function prototypes. */ diff --git a/src/keyboard.h b/src/keyboard.h index 72bb821b2e..d945de5de2 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -408,15 +408,10 @@ typedef struct _widget_value extern Lisp_Object Qswitch_frame; /* Properties on event heads. */ -extern Lisp_Object Qevent_kind, Qevent_symbol_elements; - -/* Getting an unmodified version of an event head. */ -#define EVENT_HEAD_UNMODIFIED(event_head) \ - (Fcar (Fget ((event_head), Qevent_symbol_elements))) +extern Lisp_Object Qevent_kind; /* The values of Qevent_kind properties. */ -extern Lisp_Object Qfunction_key, Qmouse_click, Qmouse_movement; -extern Lisp_Object Qscroll_bar_movement; +extern Lisp_Object Qmouse_click; extern Lisp_Object Qhelp_echo; @@ -454,9 +449,7 @@ extern Lisp_Object real_this_command; /* Non-nil disable property on a command means do not execute it; call disabled-command-function's value instead. */ -extern Lisp_Object QCbutton, QCtoggle, QCradio, QClabel; - -extern Lisp_Object Qinput_method_function; +extern Lisp_Object QCtoggle, QCradio; /* An event header symbol HEAD may have a property named Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS); diff --git a/src/keymap.c b/src/keymap.c index 9adf289873..741fa4f6df 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -56,8 +56,9 @@ Lisp_Object control_x_map; /* The keymap used for globally bound /* keymap used for minibuffers when doing completion */ /* keymap used for minibuffers when doing completion and require a match */ -Lisp_Object Qkeymapp, Qkeymap, Qnon_ascii, Qmenu_item, Qremap; -Lisp_Object QCadvertised_binding; +static Lisp_Object Qkeymapp, Qnon_ascii; +Lisp_Object Qkeymap, Qmenu_item, Qremap; +static Lisp_Object QCadvertised_binding; /* Alist of elements like (DEL . "\d"). */ static Lisp_Object exclude_keys; @@ -659,7 +660,7 @@ map_keymap (Lisp_Object map, map_keymap_function_t fun, Lisp_Object args, void * UNGCPRO; } -Lisp_Object Qkeymap_canonicalize; +static Lisp_Object Qkeymap_canonicalize; /* Same as map_keymap, but does it right, properly eliminating duplicate bindings due to inheritance. */ @@ -2175,7 +2176,7 @@ then the value includes only maps for prefixes that start with PREFIX. */) } return maps; } -Lisp_Object Qsingle_key_description, Qkey_description; +static Lisp_Object Qsingle_key_description, Qkey_description; /* This function cannot GC. */ diff --git a/src/lisp.h b/src/lisp.h index 10fc66f440..fb44002b6a 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2291,22 +2291,22 @@ struct window; struct frame; /* Defined in data.c. */ -extern Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; +extern Lisp_Object Qnil, Qt, Qquote, Qlambda, Qunbound; extern Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; -extern Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; +extern Lisp_Object Qerror, Qquit, Qargs_out_of_range; extern Lisp_Object Qvoid_variable, Qvoid_function; -extern Lisp_Object Qsetting_constant, Qinvalid_read_syntax; +extern Lisp_Object Qinvalid_read_syntax; extern Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; extern Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; extern Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; extern Lisp_Object Qtext_read_only; extern Lisp_Object Qinteractive_form; extern Lisp_Object Qcircular_list; -extern Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; +extern Lisp_Object Qintegerp, Qwholenump, Qsymbolp, Qlistp, Qconsp; extern Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; extern Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; extern Lisp_Object Qbuffer_or_string_p; -extern Lisp_Object Qboundp, Qfboundp; +extern Lisp_Object Qfboundp; extern Lisp_Object Qchar_table_p, Qvector_or_char_table_p; extern Lisp_Object Qcdr; @@ -2530,9 +2530,8 @@ extern void init_fringe_once (void); #endif /* HAVE_WINDOW_SYSTEM */ /* Defined in image.c */ -extern Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; -extern Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; -extern Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask; +extern Lisp_Object QCascent, QCmargin, QCrelief; +extern Lisp_Object QCconversion; extern int x_bitmap_mask (struct frame *, int); extern void syms_of_image (void); extern void init_image (void); @@ -2602,8 +2601,6 @@ extern void syms_of_display (void); /* Defined in xdisp.c */ extern Lisp_Object Qinhibit_point_motion_hooks; extern Lisp_Object Qinhibit_redisplay, Qdisplay; -extern Lisp_Object Qinhibit_eval_during_redisplay; -extern Lisp_Object Qmessage_truncate_lines; extern Lisp_Object Qmenu_bar_update_hook; extern Lisp_Object Qwindow_scroll_functions; extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; @@ -2821,6 +2818,7 @@ extern void syms_of_lread (void); /* Defined in eval.c. */ extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro; extern Lisp_Object Qinhibit_quit, Qclosure; +extern Lisp_Object Qand_rest; extern Lisp_Object Vautoload_queue; extern Lisp_Object Vsignaling_function; extern int handling_signal; @@ -2963,8 +2961,7 @@ EXFUN (Fkill_buffer, 1); EXFUN (Fkill_all_local_variables, 0); EXFUN (Fbuffer_enable_undo, 1); EXFUN (Ferase_buffer, 0); -extern Lisp_Object Qoverlayp; -extern Lisp_Object Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string; +extern Lisp_Object Qpriority, Qwindow, Qbefore_string, Qafter_string; extern Lisp_Object get_truename_buffer (Lisp_Object); extern struct buffer *all_buffers; EXFUN (Fprevious_overlay_change, 1); @@ -3111,16 +3108,14 @@ extern Lisp_Object echo_message_buffer; extern struct kboard *echo_kboard; extern void cancel_echoing (void); extern Lisp_Object Qdisabled, QCfilter; -extern Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; -extern Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; -extern Lisp_Object Qtop, Qratio; +extern Lisp_Object Qup, Qdown, Qbottom; +extern Lisp_Object Qtop; extern int input_pending; EXFUN (Fdiscard_input, 0); EXFUN (Frecursive_edit, 0); EXFUN (Ftop_level, 0) NO_RETURN; extern Lisp_Object menu_bar_items (Lisp_Object); extern Lisp_Object tool_bar_items (Lisp_Object, int *); -extern Lisp_Object Qvertical_scroll_bar; extern void discard_mouse_events (void); EXFUN (Fevent_convert_list, 1); EXFUN (Fread_key_sequence, 5); @@ -3223,7 +3218,6 @@ EXFUN (Fget_buffer_process, 1); EXFUN (Fprocess_status, 1); EXFUN (Fkill_process, 2); EXFUN (Fwaiting_for_user_input_p, 0); -extern Lisp_Object Qprocessp; extern void kill_buffer_processes (Lisp_Object); extern int wait_reading_process_output (int, int, int, int, Lisp_Object, @@ -3411,9 +3405,9 @@ EXFUN (Fx_focus_frame, 1); #endif /* Defined in xfaces.c */ -extern Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; -extern Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; -extern Lisp_Object Qmode_line_inactive, Qvertical_border; +extern Lisp_Object Qdefault, Qtool_bar, Qfringe; +extern Lisp_Object Qheader_line, Qscroll_bar, Qcursor; +extern Lisp_Object Qmode_line_inactive; extern Lisp_Object Qface; extern Lisp_Object Qnormal; extern Lisp_Object QCfamily, QCweight, QCslant; diff --git a/src/lread.c b/src/lread.c index 7d12f5a85d..2d383350ec 100644 --- a/src/lread.c +++ b/src/lread.c @@ -61,20 +61,21 @@ along with GNU Emacs. If not, see . */ #endif /* hash table read constants */ -Lisp_Object Qhash_table, Qdata; -Lisp_Object Qtest, Qsize; -Lisp_Object Qweakness; -Lisp_Object Qrehash_size; -Lisp_Object Qrehash_threshold; - -Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; +static Lisp_Object Qhash_table, Qdata; +static Lisp_Object Qtest, Qsize; +static Lisp_Object Qweakness; +static Lisp_Object Qrehash_size; +static Lisp_Object Qrehash_threshold; + +static Lisp_Object Qread_char, Qget_file_char, Qcurrent_load_list; +Lisp_Object Qstandard_input; Lisp_Object Qvariable_documentation; -Lisp_Object Qascii_character, Qload, Qload_file_name; +static Lisp_Object Qascii_character, Qload, Qload_file_name; Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction; -Lisp_Object Qinhibit_file_name_operation; -Lisp_Object Qeval_buffer_list; -Lisp_Object Qlexical_binding; -Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ +static Lisp_Object Qinhibit_file_name_operation; +static Lisp_Object Qeval_buffer_list; +static Lisp_Object Qlexical_binding; +static Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ /* Used instead of Qget_file_char while loading *.elc files compiled by Emacs 21 or older. */ diff --git a/src/macros.c b/src/macros.c index fd771b52de..e5de4a1413 100644 --- a/src/macros.c +++ b/src/macros.c @@ -27,7 +27,8 @@ along with GNU Emacs. If not, see . */ #include "window.h" #include "keyboard.h" -Lisp_Object Qexecute_kbd_macro, Qkbd_macro_termination_hook; +Lisp_Object Qexecute_kbd_macro; +static Lisp_Object Qkbd_macro_termination_hook; /* Number of successful iterations so far for innermost keyboard macro. diff --git a/src/minibuf.c b/src/minibuf.c index 3e8fc0c242..ae4372746b 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -53,35 +53,35 @@ int minibuf_level; /* The maximum length of a minibuffer history. */ -Lisp_Object Qhistory_length; +static Lisp_Object Qhistory_length; /* Fread_minibuffer leaves the input here as a string. */ Lisp_Object last_minibuf_string; -Lisp_Object Qminibuffer_history, Qbuffer_name_history; +static Lisp_Object Qminibuffer_history, Qbuffer_name_history; -Lisp_Object Qread_file_name_internal; +static Lisp_Object Qread_file_name_internal; /* Normal hooks for entry to and exit from minibuffer. */ -Lisp_Object Qminibuffer_setup_hook; -Lisp_Object Qminibuffer_exit_hook; +static Lisp_Object Qminibuffer_setup_hook; +static Lisp_Object Qminibuffer_exit_hook; Lisp_Object Qcompletion_ignore_case; -Lisp_Object Qminibuffer_completion_table; -Lisp_Object Qminibuffer_completion_predicate; -Lisp_Object Qminibuffer_completion_confirm; -Lisp_Object Qcompleting_read_default; -Lisp_Object Quser_variable_p; +static Lisp_Object Qminibuffer_completion_table; +static Lisp_Object Qminibuffer_completion_predicate; +static Lisp_Object Qminibuffer_completion_confirm; +static Lisp_Object Qcompleting_read_default; +static Lisp_Object Quser_variable_p; -Lisp_Object Qminibuffer_default; +static Lisp_Object Qminibuffer_default; -Lisp_Object Qcurrent_input_method, Qactivate_input_method; +static Lisp_Object Qcurrent_input_method, Qactivate_input_method; -Lisp_Object Qcase_fold_search; +static Lisp_Object Qcase_fold_search; -Lisp_Object Qread_expression_history; +static Lisp_Object Qread_expression_history; /* Prompt to display in front of the mini-buffer contents. */ diff --git a/src/print.c b/src/print.c index f039b40aa6..8204055592 100644 --- a/src/print.c +++ b/src/print.c @@ -39,11 +39,11 @@ along with GNU Emacs. If not, see . */ Lisp_Object Qstandard_output; -Lisp_Object Qtemp_buffer_setup_hook; +static Lisp_Object Qtemp_buffer_setup_hook; /* These are used to print like we read. */ -Lisp_Object Qfloat_output_format; +static Lisp_Object Qfloat_output_format; #include @@ -79,7 +79,7 @@ EMACS_INT print_buffer_pos; EMACS_INT print_buffer_pos_byte; Lisp_Object Qprint_escape_newlines; -Lisp_Object Qprint_escape_multibyte, Qprint_escape_nonascii; +static Lisp_Object Qprint_escape_multibyte, Qprint_escape_nonascii; /* Vprint_number_table is a table, that keeps objects that are going to be printed, to allow use of #n= and #n# to express sharing. diff --git a/src/process.c b/src/process.c index ec96c1aa67..89d04081eb 100644 --- a/src/process.c +++ b/src/process.c @@ -127,22 +127,24 @@ int inhibit_sentinels; #ifdef subprocesses -Lisp_Object Qprocessp; -Lisp_Object Qrun, Qstop, Qsignal; -Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten; -Lisp_Object Qlocal, Qipv4, Qdatagram, Qseqpacket; -Lisp_Object Qreal, Qnetwork, Qserial; +static Lisp_Object Qprocessp; +static Lisp_Object Qrun, Qstop, Qsignal; +static Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten; +Lisp_Object Qlocal; +static Lisp_Object Qipv4, Qdatagram, Qseqpacket; +static Lisp_Object Qreal, Qnetwork, Qserial; #ifdef AF_INET6 -Lisp_Object Qipv6; +static Lisp_Object Qipv6; #endif -Lisp_Object QCport, QCspeed, QCprocess; +static Lisp_Object QCport, QCprocess; +Lisp_Object QCspeed; Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven; Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; -Lisp_Object QCbuffer, QChost, QCservice; -Lisp_Object QClocal, QCremote, QCcoding; -Lisp_Object QCserver, QCnowait, QCnoquery, QCstop; -Lisp_Object QCsentinel, QClog, QCoptions, QCplist; -Lisp_Object Qlast_nonmenu_event; +static Lisp_Object QCbuffer, QChost, QCservice; +static Lisp_Object QClocal, QCremote, QCcoding; +static Lisp_Object QCserver, QCnowait, QCnoquery, QCstop; +static Lisp_Object QCsentinel, QClog, QCoptions, QCplist; +static Lisp_Object Qlast_nonmenu_event; /* QCfamily is declared and initialized in xfaces.c, QCfilter in keyboard.c. */ extern Lisp_Object QCfamily, QCfilter; diff --git a/src/process.h b/src/process.h index 6bf1084afc..1e90f553b3 100644 --- a/src/process.h +++ b/src/process.h @@ -181,7 +181,7 @@ extern Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime; extern Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; extern Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime; extern Lisp_Object Qtime, Qctime; -extern Lisp_Object QCport, QCspeed, QCprocess; +extern Lisp_Object QCspeed; extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven; extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; @@ -198,4 +198,3 @@ extern void add_read_fd (int fd, fd_callback func, void *data); extern void delete_read_fd (int fd); extern void add_write_fd (int fd, fd_callback func, void *data); extern void delete_write_fd (int fd); - diff --git a/src/search.c b/src/search.c index 34f02e6cd6..ea10e47f55 100644 --- a/src/search.c +++ b/src/search.c @@ -85,10 +85,10 @@ static Lisp_Object last_thing_searched; /* error condition signaled when regexp compile_pattern fails */ -Lisp_Object Qinvalid_regexp; +static Lisp_Object Qinvalid_regexp; /* Error condition used for failing searches */ -Lisp_Object Qsearch_failed; +static Lisp_Object Qsearch_failed; static void set_search_regs (EMACS_INT, EMACS_INT); static void save_search_regs (void); diff --git a/src/sound.c b/src/sound.c index a972809e2c..4478a067c0 100644 --- a/src/sound.c +++ b/src/sound.c @@ -94,9 +94,9 @@ along with GNU Emacs. If not, see . */ /* Symbols. */ -Lisp_Object QCvolume, QCdevice; -Lisp_Object Qsound; -Lisp_Object Qplay_sound_functions; +static Lisp_Object QCvolume, QCdevice; +static Lisp_Object Qsound; +static Lisp_Object Qplay_sound_functions; /* Indices of attributes in a sound attributes vector. */ diff --git a/src/syntax.c b/src/syntax.c index 819a7542a7..96d50f9a4e 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -95,7 +95,8 @@ along with GNU Emacs. If not, see . */ #define ST_COMMENT_STYLE (256 + 1) #define ST_STRING_STYLE (256 + 2) -Lisp_Object Qsyntax_table_p, Qsyntax_table, Qscan_error; +static Lisp_Object Qsyntax_table_p; +static Lisp_Object Qsyntax_table, Qscan_error; /* Used as a temporary in SYNTAX_ENTRY and other macros in syntax.h, if not compiled with GCC. No need to mark it, since it is used diff --git a/src/syntax.h b/src/syntax.h index e8726bb28a..2b052715da 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -extern Lisp_Object Qsyntax_table_p; extern void update_syntax_table (EMACS_INT, int, int, Lisp_Object); /* The standard syntax table is stored where it will automatically @@ -300,4 +299,3 @@ struct gl_state_s extern struct gl_state_s gl_state; extern EMACS_INT scan_words (EMACS_INT, EMACS_INT); - diff --git a/src/textprop.c b/src/textprop.c index 8cd9d580c4..b3bb064e8b 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -47,16 +47,19 @@ along with GNU Emacs. If not, see . */ /* Types of hooks. */ -Lisp_Object Qmouse_left; -Lisp_Object Qmouse_entered; +static Lisp_Object Qmouse_left; +static Lisp_Object Qmouse_entered; Lisp_Object Qpoint_left; Lisp_Object Qpoint_entered; Lisp_Object Qcategory; Lisp_Object Qlocal_map; /* Visual properties text (including strings) may have. */ -Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple; -Lisp_Object Qinvisible, Qread_only, Qintangible, Qmouse_face; +static Lisp_Object Qforeground, Qbackground, Qunderline; +Lisp_Object Qfont; +static Lisp_Object Qstipple; +Lisp_Object Qinvisible, Qintangible, Qmouse_face; +static Lisp_Object Qread_only; Lisp_Object Qminibuffer_prompt; /* Sticky properties */ diff --git a/src/window.c b/src/window.c index 72ab2a3ea1..ee1b1bc04f 100644 --- a/src/window.c +++ b/src/window.c @@ -50,10 +50,11 @@ along with GNU Emacs. If not, see . */ #include "nsterm.h" #endif -Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; -Lisp_Object Qdisplay_buffer; -Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; -Lisp_Object Qwindow_size_fixed; +Lisp_Object Qwindowp, Qwindow_live_p; +static Lisp_Object Qwindow_configuration_p; +static Lisp_Object Qdisplay_buffer; +static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; +static Lisp_Object Qwindow_size_fixed; static int displayed_window_lines (struct window *); static struct window *decode_window (Lisp_Object); @@ -116,7 +117,7 @@ Lisp_Object minibuf_selected_window; /* Hook run at end of temp_output_buffer_show. */ -Lisp_Object Qtemp_buffer_show_hook; +static Lisp_Object Qtemp_buffer_show_hook; /* Incremented for each window created. */ diff --git a/src/xdisp.c b/src/xdisp.c index 7553841f51..b5ba2090c7 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -318,29 +318,31 @@ along with GNU Emacs. If not, see . */ Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; Lisp_Object Qwindow_scroll_functions; -Lisp_Object Qwindow_text_change_functions; -Lisp_Object Qredisplay_end_trigger_functions; +static Lisp_Object Qwindow_text_change_functions; +static Lisp_Object Qredisplay_end_trigger_functions; Lisp_Object Qinhibit_point_motion_hooks; -Lisp_Object QCeval, QCfile, QCdata, QCpropertize; -Lisp_Object Qfontified; -Lisp_Object Qgrow_only; -Lisp_Object Qinhibit_eval_during_redisplay; -Lisp_Object Qbuffer_position, Qposition, Qobject; -Lisp_Object Qright_to_left, Qleft_to_right; +static Lisp_Object QCeval, QCpropertize; +Lisp_Object QCfile, QCdata; +static Lisp_Object Qfontified; +static Lisp_Object Qgrow_only; +static Lisp_Object Qinhibit_eval_during_redisplay; +static Lisp_Object Qbuffer_position, Qposition, Qobject; +static Lisp_Object Qright_to_left, Qleft_to_right; /* Cursor shapes */ Lisp_Object Qbar, Qhbar, Qbox, Qhollow; /* Pointer shapes */ -Lisp_Object Qarrow, Qhand, Qtext; +static Lisp_Object Qarrow, Qhand; +Lisp_Object Qtext; /* Holds the list (error). */ Lisp_Object list_of_error; -Lisp_Object Qfontification_functions; +static Lisp_Object Qfontification_functions; -Lisp_Object Qwrap_prefix; -Lisp_Object Qline_prefix; +static Lisp_Object Qwrap_prefix; +static Lisp_Object Qline_prefix; /* Non-nil means don't actually do any redisplay. */ @@ -350,12 +352,14 @@ Lisp_Object Qinhibit_redisplay; Lisp_Object Qdisplay; -Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height; -Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise; -Lisp_Object Qslice; +Lisp_Object Qspace, QCalign_to; +static Lisp_Object QCrelative_width, QCrelative_height; +Lisp_Object Qleft_margin, Qright_margin; +static Lisp_Object Qspace_width, Qraise; +static Lisp_Object Qslice; Lisp_Object Qcenter; -Lisp_Object Qmargin, Qpointer; -Lisp_Object Qline_height; +static Lisp_Object Qmargin, Qpointer; +static Lisp_Object Qline_height; #ifdef HAVE_WINDOW_SYSTEM @@ -383,15 +387,15 @@ Lisp_Object Qline_height; /* Name of the face used to highlight trailing whitespace. */ -Lisp_Object Qtrailing_whitespace; +static Lisp_Object Qtrailing_whitespace; /* Name and number of the face used to highlight escape glyphs. */ -Lisp_Object Qescape_glyph; +static Lisp_Object Qescape_glyph; /* Name and number of the face used to highlight non-breaking spaces. */ -Lisp_Object Qnobreak_space; +static Lisp_Object Qnobreak_space; /* The symbol `image' which is the car of the lists used to represent images in Lisp. Also a tool bar style. */ @@ -399,8 +403,9 @@ Lisp_Object Qnobreak_space; Lisp_Object Qimage; /* The image map types. */ -Lisp_Object QCmap, QCpointer; -Lisp_Object Qrect, Qcircle, Qpoly; +Lisp_Object QCmap; +static Lisp_Object QCpointer; +static Lisp_Object Qrect, Qcircle, Qpoly; /* Tool bar styles */ Lisp_Object Qboth, Qboth_horiz, Qtext_image_horiz; @@ -460,12 +465,12 @@ static struct buffer *this_line_buffer; Voverlay_arrow_position is a marker, last-arrow-position is its numerical position. */ -Lisp_Object Qlast_arrow_position, Qlast_arrow_string; +static Lisp_Object Qlast_arrow_position, Qlast_arrow_string; /* Alternative overlay-arrow-string and overlay-arrow-bitmap properties on a symbol in overlay-arrow-variable-list. */ -Lisp_Object Qoverlay_arrow_string, Qoverlay_arrow_bitmap; +static Lisp_Object Qoverlay_arrow_string, Qoverlay_arrow_bitmap; Lisp_Object Qmenu_bar_update_hook; @@ -548,8 +553,8 @@ int message_buf_print; /* The symbol `inhibit-menubar-update' and its DEFVAR_BOOL variable. */ -Lisp_Object Qinhibit_menubar_update; -Lisp_Object Qmessage_truncate_lines; +static Lisp_Object Qinhibit_menubar_update; +static Lisp_Object Qmessage_truncate_lines; /* Set to 1 in clear_message to make redisplay_internal aware of an emptied echo area. */ @@ -603,7 +608,7 @@ int trace_move; #define TRACE_MOVE(x) (void) 0 #endif -Lisp_Object Qauto_hscroll_mode; +static Lisp_Object Qauto_hscroll_mode; /* Buffer being redisplayed -- for redisplay_window_error. */ @@ -708,7 +713,7 @@ static struct glyph_slice null_glyph_slice = { 0, 0, 0, 0 }; int redisplaying_p; -Lisp_Object Qinhibit_free_realized_faces; +static Lisp_Object Qinhibit_free_realized_faces; /* If a string, XTread_socket generates an event to display that string. (The display is done in read_char.) */ @@ -735,7 +740,7 @@ struct atimer *hourglass_atimer; Lisp_Object Qglyphless_char; /* Symbol for the purpose of Vglyphless_char_display. */ -Lisp_Object Qglyphless_char_display; +static Lisp_Object Qglyphless_char_display; /* Method symbols for Vglyphless_char_display. */ static Lisp_Object Qhex_code, Qempty_box, Qthin_space, Qzero_width; diff --git a/src/xfaces.c b/src/xfaces.c index eb2065d463..920debf4db 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -304,25 +304,29 @@ along with GNU Emacs. If not, see . */ /* Keyword symbols used for face attribute names. */ -Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; -Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; -Lisp_Object QCwidth, QCfont, QCbold, QCitalic; -Lisp_Object QCreverse_video; -Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; -Lisp_Object QCfontset; +Lisp_Object QCfamily, QCheight, QCweight, QCslant; +static Lisp_Object QCunderline; +static Lisp_Object QCinverse_video, QCstipple; +Lisp_Object QCforeground, QCbackground; +Lisp_Object QCwidth; +static Lisp_Object QCfont, QCbold, QCitalic; +static Lisp_Object QCreverse_video; +static Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; +static Lisp_Object QCfontset; /* Symbols used for attribute values. */ -Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; -Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; -Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; -Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; -Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; -Lisp_Object Qultra_expanded; -Lisp_Object Qreleased_button, Qpressed_button; -Lisp_Object QCstyle, QCcolor, QCline_width; -Lisp_Object Qunspecified; -Lisp_Object Qignore_defface; +Lisp_Object Qnormal; +static Lisp_Object Qbold, Qultra_light, Qextra_light, Qlight; +static Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; +static Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; +static Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; +static Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; +static Lisp_Object Qultra_expanded; +static Lisp_Object Qreleased_button, Qpressed_button; +static Lisp_Object QCstyle, QCcolor, QCline_width; +static Lisp_Object Qunspecified; +static Lisp_Object Qignore_defface; char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; @@ -333,15 +337,18 @@ Lisp_Object Qframe_set_background_mode; /* Names of basic faces. */ -Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; -Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; -Lisp_Object Qmode_line_inactive, Qvertical_border; +Lisp_Object Qdefault, Qtool_bar, Qfringe; +static Lisp_Object Qregion; +Lisp_Object Qheader_line, Qscroll_bar, Qcursor; +static Lisp_Object Qborder, Qmouse, Qmenu; +Lisp_Object Qmode_line_inactive; +static Lisp_Object Qvertical_border; /* The symbol `face-alias'. A symbols having that property is an alias for another face. Value of the property is the name of the aliased face. */ -Lisp_Object Qface_alias; +static Lisp_Object Qface_alias; /* Alist of alternative font families. Each element is of the form (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, @@ -361,7 +368,7 @@ Lisp_Object Vface_alternative_font_registry_alist; font may be scaled if its name matches a regular expression in the list. */ -Lisp_Object Qscalable_fonts_allowed; +static Lisp_Object Qscalable_fonts_allowed; #define DEFAULT_FONT_LIST_LIMIT 100 @@ -377,11 +384,11 @@ Lisp_Object Qface; /* Property for basic faces which other faces cannot inherit. */ -Lisp_Object Qface_no_inherit; +static Lisp_Object Qface_no_inherit; /* Error symbol for wrong_type_argument in load_pixmap. */ -Lisp_Object Qbitmap_spec_p; +static Lisp_Object Qbitmap_spec_p; /* The next ID to assign to Lisp faces. */ @@ -394,11 +401,11 @@ static int lface_id_to_name_size; /* TTY color-related functions (defined in tty-colors.el). */ -Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; +static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; /* The name of the function used to compute colors on TTYs. */ -Lisp_Object Qtty_color_alist; +static Lisp_Object Qtty_color_alist; /* Counter for calls to clear_face_cache. If this counter reaches CLEAR_FONT_TABLE_COUNT, and a frame has more than diff --git a/src/xfns.c b/src/xfns.c index 8d8a908222..6fd332016c 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -139,10 +139,10 @@ char *gray_bitmap_bits = gray_bits; static int x_in_use; -Lisp_Object Qnone; -Lisp_Object Qsuppress_icon; -Lisp_Object Qundefined_color; -Lisp_Object Qcompound_text, Qcancel_timer; +static Lisp_Object Qnone; +static Lisp_Object Qsuppress_icon; +static Lisp_Object Qundefined_color; +static Lisp_Object Qcompound_text, Qcancel_timer; Lisp_Object Qfont_param; #if GLYPH_DEBUG diff --git a/src/xmenu.c b/src/xmenu.c index 595ae79528..721019ffc5 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -111,7 +111,7 @@ along with GNU Emacs. If not, see . */ #define FALSE 0 #endif /* no TRUE */ -Lisp_Object Qdebug_on_next_call; +static Lisp_Object Qdebug_on_next_call; #if defined (USE_X_TOOLKIT) || defined (USE_GTK) static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object, diff --git a/src/xselect.c b/src/xselect.c index 4f1a452023..2d656cfec9 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -100,14 +100,14 @@ static Lisp_Object clean_local_selection_data (Lisp_Object); #endif -Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, +static Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL, QATOM_PAIR; -Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ -Lisp_Object QUTF8_STRING; /* This is a type of selection. */ +static Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ +static Lisp_Object QUTF8_STRING; /* This is a type of selection. */ -Lisp_Object Qcompound_text_with_extensions; +static Lisp_Object Qcompound_text_with_extensions; static Lisp_Object Qforeign_selection; -- 2.20.1