diff options
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 57 |
1 files changed, 32 insertions, 25 deletions
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/>. */ /* Keyword symbols used for face attribute names. */ -Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; -Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; -Lisp_Object QCwidth, QCfont, QCbold, QCitalic; -Lisp_Object QCreverse_video; -Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; -Lisp_Object QCfontset; +Lisp_Object QCfamily, QCheight, QCweight, QCslant; +static Lisp_Object QCunderline; +static Lisp_Object QCinverse_video, QCstipple; +Lisp_Object QCforeground, QCbackground; +Lisp_Object QCwidth; +static Lisp_Object QCfont, QCbold, QCitalic; +static Lisp_Object QCreverse_video; +static Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; +static Lisp_Object QCfontset; /* Symbols used for attribute values. */ -Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; -Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; -Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; -Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; -Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; -Lisp_Object Qultra_expanded; -Lisp_Object Qreleased_button, Qpressed_button; -Lisp_Object QCstyle, QCcolor, QCline_width; -Lisp_Object Qunspecified; -Lisp_Object Qignore_defface; +Lisp_Object Qnormal; +static Lisp_Object Qbold, Qultra_light, Qextra_light, Qlight; +static Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; +static Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; +static Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; +static Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; +static Lisp_Object Qultra_expanded; +static Lisp_Object Qreleased_button, Qpressed_button; +static Lisp_Object QCstyle, QCcolor, QCline_width; +static Lisp_Object Qunspecified; +static Lisp_Object Qignore_defface; char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; @@ -333,15 +337,18 @@ Lisp_Object Qframe_set_background_mode; /* Names of basic faces. */ -Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; -Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; -Lisp_Object Qmode_line_inactive, Qvertical_border; +Lisp_Object Qdefault, Qtool_bar, Qfringe; +static Lisp_Object Qregion; +Lisp_Object Qheader_line, Qscroll_bar, Qcursor; +static Lisp_Object Qborder, Qmouse, Qmenu; +Lisp_Object Qmode_line_inactive; +static Lisp_Object Qvertical_border; /* The symbol `face-alias'. A symbols having that property is an alias for another face. Value of the property is the name of the aliased face. */ -Lisp_Object Qface_alias; +static Lisp_Object Qface_alias; /* Alist of alternative font families. Each element is of the form (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, @@ -361,7 +368,7 @@ Lisp_Object Vface_alternative_font_registry_alist; font may be scaled if its name matches a regular expression in the list. */ -Lisp_Object Qscalable_fonts_allowed; +static Lisp_Object Qscalable_fonts_allowed; #define DEFAULT_FONT_LIST_LIMIT 100 @@ -377,11 +384,11 @@ Lisp_Object Qface; /* Property for basic faces which other faces cannot inherit. */ -Lisp_Object Qface_no_inherit; +static Lisp_Object Qface_no_inherit; /* Error symbol for wrong_type_argument in load_pixmap. */ -Lisp_Object Qbitmap_spec_p; +static Lisp_Object Qbitmap_spec_p; /* The next ID to assign to Lisp faces. */ @@ -394,11 +401,11 @@ static int lface_id_to_name_size; /* TTY color-related functions (defined in tty-colors.el). */ -Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; +static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; /* The name of the function used to compute colors on TTYs. */ -Lisp_Object Qtty_color_alist; +static Lisp_Object Qtty_color_alist; /* Counter for calls to clear_face_cache. If this counter reaches CLEAR_FONT_TABLE_COUNT, and a frame has more than |