aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-10 20:39:45 -0700
committerPaul Eggert2011-04-10 20:39:45 -0700
commit955cbe7b1720f09b2991b7d981147d9cc79d52e3 (patch)
tree72ce39606c71e4ace0891f2127a7ef4fca32c209 /src
parent95c82688bc8063f0be5a04baee5ea2a18f9ddf6b (diff)
downloademacs-955cbe7b1720f09b2991b7d981147d9cc79d52e3.tar.gz
emacs-955cbe7b1720f09b2991b7d981147d9cc79d52e3.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog16
-rw-r--r--src/alloc.c5
-rw-r--r--src/buffer.c23
-rw-r--r--src/bytecode.c1
-rw-r--r--src/callint.c9
-rw-r--r--src/casetab.c2
-rw-r--r--src/category.c2
-rw-r--r--src/ccl.c8
-rw-r--r--src/ccl.h5
-rw-r--r--src/character.c2
-rw-r--r--src/character.h2
-rw-r--r--src/charset.c10
-rw-r--r--src/charset.h2
-rw-r--r--src/cmds.c4
-rw-r--r--src/coding.c35
-rw-r--r--src/coding.h4
-rw-r--r--src/composite.c4
-rw-r--r--src/composite.h2
-rw-r--r--src/data.c27
-rw-r--r--src/dbusbind.c58
-rw-r--r--src/dired.c14
-rw-r--r--src/editfns.c4
-rw-r--r--src/eval.c9
-rw-r--r--src/fileio.c83
-rw-r--r--src/fns.c16
-rw-r--r--src/font.c10
-rw-r--r--src/font.h3
-rw-r--r--src/frame.c17
-rw-r--r--src/frame.h3
-rw-r--r--src/fringe.c6
-rw-r--r--src/ftfont.c2
-rw-r--r--src/image.c30
-rw-r--r--src/intervals.h6
-rw-r--r--src/keyboard.c93
-rw-r--r--src/keyboard.h13
-rw-r--r--src/keymap.c9
-rw-r--r--src/lisp.h34
-rw-r--r--src/lread.c25
-rw-r--r--src/macros.c3
-rw-r--r--src/minibuf.c28
-rw-r--r--src/print.c6
-rw-r--r--src/process.c26
-rw-r--r--src/process.h3
-rw-r--r--src/search.c4
-rw-r--r--src/sound.c6
-rw-r--r--src/syntax.c3
-rw-r--r--src/syntax.h2
-rw-r--r--src/textprop.c11
-rw-r--r--src/window.c11
-rw-r--r--src/xdisp.c63
-rw-r--r--src/xfaces.c57
-rw-r--r--src/xfns.c8
-rw-r--r--src/xmenu.c2
-rw-r--r--src/xselect.c8
54 files changed, 441 insertions, 398 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8d492d1cdf5..0be406a6e7b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,21 @@
12011-04-11 Paul Eggert <eggert@cs.ucla.edu> 12011-04-11 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Declare Lisp_Object Q* variables to be 'static' if not exproted.
4 This makes it easier for human readers (and static analyzers)
5 to see whether these variables are used from other modules.
6 * alloc.c, buffer.c, bytecode.c, callint.c, casetab.c, category.c:
7 * ccl.c, character.c, charset.c, cmds.c, coding.c, composite.c:
8 * data.c, dbusbind.c, dired.c, editfns.c, eval.c, fileio.c, fns.c:
9 * font.c, frame.c, fringe.c, ftfont.c, image.c, keyboard.c, keymap.c:
10 * lread.c, macros.c, minibuf.c, print.c, process.c, search.c:
11 * sound.c, syntax.c, textprop.c, window.c, xdisp.c, xfaces.c, xfns.c:
12 * xmenu.c, xselect.c:
13 Declare Q* vars static if they are not used in other modules.
14 * ccl.h, character.h, charset.h, coding.h, composite.h, font.h:
15 * frame.h, intervals.h, keyboard.h, lisp.h, process.h, syntax.h:
16 Remove decls of unexported vars.
17 * keyboard.h (EVENT_HEAD_UNMODIFIED): Remove now-unused macro.
18
3 * lisp.h (DEFINE_FUNC): Make sname 'static'. 19 * lisp.h (DEFINE_FUNC): Make sname 'static'.
4 20
5 Make Emacs functions such as Fatom 'static' by default. 21 Make Emacs functions such as Fatom 'static' by default.
diff --git a/src/alloc.c b/src/alloc.c
index 1396586ba3e..ad3dfa96cd2 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -264,11 +264,12 @@ static size_t stack_copy_size;
264 264
265static int ignore_warnings; 265static int ignore_warnings;
266 266
267Lisp_Object Qgc_cons_threshold, Qchar_table_extra_slots; 267static Lisp_Object Qgc_cons_threshold;
268Lisp_Object Qchar_table_extra_slots;
268 269
269/* Hook run after GC has finished. */ 270/* Hook run after GC has finished. */
270 271
271Lisp_Object Qpost_gc_hook; 272static Lisp_Object Qpost_gc_hook;
272 273
273static void mark_buffer (Lisp_Object); 274static void mark_buffer (Lisp_Object);
274static void mark_terminals (void); 275static void mark_terminals (void);
diff --git a/src/buffer.c b/src/buffer.c
index a88afbb36e6..82913ac20e7 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);
113 to prevent lossage due to user rplac'ing this alist or its elements. */ 113 to prevent lossage due to user rplac'ing this alist or its elements. */
114Lisp_Object Vbuffer_alist; 114Lisp_Object Vbuffer_alist;
115 115
116Lisp_Object Qkill_buffer_query_functions; 116static Lisp_Object Qkill_buffer_query_functions;
117 117
118/* Hook run before changing a major mode. */ 118/* Hook run before changing a major mode. */
119Lisp_Object Qchange_major_mode_hook; 119static Lisp_Object Qchange_major_mode_hook;
120 120
121Lisp_Object Qfirst_change_hook; 121Lisp_Object Qfirst_change_hook;
122Lisp_Object Qbefore_change_functions; 122Lisp_Object Qbefore_change_functions;
123Lisp_Object Qafter_change_functions; 123Lisp_Object Qafter_change_functions;
124Lisp_Object Qucs_set_table_for_input; 124static Lisp_Object Qucs_set_table_for_input;
125 125
126Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; 126static Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local;
127Lisp_Object Qpermanent_local_hook; 127static Lisp_Object Qpermanent_local_hook;
128 128
129Lisp_Object Qprotected_field; 129static Lisp_Object Qprotected_field;
130 130
131Lisp_Object QSFundamental; /* A string "Fundamental" */ 131static Lisp_Object QSFundamental; /* A string "Fundamental" */
132 132
133Lisp_Object Qkill_buffer_hook; 133static Lisp_Object Qkill_buffer_hook;
134 134
135Lisp_Object Qget_file_buffer; 135static Lisp_Object Qget_file_buffer;
136 136
137Lisp_Object Qoverlayp; 137static Lisp_Object Qoverlayp;
138 138
139Lisp_Object Qpriority, Qevaporate, Qbefore_string, Qafter_string; 139Lisp_Object Qpriority, Qbefore_string, Qafter_string;
140static Lisp_Object Qevaporate;
140 141
141Lisp_Object Qmodification_hooks; 142Lisp_Object Qmodification_hooks;
142Lisp_Object Qinsert_in_front_hooks; 143Lisp_Object Qinsert_in_front_hooks;
diff --git a/src/bytecode.c b/src/bytecode.c
index b4a5354a0a4..581e16678a6 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -80,7 +80,6 @@ Lisp_Object Qbyte_code_meter;
80 80
81 81
82Lisp_Object Qbytecode; 82Lisp_Object Qbytecode;
83extern Lisp_Object Qand_optional, Qand_rest;
84 83
85/* Byte codes: */ 84/* Byte codes: */
86 85
diff --git a/src/callint.c b/src/callint.c
index 1de1f607878..e491e4e5952 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -30,14 +30,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
30 30
31Lisp_Object Qminus, Qplus; 31Lisp_Object Qminus, Qplus;
32Lisp_Object Qcall_interactively; 32Lisp_Object Qcall_interactively;
33Lisp_Object Qcommand_debug_status; 33static Lisp_Object Qcommand_debug_status;
34Lisp_Object Qenable_recursive_minibuffers; 34static Lisp_Object Qenable_recursive_minibuffers;
35 35
36Lisp_Object Qhandle_shift_selection; 36static Lisp_Object Qhandle_shift_selection;
37 37
38Lisp_Object Qmouse_leave_buffer_hook; 38Lisp_Object Qmouse_leave_buffer_hook;
39 39
40Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif, Qwhen; 40static Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif;
41Lisp_Object Qwhen;
41static Lisp_Object preserved_fns; 42static Lisp_Object preserved_fns;
42 43
43/* Marker used within call-interactively to refer to point. */ 44/* Marker used within call-interactively to refer to point. */
diff --git a/src/casetab.c b/src/casetab.c
index 7acefbceba9..691dbc8c08b 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -24,7 +24,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
24#include "buffer.h" 24#include "buffer.h"
25#include "character.h" 25#include "character.h"
26 26
27Lisp_Object Qcase_table_p, Qcase_table; 27static Lisp_Object Qcase_table_p, Qcase_table;
28Lisp_Object Vascii_downcase_table, Vascii_upcase_table; 28Lisp_Object Vascii_downcase_table, Vascii_upcase_table;
29Lisp_Object Vascii_canon_table, Vascii_eqv_table; 29Lisp_Object Vascii_canon_table, Vascii_eqv_table;
30 30
diff --git a/src/category.c b/src/category.c
index bba030360c4..5dcc4894f0e 100644
--- a/src/category.c
+++ b/src/category.c
@@ -48,7 +48,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
48 For the moment, we are not using this feature. */ 48 For the moment, we are not using this feature. */
49static int category_table_version; 49static int category_table_version;
50 50
51Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p; 51static Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p;
52 52
53/* Temporary internal variable used in macro CHAR_HAS_CATEGORY. */ 53/* Temporary internal variable used in macro CHAR_HAS_CATEGORY. */
54Lisp_Object _temp_category_set; 54Lisp_Object _temp_category_set;
diff --git a/src/ccl.c b/src/ccl.c
index 2f7c4b07319..e09cf4f86d9 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -38,16 +38,16 @@ Lisp_Object Qccl, Qcclp;
38 38
39/* This symbol is a property which associates with ccl program vector. 39/* This symbol is a property which associates with ccl program vector.
40 Ex: (get 'ccl-big5-encoder 'ccl-program) returns ccl program vector. */ 40 Ex: (get 'ccl-big5-encoder 'ccl-program) returns ccl program vector. */
41Lisp_Object Qccl_program; 41static Lisp_Object Qccl_program;
42 42
43/* These symbols are properties which associate with code conversion 43/* These symbols are properties which associate with code conversion
44 map and their ID respectively. */ 44 map and their ID respectively. */
45Lisp_Object Qcode_conversion_map; 45static Lisp_Object Qcode_conversion_map;
46Lisp_Object Qcode_conversion_map_id; 46static Lisp_Object Qcode_conversion_map_id;
47 47
48/* Symbols of ccl program have this property, a value of the property 48/* Symbols of ccl program have this property, a value of the property
49 is an index for Vccl_protram_table. */ 49 is an index for Vccl_protram_table. */
50Lisp_Object Qccl_program_idx; 50static Lisp_Object Qccl_program_idx;
51 51
52/* Table of registered CCL programs. Each element is a vector of 52/* Table of registered CCL programs. Each element is a vector of
53 NAME, CCL_PROG, RESOLVEDP, and UPDATEDP, where NAME (symbol) is the 53 NAME, CCL_PROG, RESOLVEDP, and UPDATEDP, where NAME (symbol) is the
diff --git a/src/ccl.h b/src/ccl.h
index 8c1f5e5cbd7..98a4008e59f 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -105,10 +105,6 @@ extern void ccl_driver (struct ccl_program *, int *, int *, int, int,
105/* Vector of CCL program names vs corresponding program data. */ 105/* Vector of CCL program names vs corresponding program data. */
106extern Lisp_Object Vccl_program_table; 106extern Lisp_Object Vccl_program_table;
107 107
108/* Symbols of ccl program have this property, a value of the property
109 is an index for Vccl_protram_table. */
110extern Lisp_Object Qccl_program_idx;
111
112extern Lisp_Object Qccl, Qcclp; 108extern Lisp_Object Qccl, Qcclp;
113 109
114EXFUN (Fccl_program_p, 1); 110EXFUN (Fccl_program_p, 1);
@@ -120,4 +116,3 @@ EXFUN (Fccl_program_p, 1);
120 } while (0); 116 } while (0);
121 117
122#endif /* EMACS_CCL_H */ 118#endif /* EMACS_CCL_H */
123
diff --git a/src/character.c b/src/character.c
index 636601c7452..e00168c6abc 100644
--- a/src/character.c
+++ b/src/character.c
@@ -50,7 +50,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
50 50
51Lisp_Object Qcharacterp; 51Lisp_Object Qcharacterp;
52 52
53Lisp_Object Qauto_fill_chars; 53static Lisp_Object Qauto_fill_chars;
54 54
55/* Char-table of information about which character to unify to which 55/* Char-table of information about which character to unify to which
56 Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */ 56 Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */
diff --git a/src/character.h b/src/character.h
index 7a75ac186fa..864882db7f6 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,
615extern EMACS_INT lisp_string_width (Lisp_Object, int, 615extern EMACS_INT lisp_string_width (Lisp_Object, int,
616 EMACS_INT *, EMACS_INT *); 616 EMACS_INT *, EMACS_INT *);
617 617
618extern Lisp_Object Qcharacterp, Qauto_fill_chars; 618extern Lisp_Object Qcharacterp;
619extern Lisp_Object Vchar_unify_table; 619extern Lisp_Object Vchar_unify_table;
620extern Lisp_Object string_escape_byte8 (Lisp_Object); 620extern Lisp_Object string_escape_byte8 (Lisp_Object);
621 621
diff --git a/src/charset.c b/src/charset.c
index 00206cccf0b..dc91cea2e12 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -68,10 +68,10 @@ Lisp_Object Qcharsetp;
68 68
69/* Special charset symbols. */ 69/* Special charset symbols. */
70Lisp_Object Qascii; 70Lisp_Object Qascii;
71Lisp_Object Qeight_bit; 71static Lisp_Object Qeight_bit;
72Lisp_Object Qiso_8859_1; 72static Lisp_Object Qiso_8859_1;
73Lisp_Object Qunicode; 73static Lisp_Object Qunicode;
74Lisp_Object Qemacs; 74static Lisp_Object Qemacs;
75 75
76/* The corresponding charsets. */ 76/* The corresponding charsets. */
77int charset_ascii; 77int charset_ascii;
@@ -87,7 +87,7 @@ int charset_jisx0208;
87int charset_ksc5601; 87int charset_ksc5601;
88 88
89/* Value of charset attribute `charset-iso-plane'. */ 89/* Value of charset attribute `charset-iso-plane'. */
90Lisp_Object Qgl, Qgr; 90static Lisp_Object Qgl, Qgr;
91 91
92/* Charset of unibyte characters. */ 92/* Charset of unibyte characters. */
93int charset_unibyte; 93int charset_unibyte;
diff --git a/src/charset.h b/src/charset.h
index 8c87ffe6c3d..fef50394e6e 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];
517 517
518extern Lisp_Object Qcharsetp; 518extern Lisp_Object Qcharsetp;
519 519
520extern Lisp_Object Qascii, Qunicode; 520extern Lisp_Object Qascii;
521extern int charset_ascii, charset_eight_bit; 521extern int charset_ascii, charset_eight_bit;
522extern int charset_iso_8859_1; 522extern int charset_iso_8859_1;
523extern int charset_unicode; 523extern int charset_unicode;
diff --git a/src/cmds.c b/src/cmds.c
index 60318225831..baf14778141 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -31,10 +31,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
31#include "dispextern.h" 31#include "dispextern.h"
32#include "frame.h" 32#include "frame.h"
33 33
34Lisp_Object Qkill_forward_chars, Qkill_backward_chars; 34static Lisp_Object Qkill_forward_chars, Qkill_backward_chars;
35 35
36/* A possible value for a buffer's overwrite-mode variable. */ 36/* A possible value for a buffer's overwrite-mode variable. */
37Lisp_Object Qoverwrite_mode_binary; 37static Lisp_Object Qoverwrite_mode_binary;
38 38
39static int internal_self_insert (int, EMACS_INT); 39static int internal_self_insert (int, EMACS_INT);
40 40
diff --git a/src/coding.c b/src/coding.c
index 13fcb7fb8a5..d2124db73f2 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -300,27 +300,30 @@ encode_coding_XXX (struct coding_system *coding)
300 300
301Lisp_Object Vcoding_system_hash_table; 301Lisp_Object Vcoding_system_hash_table;
302 302
303Lisp_Object Qcoding_system, Qcoding_aliases, Qeol_type; 303static Lisp_Object Qcoding_system, Qeol_type;
304static Lisp_Object Qcoding_aliases;
304Lisp_Object Qunix, Qdos; 305Lisp_Object Qunix, Qdos;
305Lisp_Object Qbuffer_file_coding_system; 306Lisp_Object Qbuffer_file_coding_system;
306Lisp_Object Qpost_read_conversion, Qpre_write_conversion; 307static Lisp_Object Qpost_read_conversion, Qpre_write_conversion;
307Lisp_Object Qdefault_char; 308static Lisp_Object Qdefault_char;
308Lisp_Object Qno_conversion, Qundecided; 309Lisp_Object Qno_conversion, Qundecided;
309Lisp_Object Qcharset, Qiso_2022, Qutf_8, Qutf_16, Qshift_jis, Qbig5; 310Lisp_Object Qcharset, Qutf_8;
310Lisp_Object Qbig, Qlittle; 311static Lisp_Object Qiso_2022;
311Lisp_Object Qcoding_system_history; 312static Lisp_Object Qutf_16, Qshift_jis, Qbig5;
312Lisp_Object Qvalid_codes; 313static Lisp_Object Qbig, Qlittle;
313Lisp_Object QCcategory, QCmnemonic, QCdefault_char; 314static Lisp_Object Qcoding_system_history;
314Lisp_Object QCdecode_translation_table, QCencode_translation_table; 315static Lisp_Object Qvalid_codes;
315Lisp_Object QCpost_read_conversion, QCpre_write_conversion; 316static Lisp_Object QCcategory, QCmnemonic, QCdefault_char;
316Lisp_Object QCascii_compatible_p; 317static Lisp_Object QCdecode_translation_table, QCencode_translation_table;
318static Lisp_Object QCpost_read_conversion, QCpre_write_conversion;
319static Lisp_Object QCascii_compatible_p;
317 320
318Lisp_Object Qcall_process, Qcall_process_region; 321Lisp_Object Qcall_process, Qcall_process_region;
319Lisp_Object Qstart_process, Qopen_network_stream; 322Lisp_Object Qstart_process, Qopen_network_stream;
320Lisp_Object Qtarget_idx; 323static Lisp_Object Qtarget_idx;
321 324
322Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source; 325static Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source;
323Lisp_Object Qinterrupted, Qinsufficient_memory; 326static Lisp_Object Qinterrupted, Qinsufficient_memory;
324 327
325/* If a symbol has this property, evaluate the value to define the 328/* If a symbol has this property, evaluate the value to define the
326 symbol as a coding system. */ 329 symbol as a coding system. */
@@ -351,8 +354,8 @@ struct coding_system safe_terminal_coding;
351 354
352Lisp_Object Qtranslation_table; 355Lisp_Object Qtranslation_table;
353Lisp_Object Qtranslation_table_id; 356Lisp_Object Qtranslation_table_id;
354Lisp_Object Qtranslation_table_for_decode; 357static Lisp_Object Qtranslation_table_for_decode;
355Lisp_Object Qtranslation_table_for_encode; 358static Lisp_Object Qtranslation_table_for_encode;
356 359
357/* Two special coding systems. */ 360/* Two special coding systems. */
358Lisp_Object Vsjis_coding_system; 361Lisp_Object Vsjis_coding_system;
diff --git a/src/coding.h b/src/coding.h
index 8414a2fe133..ff7fcc7c3ac 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -757,10 +757,9 @@ extern Lisp_Object preferred_coding_system (void);
757 757
758extern Lisp_Object Qutf_8, Qutf_8_emacs; 758extern Lisp_Object Qutf_8, Qutf_8_emacs;
759 759
760extern Lisp_Object Qcoding_system, Qeol_type, Qcoding_category_index; 760extern Lisp_Object Qcoding_category_index;
761extern Lisp_Object Qcoding_system_p; 761extern Lisp_Object Qcoding_system_p;
762extern Lisp_Object Qraw_text, Qemacs_mule, Qno_conversion, Qundecided; 762extern Lisp_Object Qraw_text, Qemacs_mule, Qno_conversion, Qundecided;
763extern Lisp_Object Qiso_2022;
764extern Lisp_Object Qbuffer_file_coding_system; 763extern Lisp_Object Qbuffer_file_coding_system;
765 764
766extern Lisp_Object Qunix, Qdos, Qmac; 765extern Lisp_Object Qunix, Qdos, Qmac;
@@ -789,4 +788,3 @@ extern char emacs_mule_bytes[256];
789extern int emacs_mule_string_char (unsigned char *); 788extern int emacs_mule_string_char (unsigned char *);
790 789
791#endif /* EMACS_CODING_H */ 790#endif /* EMACS_CODING_H */
792
diff --git a/src/composite.c b/src/composite.c
index 367606f5142..cccc75cc1b9 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -152,8 +152,8 @@ int n_compositions;
152 COMPOSITION-ID. */ 152 COMPOSITION-ID. */
153Lisp_Object composition_hash_table; 153Lisp_Object composition_hash_table;
154 154
155Lisp_Object Qauto_composed; 155static Lisp_Object Qauto_composed;
156Lisp_Object Qauto_composition_function; 156static Lisp_Object Qauto_composition_function;
157/* Maximum number of characters to look back for 157/* Maximum number of characters to look back for
158 auto-compositions. */ 158 auto-compositions. */
159#define MAX_AUTO_COMPOSITION_LOOKBACK 3 159#define MAX_AUTO_COMPOSITION_LOOKBACK 3
diff --git a/src/composite.h b/src/composite.h
index 1f708e93b8e..5188f981d9c 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -216,8 +216,6 @@ extern int n_compositions;
216 216
217extern Lisp_Object Qcomposition; 217extern Lisp_Object Qcomposition;
218extern Lisp_Object composition_hash_table; 218extern Lisp_Object composition_hash_table;
219extern Lisp_Object Qauto_composed;
220extern Lisp_Object Qauto_composition_function;
221extern int get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT, 219extern int get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT,
222 Lisp_Object, Lisp_Object); 220 Lisp_Object, Lisp_Object);
223extern int find_composition (EMACS_INT, EMACS_INT, EMACS_INT *, EMACS_INT *, 221extern int find_composition (EMACS_INT, EMACS_INT, EMACS_INT *, EMACS_INT *,
diff --git a/src/data.c b/src/data.c
index 25e260c8686..68ceff4d23e 100644
--- a/src/data.c
+++ b/src/data.c
@@ -52,26 +52,33 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
52extern double atof (const char *); 52extern double atof (const char *);
53#endif /* !atof */ 53#endif /* !atof */
54 54
55Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; 55Lisp_Object Qnil, Qt, Qquote, Qlambda, Qunbound;
56static Lisp_Object Qsubr;
56Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; 57Lisp_Object Qerror_conditions, Qerror_message, Qtop_level;
57Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; 58Lisp_Object Qerror, Qquit, Qargs_out_of_range;
58Lisp_Object Qvoid_variable, Qvoid_function, Qcyclic_function_indirection; 59static Lisp_Object Qwrong_type_argument;
59Lisp_Object Qcyclic_variable_indirection, Qcircular_list; 60Lisp_Object Qvoid_variable, Qvoid_function;
60Lisp_Object Qsetting_constant, Qinvalid_read_syntax; 61static Lisp_Object Qcyclic_function_indirection;
62static Lisp_Object Qcyclic_variable_indirection;
63Lisp_Object Qcircular_list;
64static Lisp_Object Qsetting_constant;
65Lisp_Object Qinvalid_read_syntax;
61Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; 66Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch;
62Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; 67Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive;
63Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; 68Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only;
64Lisp_Object Qtext_read_only; 69Lisp_Object Qtext_read_only;
65 70
66Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; 71Lisp_Object Qintegerp, Qwholenump, Qsymbolp, Qlistp, Qconsp;
72static Lisp_Object Qnatnump;
67Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; 73Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp;
68Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; 74Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp;
69Lisp_Object Qbuffer_or_string_p, Qkeywordp; 75Lisp_Object Qbuffer_or_string_p;
70Lisp_Object Qboundp, Qfboundp; 76static Lisp_Object Qkeywordp, Qboundp;
77Lisp_Object Qfboundp;
71Lisp_Object Qchar_table_p, Qvector_or_char_table_p; 78Lisp_Object Qchar_table_p, Qvector_or_char_table_p;
72 79
73Lisp_Object Qcdr; 80Lisp_Object Qcdr;
74Lisp_Object Qad_advice_info, Qad_activate_internal; 81static Lisp_Object Qad_advice_info, Qad_activate_internal;
75 82
76Lisp_Object Qrange_error, Qdomain_error, Qsingularity_error; 83Lisp_Object Qrange_error, Qdomain_error, Qsingularity_error;
77Lisp_Object Qoverflow_error, Qunderflow_error; 84Lisp_Object Qoverflow_error, Qunderflow_error;
@@ -83,7 +90,7 @@ Lisp_Object Qinteger;
83static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; 90static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay;
84Lisp_Object Qwindow; 91Lisp_Object Qwindow;
85static Lisp_Object Qfloat, Qwindow_configuration; 92static Lisp_Object Qfloat, Qwindow_configuration;
86Lisp_Object Qprocess; 93static Lisp_Object Qprocess;
87static Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector; 94static Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector;
88static Lisp_Object Qchar_table, Qbool_vector, Qhash_table; 95static Lisp_Object Qchar_table, Qbool_vector, Qhash_table;
89static Lisp_Object Qsubrp, Qmany, Qunevalled; 96static Lisp_Object Qsubrp, Qmany, Qunevalled;
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 8a6870555d0..b986724d792 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -30,50 +30,50 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
30 30
31 31
32/* Subroutines. */ 32/* Subroutines. */
33Lisp_Object Qdbus_init_bus; 33static Lisp_Object Qdbus_init_bus;
34Lisp_Object Qdbus_close_bus; 34static Lisp_Object Qdbus_close_bus;
35Lisp_Object Qdbus_get_unique_name; 35static Lisp_Object Qdbus_get_unique_name;
36Lisp_Object Qdbus_call_method; 36static Lisp_Object Qdbus_call_method;
37Lisp_Object Qdbus_call_method_asynchronously; 37static Lisp_Object Qdbus_call_method_asynchronously;
38Lisp_Object Qdbus_method_return_internal; 38static Lisp_Object Qdbus_method_return_internal;
39Lisp_Object Qdbus_method_error_internal; 39static Lisp_Object Qdbus_method_error_internal;
40Lisp_Object Qdbus_send_signal; 40static Lisp_Object Qdbus_send_signal;
41Lisp_Object Qdbus_register_service; 41static Lisp_Object Qdbus_register_service;
42Lisp_Object Qdbus_register_signal; 42static Lisp_Object Qdbus_register_signal;
43Lisp_Object Qdbus_register_method; 43static Lisp_Object Qdbus_register_method;
44 44
45/* D-Bus error symbol. */ 45/* D-Bus error symbol. */
46Lisp_Object Qdbus_error; 46static Lisp_Object Qdbus_error;
47 47
48/* Lisp symbols of the system and session buses. */ 48/* Lisp symbols of the system and session buses. */
49Lisp_Object QCdbus_system_bus, QCdbus_session_bus; 49static Lisp_Object QCdbus_system_bus, QCdbus_session_bus;
50 50
51/* Lisp symbol for method call timeout. */ 51/* Lisp symbol for method call timeout. */
52Lisp_Object QCdbus_timeout; 52static Lisp_Object QCdbus_timeout;
53 53
54/* Lisp symbols for name request flags. */ 54/* Lisp symbols for name request flags. */
55Lisp_Object QCdbus_request_name_allow_replacement; 55static Lisp_Object QCdbus_request_name_allow_replacement;
56Lisp_Object QCdbus_request_name_replace_existing; 56static Lisp_Object QCdbus_request_name_replace_existing;
57Lisp_Object QCdbus_request_name_do_not_queue; 57static Lisp_Object QCdbus_request_name_do_not_queue;
58 58
59/* Lisp symbols for name request replies. */ 59/* Lisp symbols for name request replies. */
60Lisp_Object QCdbus_request_name_reply_primary_owner; 60static Lisp_Object QCdbus_request_name_reply_primary_owner;
61Lisp_Object QCdbus_request_name_reply_in_queue; 61static Lisp_Object QCdbus_request_name_reply_in_queue;
62Lisp_Object QCdbus_request_name_reply_exists; 62static Lisp_Object QCdbus_request_name_reply_exists;
63Lisp_Object QCdbus_request_name_reply_already_owner; 63static Lisp_Object QCdbus_request_name_reply_already_owner;
64 64
65/* Lisp symbols of D-Bus types. */ 65/* Lisp symbols of D-Bus types. */
66Lisp_Object QCdbus_type_byte, QCdbus_type_boolean; 66static Lisp_Object QCdbus_type_byte, QCdbus_type_boolean;
67Lisp_Object QCdbus_type_int16, QCdbus_type_uint16; 67static Lisp_Object QCdbus_type_int16, QCdbus_type_uint16;
68Lisp_Object QCdbus_type_int32, QCdbus_type_uint32; 68static Lisp_Object QCdbus_type_int32, QCdbus_type_uint32;
69Lisp_Object QCdbus_type_int64, QCdbus_type_uint64; 69static Lisp_Object QCdbus_type_int64, QCdbus_type_uint64;
70Lisp_Object QCdbus_type_double, QCdbus_type_string; 70static Lisp_Object QCdbus_type_double, QCdbus_type_string;
71Lisp_Object QCdbus_type_object_path, QCdbus_type_signature; 71static Lisp_Object QCdbus_type_object_path, QCdbus_type_signature;
72#ifdef DBUS_TYPE_UNIX_FD 72#ifdef DBUS_TYPE_UNIX_FD
73Lisp_Object QCdbus_type_unix_fd; 73Lisp_Object QCdbus_type_unix_fd;
74#endif 74#endif
75Lisp_Object QCdbus_type_array, QCdbus_type_variant; 75static Lisp_Object QCdbus_type_array, QCdbus_type_variant;
76Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; 76static Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry;
77 77
78/* Whether we are reading a D-Bus event. */ 78/* Whether we are reading a D-Bus event. */
79int xd_in_read_queued_messages = 0; 79int xd_in_read_queued_messages = 0;
diff --git a/src/dired.c b/src/dired.c
index f5fc1e3a62d..2b0ef275cde 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -79,12 +79,12 @@ extern struct direct *readdir (DIR *);
79#include "regex.h" 79#include "regex.h"
80#include "blockinput.h" 80#include "blockinput.h"
81 81
82Lisp_Object Qdirectory_files; 82static Lisp_Object Qdirectory_files;
83Lisp_Object Qdirectory_files_and_attributes; 83static Lisp_Object Qdirectory_files_and_attributes;
84Lisp_Object Qfile_name_completion; 84static Lisp_Object Qfile_name_completion;
85Lisp_Object Qfile_name_all_completions; 85static Lisp_Object Qfile_name_all_completions;
86Lisp_Object Qfile_attributes; 86static Lisp_Object Qfile_attributes;
87Lisp_Object Qfile_attributes_lessp; 87static Lisp_Object Qfile_attributes_lessp;
88 88
89static int scmp (const char *, const char *, int); 89static int scmp (const char *, const char *, int);
90INFUN (Ffile_attributes, 2); 90INFUN (Ffile_attributes, 2);
@@ -439,7 +439,7 @@ These are all file names in directory DIRECTORY which begin with FILE. */)
439} 439}
440 440
441static int file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_addr); 441static int file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_addr);
442Lisp_Object Qdefault_directory; 442static Lisp_Object Qdefault_directory;
443 443
444Lisp_Object 444Lisp_Object
445file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, Lisp_Object predicate) 445file_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 0c34a95b949..afb1e8ebc18 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -107,7 +107,7 @@ static Lisp_Object subst_char_in_region_unwind_1 (Lisp_Object);
107static void transpose_markers (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, 107static void transpose_markers (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT,
108 EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT); 108 EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT);
109 109
110Lisp_Object Qbuffer_access_fontify_functions; 110static Lisp_Object Qbuffer_access_fontify_functions;
111INFUN (Fuser_full_name, 1); 111INFUN (Fuser_full_name, 1);
112 112
113/* Symbol for the text property used to mark fields. */ 113/* Symbol for the text property used to mark fields. */
@@ -116,7 +116,7 @@ Lisp_Object Qfield;
116 116
117/* A special value for Qfield properties. */ 117/* A special value for Qfield properties. */
118 118
119Lisp_Object Qboundary; 119static Lisp_Object Qboundary;
120 120
121 121
122void 122void
diff --git a/src/eval.c b/src/eval.c
index d6d62aa4afb..cefdf784faf 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -66,12 +66,13 @@ int gcpro_level;
66 66
67Lisp_Object Qautoload, Qmacro, Qexit, Qinteractive, Qcommandp, Qdefun; 67Lisp_Object Qautoload, Qmacro, Qexit, Qinteractive, Qcommandp, Qdefun;
68Lisp_Object Qinhibit_quit; 68Lisp_Object Qinhibit_quit;
69Lisp_Object Qand_rest, Qand_optional; 69Lisp_Object Qand_rest;
70Lisp_Object Qdebug_on_error; 70static Lisp_Object Qand_optional;
71Lisp_Object Qdeclare; 71static Lisp_Object Qdebug_on_error;
72static Lisp_Object Qdeclare;
72Lisp_Object Qinternal_interpreter_environment, Qclosure; 73Lisp_Object Qinternal_interpreter_environment, Qclosure;
73 74
74Lisp_Object Qdebug; 75static Lisp_Object Qdebug;
75 76
76/* This holds either the symbol `run-hooks' or nil. 77/* This holds either the symbol `run-hooks' or nil.
77 It is nil at an early stage of startup, and when Emacs 78 It is nil at an early stage of startup, and when Emacs
diff --git a/src/fileio.c b/src/fileio.c
index 5ad8b0a33a1..fb16decaaa3 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -102,20 +102,20 @@ int auto_save_error_occurred;
102 an actual coding system name, but just an indicator to tell 102 an actual coding system name, but just an indicator to tell
103 insert-file-contents to use `emacs-mule' with a special flag for 103 insert-file-contents to use `emacs-mule' with a special flag for
104 auto saving and recovering a file. */ 104 auto saving and recovering a file. */
105Lisp_Object Qauto_save_coding; 105static Lisp_Object Qauto_save_coding;
106 106
107/* Property name of a file name handler, 107/* Property name of a file name handler,
108 which gives a list of operations it handles.. */ 108 which gives a list of operations it handles.. */
109Lisp_Object Qoperations; 109static Lisp_Object Qoperations;
110 110
111/* Lisp functions for translating file formats */ 111/* Lisp functions for translating file formats */
112Lisp_Object Qformat_decode, Qformat_annotate_function; 112static Lisp_Object Qformat_decode, Qformat_annotate_function;
113 113
114/* Lisp function for setting buffer-file-coding-system and the 114/* Lisp function for setting buffer-file-coding-system and the
115 multibyteness of the current buffer after inserting a file. */ 115 multibyteness of the current buffer after inserting a file. */
116Lisp_Object Qafter_insert_file_set_coding; 116static Lisp_Object Qafter_insert_file_set_coding;
117 117
118Lisp_Object Qwrite_region_annotate_functions; 118static Lisp_Object Qwrite_region_annotate_functions;
119/* Each time an annotation function changes the buffer, the new buffer 119/* Each time an annotation function changes the buffer, the new buffer
120 is added here. */ 120 is added here. */
121Lisp_Object Vwrite_region_annotation_buffers; 121Lisp_Object Vwrite_region_annotation_buffers;
@@ -123,25 +123,26 @@ Lisp_Object Vwrite_region_annotation_buffers;
123#ifdef HAVE_FSYNC 123#ifdef HAVE_FSYNC
124#endif 124#endif
125 125
126Lisp_Object Qdelete_by_moving_to_trash; 126static Lisp_Object Qdelete_by_moving_to_trash;
127 127
128/* Lisp function for moving files to trash. */ 128/* Lisp function for moving files to trash. */
129Lisp_Object Qmove_file_to_trash; 129static Lisp_Object Qmove_file_to_trash;
130 130
131/* Lisp function for recursively copying directories. */ 131/* Lisp function for recursively copying directories. */
132Lisp_Object Qcopy_directory; 132static Lisp_Object Qcopy_directory;
133 133
134/* Lisp function for recursively deleting directories. */ 134/* Lisp function for recursively deleting directories. */
135Lisp_Object Qdelete_directory; 135static Lisp_Object Qdelete_directory;
136 136
137#ifdef WINDOWSNT 137#ifdef WINDOWSNT
138#endif 138#endif
139 139
140Lisp_Object Qfile_error, Qfile_already_exists, Qfile_date_error; 140Lisp_Object Qfile_error;
141Lisp_Object Qexcl; 141static Lisp_Object Qfile_already_exists, Qfile_date_error;
142static Lisp_Object Qexcl;
142Lisp_Object Qfile_name_history; 143Lisp_Object Qfile_name_history;
143 144
144Lisp_Object Qcar_less_than_car; 145static Lisp_Object Qcar_less_than_car;
145 146
146INFUN (Fmake_symbolic_link, 3); 147INFUN (Fmake_symbolic_link, 3);
147static int a_write (int, Lisp_Object, int, int, 148static int a_write (int, Lisp_Object, int, int,
@@ -205,40 +206,40 @@ restore_point_unwind (Lisp_Object location)
205} 206}
206 207
207 208
208Lisp_Object Qexpand_file_name; 209static Lisp_Object Qexpand_file_name;
209Lisp_Object Qsubstitute_in_file_name; 210static Lisp_Object Qsubstitute_in_file_name;
210Lisp_Object Qdirectory_file_name; 211static Lisp_Object Qdirectory_file_name;
211Lisp_Object Qfile_name_directory; 212static Lisp_Object Qfile_name_directory;
212Lisp_Object Qfile_name_nondirectory; 213static Lisp_Object Qfile_name_nondirectory;
213Lisp_Object Qunhandled_file_name_directory; 214static Lisp_Object Qunhandled_file_name_directory;
214Lisp_Object Qfile_name_as_directory; 215static Lisp_Object Qfile_name_as_directory;
215Lisp_Object Qcopy_file; 216static Lisp_Object Qcopy_file;
216Lisp_Object Qmake_directory_internal; 217static Lisp_Object Qmake_directory_internal;
217Lisp_Object Qmake_directory; 218static Lisp_Object Qmake_directory;
218Lisp_Object Qdelete_directory_internal; 219static Lisp_Object Qdelete_directory_internal;
219Lisp_Object Qdelete_file; 220Lisp_Object Qdelete_file;
220Lisp_Object Qrename_file; 221static Lisp_Object Qrename_file;
221Lisp_Object Qadd_name_to_file; 222static Lisp_Object Qadd_name_to_file;
222Lisp_Object Qmake_symbolic_link; 223static Lisp_Object Qmake_symbolic_link;
223Lisp_Object Qfile_exists_p; 224Lisp_Object Qfile_exists_p;
224Lisp_Object Qfile_executable_p; 225static Lisp_Object Qfile_executable_p;
225Lisp_Object Qfile_readable_p; 226static Lisp_Object Qfile_readable_p;
226Lisp_Object Qfile_writable_p; 227static Lisp_Object Qfile_writable_p;
227Lisp_Object Qfile_symlink_p; 228static Lisp_Object Qfile_symlink_p;
228Lisp_Object Qaccess_file; 229static Lisp_Object Qaccess_file;
229Lisp_Object Qfile_directory_p; 230Lisp_Object Qfile_directory_p;
230Lisp_Object Qfile_regular_p; 231static Lisp_Object Qfile_regular_p;
231Lisp_Object Qfile_accessible_directory_p; 232static Lisp_Object Qfile_accessible_directory_p;
232Lisp_Object Qfile_modes; 233static Lisp_Object Qfile_modes;
233Lisp_Object Qset_file_modes; 234static Lisp_Object Qset_file_modes;
234Lisp_Object Qset_file_times; 235static Lisp_Object Qset_file_times;
235Lisp_Object Qfile_selinux_context; 236static Lisp_Object Qfile_selinux_context;
236Lisp_Object Qset_file_selinux_context; 237static Lisp_Object Qset_file_selinux_context;
237Lisp_Object Qfile_newer_than_file_p; 238static Lisp_Object Qfile_newer_than_file_p;
238Lisp_Object Qinsert_file_contents; 239Lisp_Object Qinsert_file_contents;
239Lisp_Object Qwrite_region; 240Lisp_Object Qwrite_region;
240Lisp_Object Qverify_visited_file_modtime; 241static Lisp_Object Qverify_visited_file_modtime;
241Lisp_Object Qset_visited_file_modtime; 242static Lisp_Object Qset_visited_file_modtime;
242 243
243DEFUE ("find-file-name-handler", Ffind_file_name_handler, 244DEFUE ("find-file-name-handler", Ffind_file_name_handler,
244 Sfind_file_name_handler, 2, 2, 0, 245 Sfind_file_name_handler, 2, 2, 0,
diff --git a/src/fns.c b/src/fns.c
index f4eaaccda33..9ced09c38f6 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -49,11 +49,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
49#define NULL ((POINTER_TYPE *)0) 49#define NULL ((POINTER_TYPE *)0)
50#endif 50#endif
51 51
52Lisp_Object Qstring_lessp, Qprovide, Qrequire; 52Lisp_Object Qstring_lessp;
53Lisp_Object Qyes_or_no_p_history; 53static Lisp_Object Qprovide, Qrequire;
54static Lisp_Object Qyes_or_no_p_history;
54Lisp_Object Qcursor_in_echo_area; 55Lisp_Object Qcursor_in_echo_area;
55Lisp_Object Qwidget_type; 56static Lisp_Object Qwidget_type;
56Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper; 57static Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper;
57 58
58static int internal_equal (Lisp_Object , Lisp_Object, int, int); 59static int internal_equal (Lisp_Object , Lisp_Object, int, int);
59 60
@@ -2541,7 +2542,7 @@ advisable. */)
2541 return ret; 2542 return ret;
2542} 2543}
2543 2544
2544Lisp_Object Qsubfeatures; 2545static Lisp_Object Qsubfeatures;
2545 2546
2546DEFUN ("featurep", Ffeaturep, Sfeaturep, 1, 2, 0, 2547DEFUN ("featurep", Ffeaturep, Sfeaturep, 1, 2, 0,
2547 doc: /* Return t if FEATURE is present in this Emacs. 2548 doc: /* Return t if FEATURE is present in this Emacs.
@@ -3354,9 +3355,10 @@ struct Lisp_Hash_Table *weak_hash_tables;
3354 3355
3355/* Various symbols. */ 3356/* Various symbols. */
3356 3357
3357Lisp_Object Qhash_table_p, Qeq, Qeql, Qequal, Qkey, Qvalue; 3358static Lisp_Object Qhash_table_p, Qkey, Qvalue;
3359Lisp_Object Qeq, Qeql, Qequal;
3358Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness; 3360Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness;
3359Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value; 3361static Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value;
3360 3362
3361/* Function prototypes. */ 3363/* Function prototypes. */
3362 3364
diff --git a/src/font.c b/src/font.c
index a31a418e641..91cb0a2d52b 100644
--- a/src/font.c
+++ b/src/font.c
@@ -48,7 +48,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
48#include "nsterm.h" 48#include "nsterm.h"
49#endif /* HAVE_NS */ 49#endif /* HAVE_NS */
50 50
51Lisp_Object Qopentype; 51static Lisp_Object Qopentype;
52 52
53/* Important character set strings. */ 53/* Important character set strings. */
54Lisp_Object Qascii_0, Qiso8859_1, Qiso10646_1, Qunicode_bmp, Qunicode_sip; 54Lisp_Object Qascii_0, Qiso8859_1, Qiso10646_1, Qunicode_bmp, Qunicode_sip;
@@ -125,14 +125,16 @@ Lisp_Object QCfoundry;
125static Lisp_Object QCadstyle, QCregistry; 125static Lisp_Object QCadstyle, QCregistry;
126/* Symbols representing keys of font extra info. */ 126/* Symbols representing keys of font extra info. */
127Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript, QCavgwidth; 127Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript, QCavgwidth;
128Lisp_Object QCantialias, QCfont_entity, QCfc_unknown_spec; 128Lisp_Object QCantialias, QCfont_entity;
129static Lisp_Object QCfc_unknown_spec;
129/* Symbols representing values of font spacing property. */ 130/* Symbols representing values of font spacing property. */
130Lisp_Object Qc, Qm, Qp, Qd; 131static Lisp_Object Qc, Qm, Qd;
132Lisp_Object Qp;
131/* Special ADSTYLE properties to avoid fonts used for Latin 133/* Special ADSTYLE properties to avoid fonts used for Latin
132 characters; used in xfont.c and ftfont.c. */ 134 characters; used in xfont.c and ftfont.c. */
133Lisp_Object Qja, Qko; 135Lisp_Object Qja, Qko;
134 136
135Lisp_Object QCuser_spec; 137static Lisp_Object QCuser_spec;
136 138
137/* Alist of font registry symbol and the corresponding charsets 139/* Alist of font registry symbol and the corresponding charsets
138 information. The information is retrieved from 140 information. The information is retrieved from
diff --git a/src/font.h b/src/font.h
index 511a7de3a16..a9b58eb7c76 100644
--- a/src/font.h
+++ b/src/font.h
@@ -239,7 +239,7 @@ enum font_property_index
239 ASET ((font), prop, make_number (font_style_to_value (prop, val, 1))) 239 ASET ((font), prop, make_number (font_style_to_value (prop, val, 1)))
240 240
241extern Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript; 241extern Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript;
242extern Lisp_Object QCavgwidth, QCantialias, QCfont_entity, QCfc_unknown_spec; 242extern Lisp_Object QCavgwidth, QCantialias, QCfont_entity;
243extern Lisp_Object Qp; 243extern Lisp_Object Qp;
244 244
245 245
@@ -871,4 +871,3 @@ extern void font_deferred_log (const char *, Lisp_Object, Lisp_Object);
871#endif /* not FONT_DEBUG */ 871#endif /* not FONT_DEBUG */
872 872
873#endif /* not EMACS_FONT_H */ 873#endif /* not EMACS_FONT_H */
874
diff --git a/src/frame.c b/src/frame.c
index 6e0e9c4ffc0..5493600ce5b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -69,10 +69,10 @@ Lisp_Object Qonly;
69Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; 69Lisp_Object Qx, Qw32, Qmac, Qpc, Qns;
70Lisp_Object Qvisible; 70Lisp_Object Qvisible;
71Lisp_Object Qdisplay_type; 71Lisp_Object Qdisplay_type;
72Lisp_Object Qbackground_mode; 72static Lisp_Object Qbackground_mode;
73Lisp_Object Qnoelisp; 73Lisp_Object Qnoelisp;
74 74
75Lisp_Object Qx_frame_parameter; 75static Lisp_Object Qx_frame_parameter;
76Lisp_Object Qx_resource_name; 76Lisp_Object Qx_resource_name;
77Lisp_Object Qterminal; 77Lisp_Object Qterminal;
78Lisp_Object Qterminal_live_p; 78Lisp_Object Qterminal_live_p;
@@ -82,7 +82,7 @@ Lisp_Object Qterminal_live_p;
82Lisp_Object Qauto_raise, Qauto_lower; 82Lisp_Object Qauto_raise, Qauto_lower;
83Lisp_Object Qborder_color, Qborder_width; 83Lisp_Object Qborder_color, Qborder_width;
84Lisp_Object Qcursor_color, Qcursor_type; 84Lisp_Object Qcursor_color, Qcursor_type;
85Lisp_Object Qgeometry; /* Not used */ 85static Lisp_Object Qgeometry; /* Not used */
86Lisp_Object Qheight, Qwidth; 86Lisp_Object Qheight, Qwidth;
87Lisp_Object Qleft, Qright; 87Lisp_Object Qleft, Qright;
88Lisp_Object Qicon_left, Qicon_top, Qicon_type, Qicon_name; 88Lisp_Object Qicon_left, Qicon_top, Qicon_type, Qicon_name;
@@ -95,19 +95,20 @@ Lisp_Object Qvisibility;
95Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background; 95Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background;
96Lisp_Object Qscreen_gamma; 96Lisp_Object Qscreen_gamma;
97Lisp_Object Qline_spacing; 97Lisp_Object Qline_spacing;
98Lisp_Object Quser_position, Quser_size; 98static Lisp_Object Quser_position, Quser_size;
99Lisp_Object Qwait_for_wm; 99Lisp_Object Qwait_for_wm;
100Lisp_Object Qwindow_id; 100static Lisp_Object Qwindow_id;
101#ifdef HAVE_X_WINDOWS 101#ifdef HAVE_X_WINDOWS
102Lisp_Object Qouter_window_id; 102static Lisp_Object Qouter_window_id;
103#endif 103#endif
104Lisp_Object Qparent_id; 104Lisp_Object Qparent_id;
105Lisp_Object Qtitle, Qname; 105Lisp_Object Qtitle, Qname;
106Lisp_Object Qexplicit_name; 106static Lisp_Object Qexplicit_name;
107Lisp_Object Qunsplittable; 107Lisp_Object Qunsplittable;
108Lisp_Object Qmenu_bar_lines, Qtool_bar_lines, Qtool_bar_position; 108Lisp_Object Qmenu_bar_lines, Qtool_bar_lines, Qtool_bar_position;
109Lisp_Object Qleft_fringe, Qright_fringe; 109Lisp_Object Qleft_fringe, Qright_fringe;
110Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; 110Lisp_Object Qbuffer_predicate;
111static Lisp_Object Qbuffer_list, Qburied_buffer_list;
111Lisp_Object Qtty_color_mode; 112Lisp_Object Qtty_color_mode;
112Lisp_Object Qtty, Qtty_type; 113Lisp_Object Qtty, Qtty_type;
113 114
diff --git a/src/frame.h b/src/frame.h
index 756e121f678..a82de35efb1 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1047,7 +1047,7 @@ extern Lisp_Object selected_frame;
1047 1047
1048extern Lisp_Object Qauto_raise, Qauto_lower; 1048extern Lisp_Object Qauto_raise, Qauto_lower;
1049extern Lisp_Object Qborder_color, Qborder_width; 1049extern Lisp_Object Qborder_color, Qborder_width;
1050extern Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; 1050extern Lisp_Object Qbuffer_predicate;
1051extern Lisp_Object Qcursor_color, Qcursor_type; 1051extern Lisp_Object Qcursor_color, Qcursor_type;
1052extern Lisp_Object Qfont; 1052extern Lisp_Object Qfont;
1053extern Lisp_Object Qbackground_color, Qforeground_color; 1053extern Lisp_Object Qbackground_color, Qforeground_color;
@@ -1076,7 +1076,6 @@ extern Lisp_Object Qminibuffer, Qmodeline;
1076extern Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; 1076extern Lisp_Object Qx, Qw32, Qmac, Qpc, Qns;
1077extern Lisp_Object Qvisible; 1077extern Lisp_Object Qvisible;
1078extern Lisp_Object Qdisplay_type; 1078extern Lisp_Object Qdisplay_type;
1079extern Lisp_Object Qbackground_mode;
1080 1079
1081extern Lisp_Object Qx_resource_name; 1080extern Lisp_Object Qx_resource_name;
1082 1081
diff --git a/src/fringe.c b/src/fringe.c
index ce75df766ee..281b563c9b7 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -64,9 +64,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
64 must specify physical bitmap symbols. 64 must specify physical bitmap symbols.
65*/ 65*/
66 66
67Lisp_Object Qtruncation, Qcontinuation, Qoverlay_arrow; 67static Lisp_Object Qtruncation, Qcontinuation, Qoverlay_arrow;
68Lisp_Object Qempty_line, Qtop_bottom; 68static Lisp_Object Qempty_line, Qtop_bottom;
69Lisp_Object Qhollow_small; 69static Lisp_Object Qhollow_small;
70 70
71enum fringe_bitmap_align 71enum fringe_bitmap_align
72{ 72{
diff --git a/src/ftfont.c b/src/ftfont.c
index 2e66222d268..47425e853da 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -39,7 +39,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
39#include "ftfont.h" 39#include "ftfont.h"
40 40
41/* Symbolic type of this font-driver. */ 41/* Symbolic type of this font-driver. */
42Lisp_Object Qfreetype; 42static Lisp_Object Qfreetype;
43 43
44/* Fontconfig's generic families and their aliases. */ 44/* Fontconfig's generic families and their aliases. */
45static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif; 45static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif;
diff --git a/src/image.c b/src/image.c
index 20ca3cf1d6b..f1c3d5d84f0 100644
--- a/src/image.c
+++ b/src/image.c
@@ -124,7 +124,7 @@ typedef struct ns_bitmap_record Bitmap_Record;
124 124
125/* The symbol `postscript' identifying images of this type. */ 125/* The symbol `postscript' identifying images of this type. */
126 126
127Lisp_Object Qpostscript; 127static Lisp_Object Qpostscript;
128 128
129static void x_disable_image (struct frame *, struct image *); 129static void x_disable_image (struct frame *, struct image *);
130static void x_edge_detection (struct frame *, struct image *, Lisp_Object, 130static void x_edge_detection (struct frame *, struct image *, Lisp_Object,
@@ -562,17 +562,21 @@ static Lisp_Object Vimage_type_cache;
562 562
563/* The symbol `xbm' which is used as the type symbol for XBM images. */ 563/* The symbol `xbm' which is used as the type symbol for XBM images. */
564 564
565Lisp_Object Qxbm; 565static Lisp_Object Qxbm;
566 566
567/* Keywords. */ 567/* Keywords. */
568 568
569Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; 569Lisp_Object QCascent, QCmargin, QCrelief;
570Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; 570static Lisp_Object Qcount, Qextension_data;
571Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask, QCgeometry, QCcrop, QCrotation; 571Lisp_Object QCconversion;
572static Lisp_Object QCheuristic_mask;
573static Lisp_Object QCcolor_symbols;
574static Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask, QCgeometry;
575static Lisp_Object QCcrop, QCrotation;
572 576
573/* Other symbols. */ 577/* Other symbols. */
574 578
575Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic; 579static Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic;
576 580
577/* Function prototypes. */ 581/* Function prototypes. */
578 582
@@ -3001,7 +3005,7 @@ static int xpm_valid_color_symbols_p (Lisp_Object);
3001#if defined (HAVE_XPM) || defined (HAVE_NS) 3005#if defined (HAVE_XPM) || defined (HAVE_NS)
3002/* The symbol `xpm' identifying XPM-format images. */ 3006/* The symbol `xpm' identifying XPM-format images. */
3003 3007
3004Lisp_Object Qxpm; 3008static Lisp_Object Qxpm;
3005 3009
3006/* Indices of image specification fields in xpm_format, below. */ 3010/* Indices of image specification fields in xpm_format, below. */
3007 3011
@@ -4925,7 +4929,7 @@ static int pbm_scan_number (unsigned char **, unsigned char *);
4925 4929
4926/* The symbol `pbm' identifying images of this type. */ 4930/* The symbol `pbm' identifying images of this type. */
4927 4931
4928Lisp_Object Qpbm; 4932static Lisp_Object Qpbm;
4929 4933
4930/* Indices of image specification fields in gs_format, below. */ 4934/* Indices of image specification fields in gs_format, below. */
4931 4935
@@ -5342,7 +5346,7 @@ static int png_load (struct frame *f, struct image *img);
5342 5346
5343/* The symbol `png' identifying images of this type. */ 5347/* The symbol `png' identifying images of this type. */
5344 5348
5345Lisp_Object Qpng; 5349static Lisp_Object Qpng;
5346 5350
5347/* Indices of image specification fields in png_format, below. */ 5351/* Indices of image specification fields in png_format, below. */
5348 5352
@@ -5956,7 +5960,7 @@ static int jpeg_load (struct frame *f, struct image *img);
5956 5960
5957/* The symbol `jpeg' identifying images of this type. */ 5961/* The symbol `jpeg' identifying images of this type. */
5958 5962
5959Lisp_Object Qjpeg; 5963static Lisp_Object Qjpeg;
5960 5964
5961/* Indices of image specification fields in gs_format, below. */ 5965/* Indices of image specification fields in gs_format, below. */
5962 5966
@@ -6505,7 +6509,7 @@ static int tiff_load (struct frame *f, struct image *img);
6505 6509
6506/* The symbol `tiff' identifying images of this type. */ 6510/* The symbol `tiff' identifying images of this type. */
6507 6511
6508Lisp_Object Qtiff; 6512static Lisp_Object Qtiff;
6509 6513
6510/* Indices of image specification fields in tiff_format, below. */ 6514/* Indices of image specification fields in tiff_format, below. */
6511 6515
@@ -6933,7 +6937,7 @@ static void gif_clear_image (struct frame *f, struct image *img);
6933 6937
6934/* The symbol `gif' identifying images of this type. */ 6938/* The symbol `gif' identifying images of this type. */
6935 6939
6936Lisp_Object Qgif; 6940static Lisp_Object Qgif;
6937 6941
6938/* Indices of image specification fields in gif_format, below. */ 6942/* Indices of image specification fields in gif_format, below. */
6939 6943
@@ -8302,7 +8306,7 @@ static void gs_clear_image (struct frame *f, struct image *img);
8302 8306
8303/* Keyword symbols. */ 8307/* Keyword symbols. */
8304 8308
8305Lisp_Object QCloader, QCbounding_box, QCpt_width, QCpt_height; 8309static Lisp_Object QCloader, QCbounding_box, QCpt_width, QCpt_height;
8306 8310
8307/* Indices of image specification fields in gs_format, below. */ 8311/* Indices of image specification fields in gs_format, below. */
8308 8312
diff --git a/src/intervals.h b/src/intervals.h
index b2d755036ba..3a9ee87b921 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -295,8 +295,6 @@ extern int invisible_p (Lisp_Object, Lisp_Object);
295/* Declared in textprop.c */ 295/* Declared in textprop.c */
296 296
297/* Types of hooks. */ 297/* Types of hooks. */
298extern Lisp_Object Qmouse_left;
299extern Lisp_Object Qmouse_entered;
300extern Lisp_Object Qpoint_left; 298extern Lisp_Object Qpoint_left;
301extern Lisp_Object Qpoint_entered; 299extern Lisp_Object Qpoint_entered;
302extern Lisp_Object Qmodification_hooks; 300extern Lisp_Object Qmodification_hooks;
@@ -305,8 +303,8 @@ extern Lisp_Object Qlocal_map;
305extern Lisp_Object Qkeymap; 303extern Lisp_Object Qkeymap;
306 304
307/* Visual properties text (including strings) may have. */ 305/* Visual properties text (including strings) may have. */
308extern Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple; 306extern Lisp_Object Qfont;
309extern Lisp_Object Qinvisible, Qintangible, Qread_only; 307extern Lisp_Object Qinvisible, Qintangible;
310 308
311/* Sticky properties */ 309/* Sticky properties */
312extern Lisp_Object Qfront_sticky, Qrear_nonsticky; 310extern Lisp_Object Qfront_sticky, Qrear_nonsticky;
diff --git a/src/keyboard.c b/src/keyboard.c
index 97989fc1c15..f4afe000685 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -100,7 +100,8 @@ int single_kboard;
100 100
101/* Non-nil disable property on a command means 101/* Non-nil disable property on a command means
102 do not execute it; call disabled-command-function's value instead. */ 102 do not execute it; call disabled-command-function's value instead. */
103Lisp_Object Qdisabled, Qdisabled_command_function; 103Lisp_Object Qdisabled;
104static Lisp_Object Qdisabled_command_function;
104 105
105#define NUM_RECENT_KEYS (300) 106#define NUM_RECENT_KEYS (300)
106int recent_keys_index; /* Index for storing next element into recent_keys */ 107int recent_keys_index; /* Index for storing next element into recent_keys */
@@ -231,36 +232,37 @@ Lisp_Object internal_last_event_frame;
231 X Windows wants this for selection ownership. */ 232 X Windows wants this for selection ownership. */
232unsigned long last_event_timestamp; 233unsigned long last_event_timestamp;
233 234
234Lisp_Object Qx_set_selection, QPRIMARY, Qhandle_switch_frame; 235static Lisp_Object Qx_set_selection, Qhandle_switch_frame;
236Lisp_Object QPRIMARY;
235 237
236Lisp_Object Qself_insert_command; 238static Lisp_Object Qself_insert_command;
237Lisp_Object Qforward_char; 239static Lisp_Object Qforward_char;
238Lisp_Object Qbackward_char; 240static Lisp_Object Qbackward_char;
239Lisp_Object Qundefined; 241static Lisp_Object Qundefined;
240Lisp_Object Qtimer_event_handler; 242static Lisp_Object Qtimer_event_handler;
241 243
242/* read_key_sequence stores here the command definition of the 244/* read_key_sequence stores here the command definition of the
243 key sequence that it reads. */ 245 key sequence that it reads. */
244Lisp_Object read_key_sequence_cmd; 246Lisp_Object read_key_sequence_cmd;
245 247
246Lisp_Object Qinput_method_function; 248static Lisp_Object Qinput_method_function;
247 249
248Lisp_Object Qdeactivate_mark; 250static Lisp_Object Qdeactivate_mark;
249 251
250Lisp_Object Qrecompute_lucid_menubar, Qactivate_menubar_hook; 252Lisp_Object Qrecompute_lucid_menubar, Qactivate_menubar_hook;
251 253
252Lisp_Object Qecho_area_clear_hook; 254static Lisp_Object Qecho_area_clear_hook;
253 255
254/* Hooks to run before and after each command. */ 256/* Hooks to run before and after each command. */
255Lisp_Object Qpre_command_hook; 257static Lisp_Object Qpre_command_hook;
256Lisp_Object Qpost_command_hook; 258static Lisp_Object Qpost_command_hook;
257 259
258Lisp_Object Qdeferred_action_function; 260static Lisp_Object Qdeferred_action_function;
259 261
260Lisp_Object Qinput_method_exit_on_first_char; 262static Lisp_Object Qinput_method_exit_on_first_char;
261Lisp_Object Qinput_method_use_echo_area; 263static Lisp_Object Qinput_method_use_echo_area;
262 264
263Lisp_Object Qhelp_form_show; 265static Lisp_Object Qhelp_form_show;
264 266
265/* File in which we write all commands we read. */ 267/* File in which we write all commands we read. */
266FILE *dribble; 268FILE *dribble;
@@ -293,42 +295,49 @@ static struct input_event * volatile kbd_store_ptr;
293 at inopportune times. */ 295 at inopportune times. */
294 296
295/* Symbols to head events. */ 297/* Symbols to head events. */
296Lisp_Object Qmouse_movement; 298static Lisp_Object Qmouse_movement;
297Lisp_Object Qscroll_bar_movement; 299static Lisp_Object Qscroll_bar_movement;
298Lisp_Object Qswitch_frame; 300Lisp_Object Qswitch_frame;
299Lisp_Object Qdelete_frame; 301static Lisp_Object Qdelete_frame;
300Lisp_Object Qiconify_frame; 302static Lisp_Object Qiconify_frame;
301Lisp_Object Qmake_frame_visible; 303static Lisp_Object Qmake_frame_visible;
302Lisp_Object Qselect_window; 304static Lisp_Object Qselect_window;
303Lisp_Object Qhelp_echo; 305Lisp_Object Qhelp_echo;
304 306
305#if defined (HAVE_MOUSE) || defined (HAVE_GPM) 307#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
306Lisp_Object Qmouse_fixup_help_message; 308static Lisp_Object Qmouse_fixup_help_message;
307#endif 309#endif
308 310
309/* Symbols to denote kinds of events. */ 311/* Symbols to denote kinds of events. */
310Lisp_Object Qfunction_key; 312static Lisp_Object Qfunction_key;
311Lisp_Object Qmouse_click; 313Lisp_Object Qmouse_click;
312#if defined (WINDOWSNT) 314#if defined (WINDOWSNT)
313Lisp_Object Qlanguage_change; 315Lisp_Object Qlanguage_change;
314#endif 316#endif
315Lisp_Object Qdrag_n_drop; 317static Lisp_Object Qdrag_n_drop;
316Lisp_Object Qsave_session; 318static Lisp_Object Qsave_session;
317#ifdef HAVE_DBUS 319#ifdef HAVE_DBUS
318Lisp_Object Qdbus_event; 320static Lisp_Object Qdbus_event;
319#endif 321#endif
320Lisp_Object Qconfig_changed_event; 322static Lisp_Object Qconfig_changed_event;
321 323
322/* Lisp_Object Qmouse_movement; - also an event header */ 324/* Lisp_Object Qmouse_movement; - also an event header */
323 325
324/* Properties of event headers. */ 326/* Properties of event headers. */
325Lisp_Object Qevent_kind; 327Lisp_Object Qevent_kind;
326Lisp_Object Qevent_symbol_elements; 328static Lisp_Object Qevent_symbol_elements;
327 329
328/* menu and tool bar item parts */ 330/* menu and tool bar item parts */
329Lisp_Object Qmenu_enable; 331static Lisp_Object Qmenu_enable;
330Lisp_Object QCenable, QCvisible, QChelp, QCfilter, QCkeys, QCkey_sequence; 332static Lisp_Object QCenable, QCvisible, QChelp, QCkeys, QCkey_sequence;
331Lisp_Object QCbutton, QCtoggle, QCradio, QClabel, QCvert_only; 333Lisp_Object QCfilter;
334
335/* Non-nil disable property on a command means
336 do not execute it; call disabled-command-function's value instead. */
337Lisp_Object QCtoggle, QCradio;
338static Lisp_Object QCbutton, QClabel;
339
340static Lisp_Object QCvert_only;
332 341
333/* An event header symbol HEAD may have a property named 342/* An event header symbol HEAD may have a property named
334 Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS); 343 Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS);
@@ -341,22 +350,22 @@ Lisp_Object Qevent_symbol_element_mask;
341 Qmodifier_cache, which is an alist mapping modifier masks onto 350 Qmodifier_cache, which is an alist mapping modifier masks onto
342 modified versions of BASE. If present, this helps speed up 351 modified versions of BASE. If present, this helps speed up
343 apply_modifiers. */ 352 apply_modifiers. */
344Lisp_Object Qmodifier_cache; 353static Lisp_Object Qmodifier_cache;
345 354
346/* Symbols to use for parts of windows. */ 355/* Symbols to use for parts of windows. */
347Lisp_Object Qmode_line; 356Lisp_Object Qmode_line;
348Lisp_Object Qvertical_line; 357Lisp_Object Qvertical_line;
349Lisp_Object Qvertical_scroll_bar; 358static Lisp_Object Qvertical_scroll_bar;
350Lisp_Object Qmenu_bar; 359Lisp_Object Qmenu_bar;
351 360
352Lisp_Object recursive_edit_unwind (Lisp_Object buffer), command_loop (void); 361Lisp_Object recursive_edit_unwind (Lisp_Object buffer), command_loop (void);
353Lisp_Object Qextended_command_history; 362static Lisp_Object Qextended_command_history;
354EMACS_TIME timer_check (void); 363EMACS_TIME timer_check (void);
355 364
356static void record_menu_key (Lisp_Object c); 365static void record_menu_key (Lisp_Object c);
357static int echo_length (void); 366static int echo_length (void);
358 367
359Lisp_Object Qpolling_period; 368static Lisp_Object Qpolling_period;
360 369
361/* Incremented whenever a timer is run. */ 370/* Incremented whenever a timer is run. */
362int timers_run; 371int timers_run;
@@ -5032,9 +5041,11 @@ static const char *const lispy_drag_n_drop_names[] =
5032}; 5041};
5033 5042
5034/* Scroll bar parts. */ 5043/* Scroll bar parts. */
5035Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; 5044static Lisp_Object Qabove_handle, Qhandle, Qbelow_handle;
5036Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; 5045Lisp_Object Qup, Qdown, Qbottom;
5037Lisp_Object Qtop, Qratio; 5046static Lisp_Object Qend_scroll;
5047Lisp_Object Qtop;
5048static Lisp_Object Qratio;
5038 5049
5039/* An array of scroll bar parts, indexed by an enum scroll_bar_part value. */ 5050/* An array of scroll bar parts, indexed by an enum scroll_bar_part value. */
5040static Lisp_Object *const scroll_bar_parts[] = { 5051static Lisp_Object *const scroll_bar_parts[] = {
@@ -7889,8 +7900,8 @@ static int ntool_bar_items;
7889 7900
7890/* The symbols `:image' and `:rtl'. */ 7901/* The symbols `:image' and `:rtl'. */
7891 7902
7892Lisp_Object QCimage; 7903static Lisp_Object QCimage;
7893Lisp_Object Qrtl; 7904static Lisp_Object Qrtl;
7894 7905
7895/* Function prototypes. */ 7906/* Function prototypes. */
7896 7907
diff --git a/src/keyboard.h b/src/keyboard.h
index 72bb821b2eb..d945de5de20 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -408,15 +408,10 @@ typedef struct _widget_value
408extern Lisp_Object Qswitch_frame; 408extern Lisp_Object Qswitch_frame;
409 409
410/* Properties on event heads. */ 410/* Properties on event heads. */
411extern Lisp_Object Qevent_kind, Qevent_symbol_elements; 411extern Lisp_Object Qevent_kind;
412
413/* Getting an unmodified version of an event head. */
414#define EVENT_HEAD_UNMODIFIED(event_head) \
415 (Fcar (Fget ((event_head), Qevent_symbol_elements)))
416 412
417/* The values of Qevent_kind properties. */ 413/* The values of Qevent_kind properties. */
418extern Lisp_Object Qfunction_key, Qmouse_click, Qmouse_movement; 414extern Lisp_Object Qmouse_click;
419extern Lisp_Object Qscroll_bar_movement;
420 415
421extern Lisp_Object Qhelp_echo; 416extern Lisp_Object Qhelp_echo;
422 417
@@ -454,9 +449,7 @@ extern Lisp_Object real_this_command;
454 449
455/* Non-nil disable property on a command means 450/* Non-nil disable property on a command means
456 do not execute it; call disabled-command-function's value instead. */ 451 do not execute it; call disabled-command-function's value instead. */
457extern Lisp_Object QCbutton, QCtoggle, QCradio, QClabel; 452extern Lisp_Object QCtoggle, QCradio;
458
459extern Lisp_Object Qinput_method_function;
460 453
461/* An event header symbol HEAD may have a property named 454/* An event header symbol HEAD may have a property named
462 Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS); 455 Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS);
diff --git a/src/keymap.c b/src/keymap.c
index 9adf2898736..741fa4f6dfc 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -56,8 +56,9 @@ Lisp_Object control_x_map; /* The keymap used for globally bound
56 56
57/* keymap used for minibuffers when doing completion */ 57/* keymap used for minibuffers when doing completion */
58/* keymap used for minibuffers when doing completion and require a match */ 58/* keymap used for minibuffers when doing completion and require a match */
59Lisp_Object Qkeymapp, Qkeymap, Qnon_ascii, Qmenu_item, Qremap; 59static Lisp_Object Qkeymapp, Qnon_ascii;
60Lisp_Object QCadvertised_binding; 60Lisp_Object Qkeymap, Qmenu_item, Qremap;
61static Lisp_Object QCadvertised_binding;
61 62
62/* Alist of elements like (DEL . "\d"). */ 63/* Alist of elements like (DEL . "\d"). */
63static Lisp_Object exclude_keys; 64static Lisp_Object exclude_keys;
@@ -659,7 +660,7 @@ map_keymap (Lisp_Object map, map_keymap_function_t fun, Lisp_Object args, void *
659 UNGCPRO; 660 UNGCPRO;
660} 661}
661 662
662Lisp_Object Qkeymap_canonicalize; 663static Lisp_Object Qkeymap_canonicalize;
663 664
664/* Same as map_keymap, but does it right, properly eliminating duplicate 665/* Same as map_keymap, but does it right, properly eliminating duplicate
665 bindings due to inheritance. */ 666 bindings due to inheritance. */
@@ -2175,7 +2176,7 @@ then the value includes only maps for prefixes that start with PREFIX. */)
2175 } 2176 }
2176 return maps; 2177 return maps;
2177} 2178}
2178Lisp_Object Qsingle_key_description, Qkey_description; 2179static Lisp_Object Qsingle_key_description, Qkey_description;
2179 2180
2180/* This function cannot GC. */ 2181/* This function cannot GC. */
2181 2182
diff --git a/src/lisp.h b/src/lisp.h
index 10fc66f4406..fb44002b6a6 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2291,22 +2291,22 @@ struct window;
2291struct frame; 2291struct frame;
2292 2292
2293/* Defined in data.c. */ 2293/* Defined in data.c. */
2294extern Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; 2294extern Lisp_Object Qnil, Qt, Qquote, Qlambda, Qunbound;
2295extern Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; 2295extern Lisp_Object Qerror_conditions, Qerror_message, Qtop_level;
2296extern Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; 2296extern Lisp_Object Qerror, Qquit, Qargs_out_of_range;
2297extern Lisp_Object Qvoid_variable, Qvoid_function; 2297extern Lisp_Object Qvoid_variable, Qvoid_function;
2298extern Lisp_Object Qsetting_constant, Qinvalid_read_syntax; 2298extern Lisp_Object Qinvalid_read_syntax;
2299extern Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; 2299extern Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch;
2300extern Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; 2300extern Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive;
2301extern Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; 2301extern Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only;
2302extern Lisp_Object Qtext_read_only; 2302extern Lisp_Object Qtext_read_only;
2303extern Lisp_Object Qinteractive_form; 2303extern Lisp_Object Qinteractive_form;
2304extern Lisp_Object Qcircular_list; 2304extern Lisp_Object Qcircular_list;
2305extern Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; 2305extern Lisp_Object Qintegerp, Qwholenump, Qsymbolp, Qlistp, Qconsp;
2306extern Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; 2306extern Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp;
2307extern Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; 2307extern Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp;
2308extern Lisp_Object Qbuffer_or_string_p; 2308extern Lisp_Object Qbuffer_or_string_p;
2309extern Lisp_Object Qboundp, Qfboundp; 2309extern Lisp_Object Qfboundp;
2310extern Lisp_Object Qchar_table_p, Qvector_or_char_table_p; 2310extern Lisp_Object Qchar_table_p, Qvector_or_char_table_p;
2311 2311
2312extern Lisp_Object Qcdr; 2312extern Lisp_Object Qcdr;
@@ -2530,9 +2530,8 @@ extern void init_fringe_once (void);
2530#endif /* HAVE_WINDOW_SYSTEM */ 2530#endif /* HAVE_WINDOW_SYSTEM */
2531 2531
2532/* Defined in image.c */ 2532/* Defined in image.c */
2533extern Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; 2533extern Lisp_Object QCascent, QCmargin, QCrelief;
2534extern Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; 2534extern Lisp_Object QCconversion;
2535extern Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask;
2536extern int x_bitmap_mask (struct frame *, int); 2535extern int x_bitmap_mask (struct frame *, int);
2537extern void syms_of_image (void); 2536extern void syms_of_image (void);
2538extern void init_image (void); 2537extern void init_image (void);
@@ -2602,8 +2601,6 @@ extern void syms_of_display (void);
2602/* Defined in xdisp.c */ 2601/* Defined in xdisp.c */
2603extern Lisp_Object Qinhibit_point_motion_hooks; 2602extern Lisp_Object Qinhibit_point_motion_hooks;
2604extern Lisp_Object Qinhibit_redisplay, Qdisplay; 2603extern Lisp_Object Qinhibit_redisplay, Qdisplay;
2605extern Lisp_Object Qinhibit_eval_during_redisplay;
2606extern Lisp_Object Qmessage_truncate_lines;
2607extern Lisp_Object Qmenu_bar_update_hook; 2604extern Lisp_Object Qmenu_bar_update_hook;
2608extern Lisp_Object Qwindow_scroll_functions; 2605extern Lisp_Object Qwindow_scroll_functions;
2609extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; 2606extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
@@ -2821,6 +2818,7 @@ extern void syms_of_lread (void);
2821/* Defined in eval.c. */ 2818/* Defined in eval.c. */
2822extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro; 2819extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro;
2823extern Lisp_Object Qinhibit_quit, Qclosure; 2820extern Lisp_Object Qinhibit_quit, Qclosure;
2821extern Lisp_Object Qand_rest;
2824extern Lisp_Object Vautoload_queue; 2822extern Lisp_Object Vautoload_queue;
2825extern Lisp_Object Vsignaling_function; 2823extern Lisp_Object Vsignaling_function;
2826extern int handling_signal; 2824extern int handling_signal;
@@ -2963,8 +2961,7 @@ EXFUN (Fkill_buffer, 1);
2963EXFUN (Fkill_all_local_variables, 0); 2961EXFUN (Fkill_all_local_variables, 0);
2964EXFUN (Fbuffer_enable_undo, 1); 2962EXFUN (Fbuffer_enable_undo, 1);
2965EXFUN (Ferase_buffer, 0); 2963EXFUN (Ferase_buffer, 0);
2966extern Lisp_Object Qoverlayp; 2964extern Lisp_Object Qpriority, Qwindow, Qbefore_string, Qafter_string;
2967extern Lisp_Object Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string;
2968extern Lisp_Object get_truename_buffer (Lisp_Object); 2965extern Lisp_Object get_truename_buffer (Lisp_Object);
2969extern struct buffer *all_buffers; 2966extern struct buffer *all_buffers;
2970EXFUN (Fprevious_overlay_change, 1); 2967EXFUN (Fprevious_overlay_change, 1);
@@ -3111,16 +3108,14 @@ extern Lisp_Object echo_message_buffer;
3111extern struct kboard *echo_kboard; 3108extern struct kboard *echo_kboard;
3112extern void cancel_echoing (void); 3109extern void cancel_echoing (void);
3113extern Lisp_Object Qdisabled, QCfilter; 3110extern Lisp_Object Qdisabled, QCfilter;
3114extern Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; 3111extern Lisp_Object Qup, Qdown, Qbottom;
3115extern Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; 3112extern Lisp_Object Qtop;
3116extern Lisp_Object Qtop, Qratio;
3117extern int input_pending; 3113extern int input_pending;
3118EXFUN (Fdiscard_input, 0); 3114EXFUN (Fdiscard_input, 0);
3119EXFUN (Frecursive_edit, 0); 3115EXFUN (Frecursive_edit, 0);
3120EXFUN (Ftop_level, 0) NO_RETURN; 3116EXFUN (Ftop_level, 0) NO_RETURN;
3121extern Lisp_Object menu_bar_items (Lisp_Object); 3117extern Lisp_Object menu_bar_items (Lisp_Object);
3122extern Lisp_Object tool_bar_items (Lisp_Object, int *); 3118extern Lisp_Object tool_bar_items (Lisp_Object, int *);
3123extern Lisp_Object Qvertical_scroll_bar;
3124extern void discard_mouse_events (void); 3119extern void discard_mouse_events (void);
3125EXFUN (Fevent_convert_list, 1); 3120EXFUN (Fevent_convert_list, 1);
3126EXFUN (Fread_key_sequence, 5); 3121EXFUN (Fread_key_sequence, 5);
@@ -3223,7 +3218,6 @@ EXFUN (Fget_buffer_process, 1);
3223EXFUN (Fprocess_status, 1); 3218EXFUN (Fprocess_status, 1);
3224EXFUN (Fkill_process, 2); 3219EXFUN (Fkill_process, 2);
3225EXFUN (Fwaiting_for_user_input_p, 0); 3220EXFUN (Fwaiting_for_user_input_p, 0);
3226extern Lisp_Object Qprocessp;
3227extern void kill_buffer_processes (Lisp_Object); 3221extern void kill_buffer_processes (Lisp_Object);
3228extern int wait_reading_process_output (int, int, int, int, 3222extern int wait_reading_process_output (int, int, int, int,
3229 Lisp_Object, 3223 Lisp_Object,
@@ -3411,9 +3405,9 @@ EXFUN (Fx_focus_frame, 1);
3411#endif 3405#endif
3412 3406
3413/* Defined in xfaces.c */ 3407/* Defined in xfaces.c */
3414extern Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; 3408extern Lisp_Object Qdefault, Qtool_bar, Qfringe;
3415extern Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; 3409extern Lisp_Object Qheader_line, Qscroll_bar, Qcursor;
3416extern Lisp_Object Qmode_line_inactive, Qvertical_border; 3410extern Lisp_Object Qmode_line_inactive;
3417extern Lisp_Object Qface; 3411extern Lisp_Object Qface;
3418extern Lisp_Object Qnormal; 3412extern Lisp_Object Qnormal;
3419extern Lisp_Object QCfamily, QCweight, QCslant; 3413extern Lisp_Object QCfamily, QCweight, QCslant;
diff --git a/src/lread.c b/src/lread.c
index 7d12f5a85d3..2d383350ec1 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -61,20 +61,21 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
61#endif 61#endif
62 62
63/* hash table read constants */ 63/* hash table read constants */
64Lisp_Object Qhash_table, Qdata; 64static Lisp_Object Qhash_table, Qdata;
65Lisp_Object Qtest, Qsize; 65static Lisp_Object Qtest, Qsize;
66Lisp_Object Qweakness; 66static Lisp_Object Qweakness;
67Lisp_Object Qrehash_size; 67static Lisp_Object Qrehash_size;
68Lisp_Object Qrehash_threshold; 68static Lisp_Object Qrehash_threshold;
69 69
70Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; 70static Lisp_Object Qread_char, Qget_file_char, Qcurrent_load_list;
71Lisp_Object Qstandard_input;
71Lisp_Object Qvariable_documentation; 72Lisp_Object Qvariable_documentation;
72Lisp_Object Qascii_character, Qload, Qload_file_name; 73static Lisp_Object Qascii_character, Qload, Qload_file_name;
73Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction; 74Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction;
74Lisp_Object Qinhibit_file_name_operation; 75static Lisp_Object Qinhibit_file_name_operation;
75Lisp_Object Qeval_buffer_list; 76static Lisp_Object Qeval_buffer_list;
76Lisp_Object Qlexical_binding; 77static Lisp_Object Qlexical_binding;
77Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ 78static Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */
78 79
79/* Used instead of Qget_file_char while loading *.elc files compiled 80/* Used instead of Qget_file_char while loading *.elc files compiled
80 by Emacs 21 or older. */ 81 by Emacs 21 or older. */
diff --git a/src/macros.c b/src/macros.c
index fd771b52dee..e5de4a14136 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -27,7 +27,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
27#include "window.h" 27#include "window.h"
28#include "keyboard.h" 28#include "keyboard.h"
29 29
30Lisp_Object Qexecute_kbd_macro, Qkbd_macro_termination_hook; 30Lisp_Object Qexecute_kbd_macro;
31static Lisp_Object Qkbd_macro_termination_hook;
31 32
32/* Number of successful iterations so far 33/* Number of successful iterations so far
33 for innermost keyboard macro. 34 for innermost keyboard macro.
diff --git a/src/minibuf.c b/src/minibuf.c
index 3e8fc0c2424..ae4372746bc 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -53,35 +53,35 @@ int minibuf_level;
53 53
54/* The maximum length of a minibuffer history. */ 54/* The maximum length of a minibuffer history. */
55 55
56Lisp_Object Qhistory_length; 56static Lisp_Object Qhistory_length;
57 57
58/* Fread_minibuffer leaves the input here as a string. */ 58/* Fread_minibuffer leaves the input here as a string. */
59 59
60Lisp_Object last_minibuf_string; 60Lisp_Object last_minibuf_string;
61 61
62Lisp_Object Qminibuffer_history, Qbuffer_name_history; 62static Lisp_Object Qminibuffer_history, Qbuffer_name_history;
63 63
64Lisp_Object Qread_file_name_internal; 64static Lisp_Object Qread_file_name_internal;
65 65
66/* Normal hooks for entry to and exit from minibuffer. */ 66/* Normal hooks for entry to and exit from minibuffer. */
67 67
68Lisp_Object Qminibuffer_setup_hook; 68static Lisp_Object Qminibuffer_setup_hook;
69Lisp_Object Qminibuffer_exit_hook; 69static Lisp_Object Qminibuffer_exit_hook;
70 70
71Lisp_Object Qcompletion_ignore_case; 71Lisp_Object Qcompletion_ignore_case;
72Lisp_Object Qminibuffer_completion_table; 72static Lisp_Object Qminibuffer_completion_table;
73Lisp_Object Qminibuffer_completion_predicate; 73static Lisp_Object Qminibuffer_completion_predicate;
74Lisp_Object Qminibuffer_completion_confirm; 74static Lisp_Object Qminibuffer_completion_confirm;
75Lisp_Object Qcompleting_read_default; 75static Lisp_Object Qcompleting_read_default;
76Lisp_Object Quser_variable_p; 76static Lisp_Object Quser_variable_p;
77 77
78Lisp_Object Qminibuffer_default; 78static Lisp_Object Qminibuffer_default;
79 79
80Lisp_Object Qcurrent_input_method, Qactivate_input_method; 80static Lisp_Object Qcurrent_input_method, Qactivate_input_method;
81 81
82Lisp_Object Qcase_fold_search; 82static Lisp_Object Qcase_fold_search;
83 83
84Lisp_Object Qread_expression_history; 84static Lisp_Object Qread_expression_history;
85 85
86/* Prompt to display in front of the mini-buffer contents. */ 86/* Prompt to display in front of the mini-buffer contents. */
87 87
diff --git a/src/print.c b/src/print.c
index f039b40aa60..82040555921 100644
--- a/src/print.c
+++ b/src/print.c
@@ -39,11 +39,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
39 39
40Lisp_Object Qstandard_output; 40Lisp_Object Qstandard_output;
41 41
42Lisp_Object Qtemp_buffer_setup_hook; 42static Lisp_Object Qtemp_buffer_setup_hook;
43 43
44/* These are used to print like we read. */ 44/* These are used to print like we read. */
45 45
46Lisp_Object Qfloat_output_format; 46static Lisp_Object Qfloat_output_format;
47 47
48#include <math.h> 48#include <math.h>
49 49
@@ -79,7 +79,7 @@ EMACS_INT print_buffer_pos;
79EMACS_INT print_buffer_pos_byte; 79EMACS_INT print_buffer_pos_byte;
80 80
81Lisp_Object Qprint_escape_newlines; 81Lisp_Object Qprint_escape_newlines;
82Lisp_Object Qprint_escape_multibyte, Qprint_escape_nonascii; 82static Lisp_Object Qprint_escape_multibyte, Qprint_escape_nonascii;
83 83
84/* Vprint_number_table is a table, that keeps objects that are going to 84/* Vprint_number_table is a table, that keeps objects that are going to
85 be printed, to allow use of #n= and #n# to express sharing. 85 be printed, to allow use of #n= and #n# to express sharing.
diff --git a/src/process.c b/src/process.c
index ec96c1aa67e..89d04081eb7 100644
--- a/src/process.c
+++ b/src/process.c
@@ -127,22 +127,24 @@ int inhibit_sentinels;
127 127
128#ifdef subprocesses 128#ifdef subprocesses
129 129
130Lisp_Object Qprocessp; 130static Lisp_Object Qprocessp;
131Lisp_Object Qrun, Qstop, Qsignal; 131static Lisp_Object Qrun, Qstop, Qsignal;
132Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten; 132static Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten;
133Lisp_Object Qlocal, Qipv4, Qdatagram, Qseqpacket; 133Lisp_Object Qlocal;
134Lisp_Object Qreal, Qnetwork, Qserial; 134static Lisp_Object Qipv4, Qdatagram, Qseqpacket;
135static Lisp_Object Qreal, Qnetwork, Qserial;
135#ifdef AF_INET6 136#ifdef AF_INET6
136Lisp_Object Qipv6; 137static Lisp_Object Qipv6;
137#endif 138#endif
138Lisp_Object QCport, QCspeed, QCprocess; 139static Lisp_Object QCport, QCprocess;
140Lisp_Object QCspeed;
139Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven; 141Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven;
140Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; 142Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary;
141Lisp_Object QCbuffer, QChost, QCservice; 143static Lisp_Object QCbuffer, QChost, QCservice;
142Lisp_Object QClocal, QCremote, QCcoding; 144static Lisp_Object QClocal, QCremote, QCcoding;
143Lisp_Object QCserver, QCnowait, QCnoquery, QCstop; 145static Lisp_Object QCserver, QCnowait, QCnoquery, QCstop;
144Lisp_Object QCsentinel, QClog, QCoptions, QCplist; 146static Lisp_Object QCsentinel, QClog, QCoptions, QCplist;
145Lisp_Object Qlast_nonmenu_event; 147static Lisp_Object Qlast_nonmenu_event;
146/* QCfamily is declared and initialized in xfaces.c, 148/* QCfamily is declared and initialized in xfaces.c,
147 QCfilter in keyboard.c. */ 149 QCfilter in keyboard.c. */
148extern Lisp_Object QCfamily, QCfilter; 150extern Lisp_Object QCfamily, QCfilter;
diff --git a/src/process.h b/src/process.h
index 6bf1084afcd..1e90f553b38 100644
--- a/src/process.h
+++ b/src/process.h
@@ -181,7 +181,7 @@ extern Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime;
181extern Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; 181extern Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs;
182extern Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime; 182extern Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime;
183extern Lisp_Object Qtime, Qctime; 183extern Lisp_Object Qtime, Qctime;
184extern Lisp_Object QCport, QCspeed, QCprocess; 184extern Lisp_Object QCspeed;
185extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven; 185extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven;
186extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; 186extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary;
187 187
@@ -198,4 +198,3 @@ extern void add_read_fd (int fd, fd_callback func, void *data);
198extern void delete_read_fd (int fd); 198extern void delete_read_fd (int fd);
199extern void add_write_fd (int fd, fd_callback func, void *data); 199extern void add_write_fd (int fd, fd_callback func, void *data);
200extern void delete_write_fd (int fd); 200extern void delete_write_fd (int fd);
201
diff --git a/src/search.c b/src/search.c
index 34f02e6cd65..ea10e47f556 100644
--- a/src/search.c
+++ b/src/search.c
@@ -85,10 +85,10 @@ static Lisp_Object last_thing_searched;
85 85
86/* error condition signaled when regexp compile_pattern fails */ 86/* error condition signaled when regexp compile_pattern fails */
87 87
88Lisp_Object Qinvalid_regexp; 88static Lisp_Object Qinvalid_regexp;
89 89
90/* Error condition used for failing searches */ 90/* Error condition used for failing searches */
91Lisp_Object Qsearch_failed; 91static Lisp_Object Qsearch_failed;
92 92
93static void set_search_regs (EMACS_INT, EMACS_INT); 93static void set_search_regs (EMACS_INT, EMACS_INT);
94static void save_search_regs (void); 94static void save_search_regs (void);
diff --git a/src/sound.c b/src/sound.c
index a972809e2c7..4478a067c09 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -94,9 +94,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
94 94
95/* Symbols. */ 95/* Symbols. */
96 96
97Lisp_Object QCvolume, QCdevice; 97static Lisp_Object QCvolume, QCdevice;
98Lisp_Object Qsound; 98static Lisp_Object Qsound;
99Lisp_Object Qplay_sound_functions; 99static Lisp_Object Qplay_sound_functions;
100 100
101/* Indices of attributes in a sound attributes vector. */ 101/* Indices of attributes in a sound attributes vector. */
102 102
diff --git a/src/syntax.c b/src/syntax.c
index 819a7542a7b..96d50f9a4e3 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -95,7 +95,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
95#define ST_COMMENT_STYLE (256 + 1) 95#define ST_COMMENT_STYLE (256 + 1)
96#define ST_STRING_STYLE (256 + 2) 96#define ST_STRING_STYLE (256 + 2)
97 97
98Lisp_Object Qsyntax_table_p, Qsyntax_table, Qscan_error; 98static Lisp_Object Qsyntax_table_p;
99static Lisp_Object Qsyntax_table, Qscan_error;
99 100
100/* Used as a temporary in SYNTAX_ENTRY and other macros in syntax.h, 101/* Used as a temporary in SYNTAX_ENTRY and other macros in syntax.h,
101 if not compiled with GCC. No need to mark it, since it is used 102 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 e8726bb28a4..2b052715dac 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
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21 21
22extern Lisp_Object Qsyntax_table_p;
23extern void update_syntax_table (EMACS_INT, int, int, Lisp_Object); 22extern void update_syntax_table (EMACS_INT, int, int, Lisp_Object);
24 23
25/* The standard syntax table is stored where it will automatically 24/* The standard syntax table is stored where it will automatically
@@ -300,4 +299,3 @@ struct gl_state_s
300 299
301extern struct gl_state_s gl_state; 300extern struct gl_state_s gl_state;
302extern EMACS_INT scan_words (EMACS_INT, EMACS_INT); 301extern EMACS_INT scan_words (EMACS_INT, EMACS_INT);
303
diff --git a/src/textprop.c b/src/textprop.c
index 8cd9d580c4c..b3bb064e8b8 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -47,16 +47,19 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
47 47
48 48
49/* Types of hooks. */ 49/* Types of hooks. */
50Lisp_Object Qmouse_left; 50static Lisp_Object Qmouse_left;
51Lisp_Object Qmouse_entered; 51static Lisp_Object Qmouse_entered;
52Lisp_Object Qpoint_left; 52Lisp_Object Qpoint_left;
53Lisp_Object Qpoint_entered; 53Lisp_Object Qpoint_entered;
54Lisp_Object Qcategory; 54Lisp_Object Qcategory;
55Lisp_Object Qlocal_map; 55Lisp_Object Qlocal_map;
56 56
57/* Visual properties text (including strings) may have. */ 57/* Visual properties text (including strings) may have. */
58Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple; 58static Lisp_Object Qforeground, Qbackground, Qunderline;
59Lisp_Object Qinvisible, Qread_only, Qintangible, Qmouse_face; 59Lisp_Object Qfont;
60static Lisp_Object Qstipple;
61Lisp_Object Qinvisible, Qintangible, Qmouse_face;
62static Lisp_Object Qread_only;
60Lisp_Object Qminibuffer_prompt; 63Lisp_Object Qminibuffer_prompt;
61 64
62/* Sticky properties */ 65/* Sticky properties */
diff --git a/src/window.c b/src/window.c
index 72ab2a3ea10..ee1b1bc04f7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -50,10 +50,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
50#include "nsterm.h" 50#include "nsterm.h"
51#endif 51#endif
52 52
53Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; 53Lisp_Object Qwindowp, Qwindow_live_p;
54Lisp_Object Qdisplay_buffer; 54static Lisp_Object Qwindow_configuration_p;
55Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; 55static Lisp_Object Qdisplay_buffer;
56Lisp_Object Qwindow_size_fixed; 56static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
57static Lisp_Object Qwindow_size_fixed;
57 58
58static int displayed_window_lines (struct window *); 59static int displayed_window_lines (struct window *);
59static struct window *decode_window (Lisp_Object); 60static struct window *decode_window (Lisp_Object);
@@ -116,7 +117,7 @@ Lisp_Object minibuf_selected_window;
116 117
117/* Hook run at end of temp_output_buffer_show. */ 118/* Hook run at end of temp_output_buffer_show. */
118 119
119Lisp_Object Qtemp_buffer_show_hook; 120static Lisp_Object Qtemp_buffer_show_hook;
120 121
121/* Incremented for each window created. */ 122/* Incremented for each window created. */
122 123
diff --git a/src/xdisp.c b/src/xdisp.c
index 7553841f51b..b5ba2090c70 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -318,29 +318,31 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
318 318
319Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; 319Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
320Lisp_Object Qwindow_scroll_functions; 320Lisp_Object Qwindow_scroll_functions;
321Lisp_Object Qwindow_text_change_functions; 321static Lisp_Object Qwindow_text_change_functions;
322Lisp_Object Qredisplay_end_trigger_functions; 322static Lisp_Object Qredisplay_end_trigger_functions;
323Lisp_Object Qinhibit_point_motion_hooks; 323Lisp_Object Qinhibit_point_motion_hooks;
324Lisp_Object QCeval, QCfile, QCdata, QCpropertize; 324static Lisp_Object QCeval, QCpropertize;
325Lisp_Object Qfontified; 325Lisp_Object QCfile, QCdata;
326Lisp_Object Qgrow_only; 326static Lisp_Object Qfontified;
327Lisp_Object Qinhibit_eval_during_redisplay; 327static Lisp_Object Qgrow_only;
328Lisp_Object Qbuffer_position, Qposition, Qobject; 328static Lisp_Object Qinhibit_eval_during_redisplay;
329Lisp_Object Qright_to_left, Qleft_to_right; 329static Lisp_Object Qbuffer_position, Qposition, Qobject;
330static Lisp_Object Qright_to_left, Qleft_to_right;
330 331
331/* Cursor shapes */ 332/* Cursor shapes */
332Lisp_Object Qbar, Qhbar, Qbox, Qhollow; 333Lisp_Object Qbar, Qhbar, Qbox, Qhollow;
333 334
334/* Pointer shapes */ 335/* Pointer shapes */
335Lisp_Object Qarrow, Qhand, Qtext; 336static Lisp_Object Qarrow, Qhand;
337Lisp_Object Qtext;
336 338
337/* Holds the list (error). */ 339/* Holds the list (error). */
338Lisp_Object list_of_error; 340Lisp_Object list_of_error;
339 341
340Lisp_Object Qfontification_functions; 342static Lisp_Object Qfontification_functions;
341 343
342Lisp_Object Qwrap_prefix; 344static Lisp_Object Qwrap_prefix;
343Lisp_Object Qline_prefix; 345static Lisp_Object Qline_prefix;
344 346
345/* Non-nil means don't actually do any redisplay. */ 347/* Non-nil means don't actually do any redisplay. */
346 348
@@ -350,12 +352,14 @@ Lisp_Object Qinhibit_redisplay;
350 352
351Lisp_Object Qdisplay; 353Lisp_Object Qdisplay;
352 354
353Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height; 355Lisp_Object Qspace, QCalign_to;
354Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise; 356static Lisp_Object QCrelative_width, QCrelative_height;
355Lisp_Object Qslice; 357Lisp_Object Qleft_margin, Qright_margin;
358static Lisp_Object Qspace_width, Qraise;
359static Lisp_Object Qslice;
356Lisp_Object Qcenter; 360Lisp_Object Qcenter;
357Lisp_Object Qmargin, Qpointer; 361static Lisp_Object Qmargin, Qpointer;
358Lisp_Object Qline_height; 362static Lisp_Object Qline_height;
359 363
360#ifdef HAVE_WINDOW_SYSTEM 364#ifdef HAVE_WINDOW_SYSTEM
361 365
@@ -383,15 +387,15 @@ Lisp_Object Qline_height;
383 387
384/* Name of the face used to highlight trailing whitespace. */ 388/* Name of the face used to highlight trailing whitespace. */
385 389
386Lisp_Object Qtrailing_whitespace; 390static Lisp_Object Qtrailing_whitespace;
387 391
388/* Name and number of the face used to highlight escape glyphs. */ 392/* Name and number of the face used to highlight escape glyphs. */
389 393
390Lisp_Object Qescape_glyph; 394static Lisp_Object Qescape_glyph;
391 395
392/* Name and number of the face used to highlight non-breaking spaces. */ 396/* Name and number of the face used to highlight non-breaking spaces. */
393 397
394Lisp_Object Qnobreak_space; 398static Lisp_Object Qnobreak_space;
395 399
396/* The symbol `image' which is the car of the lists used to represent 400/* The symbol `image' which is the car of the lists used to represent
397 images in Lisp. Also a tool bar style. */ 401 images in Lisp. Also a tool bar style. */
@@ -399,8 +403,9 @@ Lisp_Object Qnobreak_space;
399Lisp_Object Qimage; 403Lisp_Object Qimage;
400 404
401/* The image map types. */ 405/* The image map types. */
402Lisp_Object QCmap, QCpointer; 406Lisp_Object QCmap;
403Lisp_Object Qrect, Qcircle, Qpoly; 407static Lisp_Object QCpointer;
408static Lisp_Object Qrect, Qcircle, Qpoly;
404 409
405/* Tool bar styles */ 410/* Tool bar styles */
406Lisp_Object Qboth, Qboth_horiz, Qtext_image_horiz; 411Lisp_Object Qboth, Qboth_horiz, Qtext_image_horiz;
@@ -460,12 +465,12 @@ static struct buffer *this_line_buffer;
460 Voverlay_arrow_position is a marker, last-arrow-position is its 465 Voverlay_arrow_position is a marker, last-arrow-position is its
461 numerical position. */ 466 numerical position. */
462 467
463Lisp_Object Qlast_arrow_position, Qlast_arrow_string; 468static Lisp_Object Qlast_arrow_position, Qlast_arrow_string;
464 469
465/* Alternative overlay-arrow-string and overlay-arrow-bitmap 470/* Alternative overlay-arrow-string and overlay-arrow-bitmap
466 properties on a symbol in overlay-arrow-variable-list. */ 471 properties on a symbol in overlay-arrow-variable-list. */
467 472
468Lisp_Object Qoverlay_arrow_string, Qoverlay_arrow_bitmap; 473static Lisp_Object Qoverlay_arrow_string, Qoverlay_arrow_bitmap;
469 474
470Lisp_Object Qmenu_bar_update_hook; 475Lisp_Object Qmenu_bar_update_hook;
471 476
@@ -548,8 +553,8 @@ int message_buf_print;
548 553
549/* The symbol `inhibit-menubar-update' and its DEFVAR_BOOL variable. */ 554/* The symbol `inhibit-menubar-update' and its DEFVAR_BOOL variable. */
550 555
551Lisp_Object Qinhibit_menubar_update; 556static Lisp_Object Qinhibit_menubar_update;
552Lisp_Object Qmessage_truncate_lines; 557static Lisp_Object Qmessage_truncate_lines;
553 558
554/* Set to 1 in clear_message to make redisplay_internal aware 559/* Set to 1 in clear_message to make redisplay_internal aware
555 of an emptied echo area. */ 560 of an emptied echo area. */
@@ -603,7 +608,7 @@ int trace_move;
603#define TRACE_MOVE(x) (void) 0 608#define TRACE_MOVE(x) (void) 0
604#endif 609#endif
605 610
606Lisp_Object Qauto_hscroll_mode; 611static Lisp_Object Qauto_hscroll_mode;
607 612
608/* Buffer being redisplayed -- for redisplay_window_error. */ 613/* Buffer being redisplayed -- for redisplay_window_error. */
609 614
@@ -708,7 +713,7 @@ static struct glyph_slice null_glyph_slice = { 0, 0, 0, 0 };
708 713
709int redisplaying_p; 714int redisplaying_p;
710 715
711Lisp_Object Qinhibit_free_realized_faces; 716static Lisp_Object Qinhibit_free_realized_faces;
712 717
713/* If a string, XTread_socket generates an event to display that string. 718/* If a string, XTread_socket generates an event to display that string.
714 (The display is done in read_char.) */ 719 (The display is done in read_char.) */
@@ -735,7 +740,7 @@ struct atimer *hourglass_atimer;
735Lisp_Object Qglyphless_char; 740Lisp_Object Qglyphless_char;
736 741
737/* Symbol for the purpose of Vglyphless_char_display. */ 742/* Symbol for the purpose of Vglyphless_char_display. */
738Lisp_Object Qglyphless_char_display; 743static Lisp_Object Qglyphless_char_display;
739 744
740/* Method symbols for Vglyphless_char_display. */ 745/* Method symbols for Vglyphless_char_display. */
741static Lisp_Object Qhex_code, Qempty_box, Qthin_space, Qzero_width; 746static Lisp_Object Qhex_code, Qempty_box, Qthin_space, Qzero_width;
diff --git a/src/xfaces.c b/src/xfaces.c
index eb2065d4637..920debf4dba 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -304,25 +304,29 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
304 304
305/* Keyword symbols used for face attribute names. */ 305/* Keyword symbols used for face attribute names. */
306 306
307Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; 307Lisp_Object QCfamily, QCheight, QCweight, QCslant;
308Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; 308static Lisp_Object QCunderline;
309Lisp_Object QCwidth, QCfont, QCbold, QCitalic; 309static Lisp_Object QCinverse_video, QCstipple;
310Lisp_Object QCreverse_video; 310Lisp_Object QCforeground, QCbackground;
311Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; 311Lisp_Object QCwidth;
312Lisp_Object QCfontset; 312static Lisp_Object QCfont, QCbold, QCitalic;
313static Lisp_Object QCreverse_video;
314static Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit;
315static Lisp_Object QCfontset;
313 316
314/* Symbols used for attribute values. */ 317/* Symbols used for attribute values. */
315 318
316Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; 319Lisp_Object Qnormal;
317Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; 320static Lisp_Object Qbold, Qultra_light, Qextra_light, Qlight;
318Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; 321static Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold;
319Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; 322static Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic;
320Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; 323static Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed;
321Lisp_Object Qultra_expanded; 324static Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded;
322Lisp_Object Qreleased_button, Qpressed_button; 325static Lisp_Object Qultra_expanded;
323Lisp_Object QCstyle, QCcolor, QCline_width; 326static Lisp_Object Qreleased_button, Qpressed_button;
324Lisp_Object Qunspecified; 327static Lisp_Object QCstyle, QCcolor, QCline_width;
325Lisp_Object Qignore_defface; 328static Lisp_Object Qunspecified;
329static Lisp_Object Qignore_defface;
326 330
327char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; 331char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg";
328 332
@@ -333,15 +337,18 @@ Lisp_Object Qframe_set_background_mode;
333 337
334/* Names of basic faces. */ 338/* Names of basic faces. */
335 339
336Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; 340Lisp_Object Qdefault, Qtool_bar, Qfringe;
337Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; 341static Lisp_Object Qregion;
338Lisp_Object Qmode_line_inactive, Qvertical_border; 342Lisp_Object Qheader_line, Qscroll_bar, Qcursor;
343static Lisp_Object Qborder, Qmouse, Qmenu;
344Lisp_Object Qmode_line_inactive;
345static Lisp_Object Qvertical_border;
339 346
340/* The symbol `face-alias'. A symbols having that property is an 347/* The symbol `face-alias'. A symbols having that property is an
341 alias for another face. Value of the property is the name of 348 alias for another face. Value of the property is the name of
342 the aliased face. */ 349 the aliased face. */
343 350
344Lisp_Object Qface_alias; 351static Lisp_Object Qface_alias;
345 352
346/* Alist of alternative font families. Each element is of the form 353/* Alist of alternative font families. Each element is of the form
347 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, 354 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded,
@@ -361,7 +368,7 @@ Lisp_Object Vface_alternative_font_registry_alist;
361 font may be scaled if its name matches a regular expression in the 368 font may be scaled if its name matches a regular expression in the
362 list. */ 369 list. */
363 370
364Lisp_Object Qscalable_fonts_allowed; 371static Lisp_Object Qscalable_fonts_allowed;
365 372
366#define DEFAULT_FONT_LIST_LIMIT 100 373#define DEFAULT_FONT_LIST_LIMIT 100
367 374
@@ -377,11 +384,11 @@ Lisp_Object Qface;
377 384
378/* Property for basic faces which other faces cannot inherit. */ 385/* Property for basic faces which other faces cannot inherit. */
379 386
380Lisp_Object Qface_no_inherit; 387static Lisp_Object Qface_no_inherit;
381 388
382/* Error symbol for wrong_type_argument in load_pixmap. */ 389/* Error symbol for wrong_type_argument in load_pixmap. */
383 390
384Lisp_Object Qbitmap_spec_p; 391static Lisp_Object Qbitmap_spec_p;
385 392
386/* The next ID to assign to Lisp faces. */ 393/* The next ID to assign to Lisp faces. */
387 394
@@ -394,11 +401,11 @@ static int lface_id_to_name_size;
394 401
395/* TTY color-related functions (defined in tty-colors.el). */ 402/* TTY color-related functions (defined in tty-colors.el). */
396 403
397Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; 404static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values;
398 405
399/* The name of the function used to compute colors on TTYs. */ 406/* The name of the function used to compute colors on TTYs. */
400 407
401Lisp_Object Qtty_color_alist; 408static Lisp_Object Qtty_color_alist;
402 409
403/* Counter for calls to clear_face_cache. If this counter reaches 410/* Counter for calls to clear_face_cache. If this counter reaches
404 CLEAR_FONT_TABLE_COUNT, and a frame has more than 411 CLEAR_FONT_TABLE_COUNT, and a frame has more than
diff --git a/src/xfns.c b/src/xfns.c
index 8d8a908222f..6fd332016ce 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -139,10 +139,10 @@ char *gray_bitmap_bits = gray_bits;
139 139
140static int x_in_use; 140static int x_in_use;
141 141
142Lisp_Object Qnone; 142static Lisp_Object Qnone;
143Lisp_Object Qsuppress_icon; 143static Lisp_Object Qsuppress_icon;
144Lisp_Object Qundefined_color; 144static Lisp_Object Qundefined_color;
145Lisp_Object Qcompound_text, Qcancel_timer; 145static Lisp_Object Qcompound_text, Qcancel_timer;
146Lisp_Object Qfont_param; 146Lisp_Object Qfont_param;
147 147
148#if GLYPH_DEBUG 148#if GLYPH_DEBUG
diff --git a/src/xmenu.c b/src/xmenu.c
index 595ae795282..721019ffc56 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -111,7 +111,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
111#define FALSE 0 111#define FALSE 0
112#endif /* no TRUE */ 112#endif /* no TRUE */
113 113
114Lisp_Object Qdebug_on_next_call; 114static Lisp_Object Qdebug_on_next_call;
115 115
116#if defined (USE_X_TOOLKIT) || defined (USE_GTK) 116#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
117static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object, 117static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object,
diff --git a/src/xselect.c b/src/xselect.c
index 4f1a452023a..2d656cfec9a 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -100,14 +100,14 @@ static Lisp_Object clean_local_selection_data (Lisp_Object);
100#endif 100#endif
101 101
102 102
103Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, 103static Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
104 QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL, 104 QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL,
105 QATOM_PAIR; 105 QATOM_PAIR;
106 106
107Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ 107static Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */
108Lisp_Object QUTF8_STRING; /* This is a type of selection. */ 108static Lisp_Object QUTF8_STRING; /* This is a type of selection. */
109 109
110Lisp_Object Qcompound_text_with_extensions; 110static Lisp_Object Qcompound_text_with_extensions;
111 111
112static Lisp_Object Qforeign_selection; 112static Lisp_Object Qforeign_selection;
113 113
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-08 04:05:59 +0000