Commit 4b56d0fe authored by Chong Yidong's avatar Chong Yidong
Browse files

Face cleanups. Remove some uses of old-style face spec and :bold/:italic.

* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.

* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.

* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.

* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.

* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.

* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.

* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.

* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.

* display.texi (Face Attributes): Font family does not accept
wildcards.  De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
parent d5c20fe8
2012-06-08 Chong Yidong <cyd@gnu.org>
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 Dmitry Antipov <dmantipov@yandex.ru>
* internals.text (Garbage Collection): Document new
......
......@@ -1927,11 +1927,16 @@ exactly what the @code{defface} says.
@cindex face specification
The @var{spec} argument is a @dfn{face specification}, which states
how the face should appear on different kinds of terminals. It should
be an alist whose elements each have the form @code{(@var{display}
@var{atts})}. @var{display} specifies a class of terminals (see
below), while @var{atts} is a property list of face attributes and
their values, specifying the appearance of the face on matching
terminals
be an alist whose elements each have the form
@example
(@var{display} . @var{plist})
@end example
@noindent
@var{display} specifies a class of terminals (see below), while
@var{plist} is a property list of face attributes and their values,
specifying how the face appears on such terminals
@iftex
(see the next section for details about face attributes).
@end iftex
......@@ -1947,8 +1952,8 @@ for that frame. There are three possibilities for @var{display}:
@table @asis
@item @code{default}
This element of @var{spec} doesn't match any frames; instead, it
specifies defaults that apply to all frames. This kind of element, if
used, must be the first element of @var{spec}. Each of the following
specifies defaults that apply to all frames. This element, if used,
must be the first element of @var{spec}. Each of the following
elements can override any or all of these defaults.
@item @code{t}
......@@ -2066,16 +2071,14 @@ attribute is ignored.
@table @code
@item :family
Font family or fontset (a string). @xref{Fonts,,, emacs, The GNU
Emacs Manual}. If you specify a font family name, the wild-card
characters @samp{*} and @samp{?} are allowed. The function
@code{font-family-list}, described below, returns a list of available
family names. @xref{Fontsets}, for information about fontsets.
Emacs Manual}, for more information about font families; the function
@code{font-family-list} (see below) returns a list of available family
names. @xref{Fontsets}, for information about fontsets.
@item :foundry
The name of the @dfn{font foundry} for the font family specified by
the @code{:family} attribute (a string). The wild-card characters
@samp{*} and @samp{?} are allowed. @xref{Fonts,,, emacs, The GNU
Emacs Manual}.
the @code{:family} attribute (a string). @xref{Fonts,,, emacs, The
GNU Emacs Manual}.
@item :width
Relative proportionate character width, also known as the character
......@@ -2221,16 +2224,6 @@ attributes from faces earlier in the list override those from later
faces.
@end table
For compatibility with Emacs 20, you can also specify values for two
``fake'' face attributes: @code{:bold} and @code{:italic}. Their
values must be either @code{t} or @code{nil}; a value of
@code{unspecified} is not allowed. Setting @code{:bold} to @code{t}
is equivalent to setting the @code{:weight} attribute to @code{bold},
and setting it to @code{nil} is equivalent to setting @code{:weight}
to @code{normal}. Setting @code{:italic} to @code{t} is equivalent to
setting the @code{:slant} attribute to @code{italic}, and setting it
to @code{nil} is equivalent to setting @code{:slant} to @code{normal}.
@defun font-family-list &optional frame
This function returns a list of available font family names. The
optional argument @var{frame} specifies the frame on which the text is
......
2012-06-08 Chong Yidong <cyd@gnu.org>
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
2012-06-08 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-compat.el (tramp-compat-temporary-file-directory):
......
......@@ -1853,64 +1853,52 @@ item in another window.\n\n"))
:group 'custom-buffer)
(defface custom-invalid '((((class color))
(:foreground "yellow1" :background "red1"))
(t
(:weight bold :slant italic :underline t)))
:foreground "yellow1" :background "red1")
(t :weight bold :slant italic :underline t))
"Face used when the customize item is invalid."
:group 'custom-magic-faces)
(define-obsolete-face-alias 'custom-invalid-face 'custom-invalid "22.1")
(defface custom-rogue '((((class color))
(:foreground "pink" :background "black"))
(t
(:underline t)))
:foreground "pink" :background "black")
(t :underline t))
"Face used when the customize item is not defined for customization."
:group 'custom-magic-faces)
(define-obsolete-face-alias 'custom-rogue-face 'custom-rogue "22.1")
(defface custom-modified '((((min-colors 88) (class color))
(:foreground "white" :background "blue1"))
:foreground "white" :background "blue1")
(((class color))
(:foreground "white" :background "blue"))
(t
(:slant italic :bold)))
:foreground "white" :background "blue")
(t :slant italic))
"Face used when the customize item has been modified."
:group 'custom-magic-faces)
(define-obsolete-face-alias 'custom-modified-face 'custom-modified "22.1")
(defface custom-set '((((min-colors 88) (class color))
(:foreground "blue1" :background "white"))
:foreground "blue1" :background "white")
(((class color))
(:foreground "blue" :background "white"))
(t
(:slant italic)))
:foreground "blue" :background "white")
(t :slant italic))
"Face used when the customize item has been set."
:group 'custom-magic-faces)
(define-obsolete-face-alias 'custom-set-face 'custom-set "22.1")
(defface custom-changed '((((min-colors 88) (class color))
(:foreground "white" :background "blue1"))
:foreground "white" :background "blue1")
(((class color))
(:foreground "white" :background "blue"))
(t
(:slant italic)))
:foreground "white" :background "blue")
(t :slant italic))
"Face used when the customize item has been changed."
:group 'custom-magic-faces)
(define-obsolete-face-alias 'custom-changed-face 'custom-changed "22.1")
(defface custom-themed '((((min-colors 88) (class color))
(:foreground "white" :background "blue1"))
(((class color))
(:foreground "white" :background "blue"))
(t
(:slant italic)))
:foreground "white" :background "blue1")
(((class color))
:foreground "white" :background "blue")
(t :slant italic))
"Face used when the customize item has been set by a theme."
:group 'custom-magic-faces)
(defface custom-saved '((t (:underline t)))
(defface custom-saved '((t :underline t))
"Face used when the customize item has been saved."
:group 'custom-magic-faces)
(define-obsolete-face-alias 'custom-saved-face 'custom-saved "22.1")
(defconst custom-magic-alist
'((nil "#" underline "\
......@@ -2102,24 +2090,21 @@ and `face'."
(defface custom-button
'((((type x w32 ns) (class color)) ; Like default mode line
(:box (:line-width 2 :style released-button)
:background "lightgrey" :foreground "black"))
(t
nil))
:box (:line-width 2 :style released-button)
:background "lightgrey" :foreground "black"))
"Face for custom buffer buttons if `custom-raised-buttons' is non-nil."
:version "21.1"
:group 'custom-faces)
(define-obsolete-face-alias 'custom-button-face 'custom-button "22.1")
(defface custom-button-mouse
'((((type x w32 ns) (class color))
(:box (:line-width 2 :style released-button)
:background "grey90" :foreground "black"))
:box (:line-width 2 :style released-button)
:background "grey90" :foreground "black")
(t
;; This is for text terminals that support mouse, like GPM mouse
;; or the MS-DOS terminal: inverse-video makes the button stand
;; out on mouse-over.
(:inverse-video t)))
:inverse-video t))
"Mouse face for custom buffer buttons if `custom-raised-buttons' is non-nil."
:version "22.1"
:group 'custom-faces)
......@@ -2138,15 +2123,12 @@ and `face'."
(defface custom-button-pressed
'((((type x w32 ns) (class color))
(:box (:line-width 2 :style pressed-button)
:background "lightgrey" :foreground "black"))
(t
(:inverse-video t)))
:box (:line-width 2 :style pressed-button)
:background "lightgrey" :foreground "black")
(t :inverse-video t))
"Face for pressed custom buttons if `custom-raised-buttons' is non-nil."
:version "21.1"
:group 'custom-faces)
(define-obsolete-face-alias 'custom-button-pressed-face
'custom-button-pressed "22.1")
(defface custom-button-pressed-unraised
'((default :inherit custom-button-unraised)
......@@ -2164,22 +2146,15 @@ and `face'."
(defface custom-documentation '((t nil))
"Face used for documentation strings in customization buffers."
:group 'custom-faces)
(define-obsolete-face-alias 'custom-documentation-face
'custom-documentation "22.1")
(defface custom-state '((((class color)
(background dark))
(:foreground "lime green"))
(((class color)
(background light))
(:foreground "dark green"))
(t nil))
(defface custom-state '((((class color) (background dark))
:foreground "lime green")
(((class color) (background light))
:foreground "dark green"))
"Face used for State descriptions in the customize buffer."
:group 'custom-faces)
(define-obsolete-face-alias 'custom-state-face 'custom-state "22.1")
(defface custom-link
'((t :inherit link))
(defface custom-link '((t :inherit link))
"Face for links in customization buffers."
:version "22.1"
:group 'custom-faces)
......@@ -2376,20 +2351,18 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
"Face used for comments on variables or faces."
:version "21.1"
:group 'custom-faces)
(define-obsolete-face-alias 'custom-comment-face 'custom-comment "22.1")
;; like font-lock-comment-face
(defface custom-comment-tag
'((((class color) (background dark)) (:foreground "gray80"))
(((class color) (background light)) (:foreground "blue4"))
'((((class color) (background dark)) :foreground "gray80")
(((class color) (background light)) :foreground "blue4")
(((class grayscale) (background light))
(:foreground "DimGray" :weight bold :slant italic))
:foreground "DimGray" :weight bold :slant italic)
(((class grayscale) (background dark))
(:foreground "LightGray" :weight bold :slant italic))
(t (:weight bold)))
:foreground "LightGray" :weight bold :slant italic)
(t :weight bold))
"Face used for the comment tag on variables or faces."
:group 'custom-faces)
(define-obsolete-face-alias 'custom-comment-tag-face 'custom-comment-tag "22.1")
(define-widget 'custom-comment 'string
"User comment."
......@@ -2428,26 +2401,19 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
;;; The `custom-variable' Widget.
(defface custom-variable-tag
`((((class color)
(background dark))
(:foreground "light blue" :weight bold))
(((min-colors 88) (class color)
(background light))
(:foreground "blue1" :weight bold))
(((class color)
(background light))
(:foreground "blue" :weight bold))
(t (:weight bold)))
`((((class color) (background dark))
:foreground "light blue" :weight bold)
(((min-colors 88) (class color) (background light))
:foreground "blue1" :weight bold)
(((class color) (background light))
:foreground "blue" :weight bold)
(t :weight bold))
"Face used for unpushable variable tags."
:group 'custom-faces)
(define-obsolete-face-alias 'custom-variable-tag-face
'custom-variable-tag "22.1")
(defface custom-variable-button '((t (:underline t :weight bold)))
(defface custom-variable-button '((t :underline t :weight bold))
"Face used for pushable variable tags."
:group 'custom-faces)
(define-obsolete-face-alias 'custom-variable-button-face
'custom-variable-button "22.1")
(defcustom custom-variable-default-form 'edit
"Default form of displaying variable values."
......@@ -3314,10 +3280,9 @@ Only match frames that support the specified face attributes.")
;;; The `custom-face' Widget.
(defface custom-face-tag
`((t :inherit custom-variable-tag))
'((t :inherit custom-variable-tag))
"Face used for face tags."
:group 'custom-faces)
(define-obsolete-face-alias 'custom-face-tag-face 'custom-face-tag "22.1")
(defcustom custom-face-default-form 'selected
"Default form of displaying face definition."
......@@ -3932,37 +3897,24 @@ and so forth. The remaining group tags are shown with `custom-group-tag'."
:group 'custom-faces)
(defface custom-group-tag-1
`((((class color)
(background dark))
(:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))
(((min-colors 88) (class color)
(background light))
(:foreground "red1" :weight bold :height 1.2 :inherit variable-pitch))
(((class color)
(background light))
(:foreground "red" :weight bold :height 1.2 :inherit variable-pitch))
(t (:weight bold)))
"Face used for group tags."
'((default :weight bold :height 1.2 :inherit variable-pitch)
(((class color) (background dark)) :foreground "pink")
(((min-colors 88) (class color) (background light)) :foreground "red1")
(((class color) (background light)) :foreground "red"))
"Face for group tags."
:group 'custom-faces)
(define-obsolete-face-alias 'custom-group-tag-face-1 'custom-group-tag-1 "22.1")
(defface custom-group-tag
`((((class color)
(background dark))
(:foreground "light blue" :weight bold :height 1.2 :inherit variable-pitch))
(((min-colors 88) (class color)
(background light))
(:foreground "blue1" :weight bold :height 1.2 :inherit variable-pitch))
(((class color)
(background light))
(:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
(t (:weight bold)))
"Face used for low level group tags."
'((default :weight bold :height 1.2 :inherit variable-pitch)
(((class color) (background dark)) :foreground "light blue")
(((min-colors 88) (class color) (background light)) :foreground "blue1")
(((class color) (background light)) :foreground "blue")
(t :weight bold))
"Face for low level group tags."
:group 'custom-faces)
(define-obsolete-face-alias 'custom-group-tag-face 'custom-group-tag "22.1")
(defface custom-group-subtitle
`((t (:weight bold)))
'((t :weight bold))
"Face for the \"Subgroups:\" subtitle in Custom buffers."
:group 'custom-faces)
......
......@@ -463,7 +463,7 @@ Must be set prior to enabling CUA."
(defface cua-global-mark
'((((min-colors 88)(class color)) :foreground "black" :background "yellow1")
(((class color)) :foreground "black" :background "yellow")
(t :bold t))
(t :weight bold))
"Font used by CUA for highlighting the global mark."
:group 'cua)
......
......@@ -50,97 +50,51 @@ the separate window."
:group 'epa)
(defface epa-validity-high
`((((class color) (background dark))
(:foreground "PaleTurquoise"
,@(if (assq ':weight custom-face-attributes)
'(:weight bold)
'(:bold t))))
(t
(,@(if (assq ':weight custom-face-attributes)
'(:weight bold)
'(:bold t)))))
"Face used for displaying the high validity."
'((default :weight bold)
(((class color) (background dark)) :foreground "PaleTurquoise"))
"Face for high validity EPA information."
:group 'epa-faces)
(defface epa-validity-medium
`((((class color) (background dark))
(:foreground "PaleTurquoise"
,@(if (assq ':slant custom-face-attributes)
'(:slant italic)
'(:italic t))))
(t
(,@(if (assq ':slant custom-face-attributes)
'(:slant italic)
'(:italic t)))))
"Face used for displaying the medium validity."
'((default :slant italic)
(((class color) (background dark)) :foreground "PaleTurquoise"))
"Face for medium validity EPA information."
:group 'epa-faces)
(defface epa-validity-low
`((t
(,@(if (assq ':slant custom-face-attributes)
'(:slant italic)
'(:italic t)))))
'((t :slant italic))
"Face used for displaying the low validity."
:group 'epa-faces)
(defface epa-validity-disabled
`((t
(,@(if (assq ':slant custom-face-attributes)
'(:slant italic)
'(:italic t))
:inverse-video t)))
'((t :slant italic :inverse-video t))
"Face used for displaying the disabled validity."
:group 'epa-faces)
(defface epa-string
'((((class color) (background dark))
(:foreground "lightyellow"))
:foreground "lightyellow")
(((class color) (background light))
(:foreground "blue4")))
:foreground "blue4"))
"Face used for displaying the string."
:group 'epa-faces)
(defface epa-mark
`((((class color) (background dark))
(:foreground "orange"
,@(if (assq ':weight custom-face-attributes)
'(:weight bold)
'(:bold t))))
(((class color) (background light))
(:foreground "red"
,@(if (assq ':weight custom-face-attributes)
'(:weight bold)
'(:bold t))))
(t
(,@(if (assq ':weight custom-face-attributes)
'(:weight bold)
'(:bold t)))))
'((default :weight bold)
(((class color) (background dark)) :foreground "orange")
(((class color) (background light)) :foreground "red"))
"Face used for displaying the high validity."
:group 'epa-faces)
(defface epa-field-name
`((((class color) (background dark))
(:foreground "PaleTurquoise"
,@(if (assq ':weight custom-face-attributes)
'(:weight bold)
'(:bold t))))
(t
(,@(if (assq ':weight custom-face-attributes)
'(:weight bold)
'(:bold t)))))
'((default :weight bold)
(((class color) (background dark)) :foreground "PaleTurquoise"))
"Face for the name of the attribute field."
:group 'epa)
(defface epa-field-body
`((((class color) (background dark))
(:foreground "turquoise"
,@(if (assq ':slant custom-face-attributes)
'(:slant italic)
'(:italic t))))
(t
(,@(if (assq ':slant custom-face-attributes)
'(:slant italic)
'(:italic t)))))
'((default :slant italic)
(((class color) (background dark)) :foreground "turquoise"))
"Face for the body of the attribute field."
:group 'epa)
......
2012-06-08 Chong Yidong <cyd@gnu.org>
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
2012-06-02 Chong Yidong <cyd@gnu.org>
* erc-track.el (erc-track, erc-track-faces-priority-list)
......
......@@ -66,7 +66,7 @@
;;; Variables
(defface erc-button '((t (:bold t)))
(defface erc-button '((t :weight bold))
"ERC button face."
:group 'erc-faces)
......
......@@ -206,112 +206,114 @@ The value `erc-interpret-controls-p' must also be t for this to work."
:group 'erc-control-characters
:type 'boolean)
(defface erc-bold-face '((t (:bold t)))
(defface erc-bold-face '((t :weight bold))
"ERC bold face."
:group 'erc-faces)
(defface erc-inverse-face
'((t (:foreground "White" :background "Black")))
'((t :foreground "White" :background "Black"))
"ERC inverse face."
:group 'erc-faces)
(defface erc-underline-face '((t (:underline t)))
(defface erc-underline-face '((t :underline t))
"ERC underline face."
:group 'erc-faces)