[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108528: Face cleanups. Remove some u
|
From: |
Chong Yidong |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108528: Face cleanups. Remove some uses of old-style face spec and :bold/:italic. |
|
Date: |
Sat, 09 Jun 2012 00:39:49 +0800 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108528
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-06-09 00:39:49 +0800
message:
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.
modified:
doc/lispref/ChangeLog
doc/lispref/display.texi
lisp/ChangeLog
lisp/cus-edit.el
lisp/emulation/cua-base.el
lisp/epa.el
lisp/erc/ChangeLog
lisp/erc/erc-button.el
lisp/erc/erc-goodies.el
lisp/erc/erc-match.el
lisp/erc/erc-stamp.el
lisp/erc/erc.el
lisp/eshell/em-prompt.el
lisp/faces.el
lisp/font-lock.el
lisp/ido.el
lisp/net/newst-plainview.el
lisp/net/newst-reader.el
lisp/net/newst-treeview.el
lisp/net/rcirc.el
lisp/nxml/nxml-outln.el
lisp/play/mpuz.el
lisp/progmodes/ebrowse.el
lisp/progmodes/flymake.el
lisp/progmodes/vera-mode.el
lisp/speedbar.el
lisp/textmodes/flyspell.el
lisp/textmodes/table.el
lisp/whitespace.el
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2012-06-08 08:44:30 +0000
+++ b/doc/lispref/ChangeLog 2012-06-08 16:39:49 +0000
@@ -1,3 +1,9 @@
+2012-06-08 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* internals.text (Garbage Collection): Document new
=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi 2012-05-27 01:34:14 +0000
+++ b/doc/lispref/display.texi 2012-06-08 16:39:49 +0000
@@ -1927,11 +1927,16 @@
@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}
address@hidden)}. @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
+
address@hidden
+(@var{display} . @var{plist})
address@hidden example
+
address@hidden
address@hidden specifies a class of terminals (see below), while
address@hidden 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 @@
@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 @@
@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
address@hidden, 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
address@hidden (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
address@hidden 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 @@
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
address@hidden 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
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-06-08 13:27:06 +0000
+++ b/lisp/ChangeLog 2012-06-08 16:39:49 +0000
@@ -1,3 +1,84 @@
+2012-06-08 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* net/tramp-compat.el (tramp-compat-temporary-file-directory):
=== modified file 'lisp/cus-edit.el'
--- a/lisp/cus-edit.el 2012-06-02 10:56:09 +0000
+++ b/lisp/cus-edit.el 2012-06-08 16:39:49 +0000
@@ -1853,64 +1853,52 @@
: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 @@
(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 @@
(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 @@
(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 @@
"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 @@
;;; 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 @@
;;; 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 @@
: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)
=== modified file 'lisp/emulation/cua-base.el'
--- a/lisp/emulation/cua-base.el 2012-04-14 01:46:06 +0000
+++ b/lisp/emulation/cua-base.el 2012-06-08 16:39:49 +0000
@@ -463,7 +463,7 @@
(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)
=== modified file 'lisp/epa.el'
--- a/lisp/epa.el 2012-04-09 13:05:48 +0000
+++ b/lisp/epa.el 2012-06-08 16:39:49 +0000
@@ -50,97 +50,51 @@
: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)
=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog 2012-06-02 10:56:09 +0000
+++ b/lisp/erc/ChangeLog 2012-06-08 16:39:49 +0000
@@ -1,3 +1,17 @@
+2012-06-08 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* erc-track.el (erc-track, erc-track-faces-priority-list)
=== modified file 'lisp/erc/erc-button.el'
--- a/lisp/erc/erc-button.el 2012-04-09 13:05:48 +0000
+++ b/lisp/erc/erc-button.el 2012-06-08 16:39:49 +0000
@@ -66,7 +66,7 @@
;;; Variables
-(defface erc-button '((t (:bold t)))
+(defface erc-button '((t :weight bold))
"ERC button face."
:group 'erc-faces)
=== modified file 'lisp/erc/erc-goodies.el'
--- a/lisp/erc/erc-goodies.el 2012-04-09 13:05:48 +0000
+++ b/lisp/erc/erc-goodies.el 2012-06-08 16:39:49 +0000
@@ -206,112 +206,114 @@
: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)
-(defface fg:erc-color-face0 '((t (:foreground "White")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face1 '((t (:foreground "black")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face2 '((t (:foreground "blue4")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face3 '((t (:foreground "green4")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face4 '((t (:foreground "red")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face5 '((t (:foreground "brown")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face6 '((t (:foreground "purple")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face7 '((t (:foreground "orange")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face8 '((t (:foreground "yellow")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face9 '((t (:foreground "green")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face10 '((t (:foreground "lightblue1")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face11 '((t (:foreground "cyan")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face12 '((t (:foreground "blue")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face13 '((t (:foreground "deeppink")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face14 '((t (:foreground "gray50")))
- "ERC face."
- :group 'erc-faces)
-(defface fg:erc-color-face15 '((t (:foreground "gray90")))
+(defface fg:erc-color-face0 '((t :foreground "White"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face1 '((t :foreground "black"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face2 '((t :foreground "blue4"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face3 '((t :foreground "green4"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face4 '((t :foreground "red"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face5 '((t :foreground "brown"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face6 '((t :foreground "purple"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face7 '((t :foreground "orange"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face8 '((t :foreground "yellow"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face9 '((t :foreground "green"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face10 '((t :foreground "lightblue1"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face11 '((t :foreground "cyan"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face12 '((t :foreground "blue"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face13 '((t :foreground "deeppink"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face14 '((t :foreground "gray50"))
+ "ERC face."
+ :group 'erc-faces)
+(defface fg:erc-color-face15 '((t :foreground "gray90"))
"ERC face."
:group 'erc-faces)
-(defface bg:erc-color-face0 '((t (:background "White")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face1 '((t (:background "black")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face2 '((t (:background "blue4")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face3 '((t (:background "green4")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face4 '((t (:background "red")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face5 '((t (:background "brown")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face6 '((t (:background "purple")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face7 '((t (:background "orange")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face8 '((t (:background "yellow")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face9 '((t (:background "green")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face10 '((t (:background "lightblue1")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face11 '((t (:background "cyan")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face12 '((t (:background "blue")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face13 '((t (:background "deeppink")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face14 '((t (:background "gray50")))
- "ERC face."
- :group 'erc-faces)
-(defface bg:erc-color-face15 '((t (:background "gray90")))
+(defface bg:erc-color-face0 '((t :background "White"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face1 '((t :background "black"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face2 '((t :background "blue4"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face3 '((t :background "green4"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face4 '((t :background "red"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face5 '((t :background "brown"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face6 '((t :background "purple"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face7 '((t :background "orange"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face8 '((t :background "yellow"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face9 '((t :background "green"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face10 '((t :background "lightblue1"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face11 '((t :background "cyan"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face12 '((t :background "blue"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face13 '((t :background "deeppink"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face14 '((t :background "gray50"))
+ "ERC face."
+ :group 'erc-faces)
+(defface bg:erc-color-face15 '((t :background "gray90"))
"ERC face."
:group 'erc-faces)
=== modified file 'lisp/erc/erc-match.el'
--- a/lisp/erc/erc-match.el 2012-04-09 13:05:48 +0000
+++ b/lisp/erc/erc-match.el 2012-06-08 16:39:49 +0000
@@ -258,26 +258,26 @@
;; Faces:
-(defface erc-current-nick-face '((t (:bold t :foreground "DarkTurquoise")))
+(defface erc-current-nick-face '((t :weight bold :foreground "DarkTurquoise"))
"ERC face for occurrences of your current nickname."
:group 'erc-faces)
-(defface erc-dangerous-host-face '((t (:foreground "red")))
+(defface erc-dangerous-host-face '((t :foreground "red"))
"ERC face for people on dangerous hosts.
See `erc-dangerous-hosts'."
:group 'erc-faces)
-(defface erc-pal-face '((t (:bold t :foreground "Magenta")))
+(defface erc-pal-face '((t :weight bold :foreground "Magenta"))
"ERC face for your pals.
See `erc-pals'."
:group 'erc-faces)
-(defface erc-fool-face '((t (:foreground "dim gray")))
+(defface erc-fool-face '((t :foreground "dim gray"))
"ERC face for fools on the channel.
See `erc-fools'."
:group 'erc-faces)
-(defface erc-keyword-face '((t (:bold t :foreground "pale green")))
+(defface erc-keyword-face '((t :weight bold :foreground "pale green"))
"ERC face for your keywords.
Note that this is the default face to use if
`erc-keywords' does not specify another."
=== modified file 'lisp/erc/erc-stamp.el'
--- a/lisp/erc/erc-stamp.el 2012-04-09 13:05:48 +0000
+++ b/lisp/erc/erc-stamp.el 2012-06-08 16:39:49 +0000
@@ -152,7 +152,7 @@
:group 'erc-stamp
:type 'boolean)
-(defface erc-timestamp-face '((t (:bold t :foreground "green")))
+(defface erc-timestamp-face '((t :weight bold :foreground "green"))
"ERC timestamp face."
:group 'erc-faces)
=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el 2012-04-10 02:51:39 +0000
+++ b/lisp/erc/erc.el 2012-06-08 16:39:49 +0000
@@ -1140,61 +1140,58 @@
"ERC default face."
:group 'erc-faces)
-(defface erc-direct-msg-face '((t (:foreground "IndianRed")))
+(defface erc-direct-msg-face '((t :foreground "IndianRed"))
"ERC face used for messages you receive in the main erc buffer."
:group 'erc-faces)
(defface erc-header-line
- '((t (:foreground "grey20" :background "grey90")))
+ '((t :foreground "grey20" :background "grey90"))
"ERC face used for the header line.
This will only be used if `erc-header-line-face-method' is non-nil."
:group 'erc-faces)
-(defface erc-input-face '((t (:foreground "brown")))
+(defface erc-input-face '((t :foreground "brown"))
"ERC face used for your input."
:group 'erc-faces)
(defface erc-prompt-face
- '((t (:bold t :foreground "Black" :background "lightBlue2")))
+ '((t :weight bold :foreground "Black" :background "lightBlue2"))
"ERC face for the prompt."
:group 'erc-faces)
(defface erc-command-indicator-face
- '((t (:bold t)))
+ '((t :weight bold))
"ERC face for the command indicator.
See the variable `erc-command-indicator'."
:group 'erc-faces)
(defface erc-notice-face
- (if (or (featurep 'xemacs)
- (< emacs-major-version 22))
- '((t (:bold t :foreground "blue")))
- '((((class color) (min-colors 88))
- (:bold t :foreground "SlateBlue"))
- (t (:bold t :foreground "blue"))))
+ '((default :weight bold)
+ (((class color) (min-colors 88)) :foreground "SlateBlue")
+ (t :foreground "blue"))
"ERC face for notices."
:group 'erc-faces)
-(defface erc-action-face '((t (:bold t)))
+(defface erc-action-face '((t :weight bold))
"ERC face for actions generated by /ME."
:group 'erc-faces)
-(defface erc-error-face '((t (:foreground "red")))
+(defface erc-error-face '((t :foreground "red"))
"ERC face for errors."
:group 'erc-faces)
;; same default color as `erc-input-face'
-(defface erc-my-nick-face '((t (:bold t :foreground "brown")))
+(defface erc-my-nick-face '((t :weight bold :foreground "brown"))
"ERC face for your current nickname in messages sent by you.
See also `erc-show-my-nick'."
:group 'erc-faces)
-(defface erc-nick-default-face '((t (:bold t)))
+(defface erc-nick-default-face '((t :weight bold))
"ERC nickname default face."
:group 'erc-faces)
-(defface erc-nick-msg-face '((t (:bold t :foreground "IndianRed")))
+(defface erc-nick-msg-face '((t :weight bold :foreground "IndianRed"))
"ERC nickname face for private messages."
:group 'erc-faces)
=== modified file 'lisp/eshell/em-prompt.el'
--- a/lisp/eshell/em-prompt.el 2012-01-19 07:21:25 +0000
+++ b/lisp/eshell/em-prompt.el 2012-06-08 16:39:49 +0000
@@ -69,9 +69,9 @@
:group 'eshell-prompt)
(defface eshell-prompt
- '((((class color) (background light)) (:foreground "Red" :bold t))
- (((class color) (background dark)) (:foreground "Pink" :bold t))
- (t (:bold t)))
+ '((default :weight bold)
+ (((class color) (background light)) :foreground "Red")
+ (((class color) (background dark)) :foreground "Pink"))
"The face used to highlight prompt strings.
For highlighting other kinds of strings -- similar to shell mode's
behavior -- simply use an output filer which changes text properties."
=== modified file 'lisp/faces.el'
--- a/lisp/faces.el 2012-05-24 07:53:21 +0000
+++ b/lisp/faces.el 2012-06-08 16:39:49 +0000
@@ -563,23 +563,23 @@
(defun set-face-attribute (face frame &rest args)
"Set attributes of FACE on FRAME from ARGS.
-
-If FRAME is nil this function sets the attributes for all
-existing frames, and the default for new frames. If FRAME is t,
-change the default for new frames (this is done automatically
-each time an attribute is changed on all frames).
-
-ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a valid
-face attribute name. All attributes can be set to `unspecified';
-this fact is not further mentioned below.
+This function overrides the face attributes specified by FACE's
+face spec. It is mostly intended for internal use only.
+
+If FRAME is nil, set the attributes for all existing frames, as
+well as the default for new frames. If FRAME is t, change the
+default for new frames only.
+
+ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a
+valid face attribute name. All attributes can be set to
+`unspecified'; this fact is not further mentioned below.
The following attributes are recognized:
`:family'
-VALUE must be a string specifying the font family, e.g. ``monospace'',
-or a fontset alias name. If a font family is specified, wild-cards `*'
-and `?' are allowed.
+VALUE must be a string specifying the font family
+\(e.g. \"Monospace\") or a fontset.
`:foundry'
@@ -596,13 +596,13 @@
`:height'
-VALUE specifies the height of the font, in either absolute or relative
-terms. An absolute height is an integer, and specifies font height in
-units of 1/10 pt. A relative height is either a floating point number,
+VALUE specifies the relative or absolute height of the font. An
+absolute height is an integer, and specifies font height in units
+of 1/10 pt. A relative height is either a floating point number,
which specifies a scaling factor for the underlying face height;
-or a function that takes a single argument (the underlying face height)
-and returns the new height. Note that for the `default' face,
-you can only specify an absolute height (since there is nothing
+or a function that takes a single argument (the underlying face
+height) and returns the new height. Note that for the `default'
+face, you must specify an absolute height (since there is nothing
for it to be relative to).
`:weight'
@@ -684,19 +684,26 @@
`:font'
-Set font-related face attributes from VALUE. VALUE must be a valid
-XLFD font name. If it is a font name pattern, the first matching font
-will be used.
-
-For compatibility with Emacs 20, keywords `:bold' and `:italic' can
-be used to specify that a bold or italic font should be used. VALUE
-must be t or nil in that case. A value of `unspecified' is not allowed.
+Set font-related face attributes from VALUE. VALUE must be a
+valid font name or font object. Setting this attribute will also
+set the `:family', `:foundry', `:width', `:height', `:weight',
+and `:slant' attributes.
`:inherit'
-VALUE is the name of a face from which to inherit attributes, or a list
-of face names. Attributes from inherited faces are merged into the face
-like an underlying face would be, with higher priority than underlying faces."
+VALUE is the name of a face from which to inherit attributes, or
+a list of face names. Attributes from inherited faces are merged
+into the face like an underlying face would be, with higher
+priority than underlying faces.
+
+For backward compatibility, the keywords `:bold' and `:italic'
+can be used to specify weight and slant respectively. This usage
+is considered obsolete. For these two keywords, the VALUE must
+be either t or nil. A value of t for `:bold' is equivalent to
+setting `:weight' to `bold', and a value of t for `:italic' is
+equivalent to setting `:slant' to `italic'. But if `:weight' is
+specified in the face spec, `:bold' is ignored, and if `:slant'
+is specified, `:italic' is ignored."
(setq args (purecopy args))
(let ((where (if (null frame) 0 frame))
(spec args)
@@ -1188,8 +1195,8 @@
:foreground (or foreground 'unspecified)
:background (or background 'unspecified)
:stipple stipple
- :bold bold-p
- :italic italic-p
+ :weight (if bold-p 'bold 'normal)
+ :slant (if italic-p 'italic 'normal)
:underline underline
:inverse-video inverse-p)
(setq face (read-face-name "Modify face"))
@@ -2439,33 +2446,31 @@
:group 'basic-faces)
(defface error
- '((((class color) (min-colors 88) (background light)) (:foreground "Red1"
:weight bold))
- (((class color) (min-colors 88) (background dark)) (:foreground "Pink"
:weight bold))
- (((class color) (min-colors 16) (background light)) (:foreground "Red1"
:weight bold))
- (((class color) (min-colors 16) (background dark)) (:foreground "Pink"
:weight bold))
- (((class color) (min-colors 8)) (:foreground "red"))
- (t (:inverse-video t :weight bold)))
+ '((default :weight bold)
+ (((class color) (min-colors 88) (background light)) :foreground "Red1")
+ (((class color) (min-colors 88) (background dark)) :foreground "Pink")
+ (((class color) (min-colors 16) (background light)) :foreground "Red1")
+ (((class color) (min-colors 16) (background dark)) :foreground "Pink")
+ (((class color) (min-colors 8)) :foreground "red")
+ (t :inverse-video t))
"Basic face used to highlight errors and to denote failure."
:version "24.1"
:group 'basic-faces)
(defface warning
- '((((class color) (min-colors 16)) (:foreground "DarkOrange" :weight bold))
- (((class color)) (:foreground "yellow" :weight bold))
- (t (:weight bold)))
+ '((default :weight bold)
+ (((class color) (min-colors 16)) :foreground "DarkOrange")
+ (((class color)) :foreground "yellow"))
"Basic face used to highlight warnings."
:version "24.1"
:group 'basic-faces)
(defface success
- '((((class color) (min-colors 16) (background light))
- (:foreground "ForestGreen" :weight bold))
- (((class color) (min-colors 88) (background dark))
- (:foreground "Green1" :weight bold))
- (((class color) (min-colors 16) (background dark))
- (:foreground "Green" :weight bold))
- (((class color)) (:foreground "green" :weight bold))
- (t (:weight bold)))
+ '((default :weight bold)
+ (((class color) (min-colors 16) (background light)) :foreground
"ForestGreen")
+ (((class color) (min-colors 88) (background dark)) :foreground "Green1")
+ (((class color) (min-colors 16) (background dark)) :foreground "Green")
+ (((class color)) :foreground "green"))
"Basic face used to indicate successful operation."
:version "24.1"
:group 'basic-faces)
=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2012-04-20 11:36:21 +0000
+++ b/lisp/font-lock.el 2012-06-08 16:39:49 +0000
@@ -1877,22 +1877,22 @@
;; `custom-declare-face'.
(defface font-lock-comment-face
'((((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))
+ :foreground "LightGray" :weight bold :slant italic)
(((class color) (min-colors 88) (background light))
- (:foreground "Firebrick"))
+ :foreground "Firebrick")
(((class color) (min-colors 88) (background dark))
- (:foreground "chocolate1"))
+ :foreground "chocolate1")
(((class color) (min-colors 16) (background light))
- (:foreground "red"))
+ :foreground "red")
(((class color) (min-colors 16) (background dark))
- (:foreground "red1"))
+ :foreground "red1")
(((class color) (min-colors 8) (background light))
- (:foreground "red"))
+ :foreground "red")
(((class color) (min-colors 8) (background dark))
- (:foreground "yellow"))
- (t (:weight bold :slant italic)))
+ :foreground "yellow")
+ (t :weight bold :slant italic))
"Font Lock mode face used to highlight comments."
:group 'font-lock-faces)
@@ -1902,14 +1902,14 @@
:group 'font-lock-faces)
(defface font-lock-string-face
- '((((class grayscale) (background light)) (:foreground "DimGray" :slant
italic))
- (((class grayscale) (background dark)) (:foreground "LightGray" :slant
italic))
- (((class color) (min-colors 88) (background light)) (:foreground
"VioletRed4"))
- (((class color) (min-colors 88) (background dark)) (:foreground
"LightSalmon"))
- (((class color) (min-colors 16) (background light)) (:foreground
"RosyBrown"))
- (((class color) (min-colors 16) (background dark)) (:foreground
"LightSalmon"))
- (((class color) (min-colors 8)) (:foreground "green"))
- (t (:slant italic)))
+ '((((class grayscale) (background light)) :foreground "DimGray" :slant
italic)
+ (((class grayscale) (background dark)) :foreground "LightGray" :slant
italic)
+ (((class color) (min-colors 88) (background light)) :foreground
"VioletRed4")
+ (((class color) (min-colors 88) (background dark)) :foreground
"LightSalmon")
+ (((class color) (min-colors 16) (background light)) :foreground
"RosyBrown")
+ (((class color) (min-colors 16) (background dark)) :foreground
"LightSalmon")
+ (((class color) (min-colors 8)) :foreground "green")
+ (t :slant italic))
"Font Lock mode face used to highlight strings."
:group 'font-lock-faces)
@@ -1919,76 +1919,76 @@
:group 'font-lock-faces)
(defface font-lock-keyword-face
- '((((class grayscale) (background light)) (:foreground "LightGray" :weight
bold))
- (((class grayscale) (background dark)) (:foreground "DimGray" :weight
bold))
- (((class color) (min-colors 88) (background light)) (:foreground "Purple"))
- (((class color) (min-colors 88) (background dark)) (:foreground "Cyan1"))
- (((class color) (min-colors 16) (background light)) (:foreground "Purple"))
- (((class color) (min-colors 16) (background dark)) (:foreground "Cyan"))
- (((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
- (t (:weight bold)))
+ '((((class grayscale) (background light)) :foreground "LightGray" :weight
bold)
+ (((class grayscale) (background dark)) :foreground "DimGray" :weight bold)
+ (((class color) (min-colors 88) (background light)) :foreground "Purple")
+ (((class color) (min-colors 88) (background dark)) :foreground "Cyan1")
+ (((class color) (min-colors 16) (background light)) :foreground "Purple")
+ (((class color) (min-colors 16) (background dark)) :foreground "Cyan")
+ (((class color) (min-colors 8)) :foreground "cyan" :weight bold)
+ (t :weight bold))
"Font Lock mode face used to highlight keywords."
:group 'font-lock-faces)
(defface font-lock-builtin-face
- '((((class grayscale) (background light)) (:foreground "LightGray" :weight
bold))
- (((class grayscale) (background dark)) (:foreground "DimGray" :weight
bold))
- (((class color) (min-colors 88) (background light)) (:foreground "dark
slate blue"))
- (((class color) (min-colors 88) (background dark)) (:foreground
"LightSteelBlue"))
- (((class color) (min-colors 16) (background light)) (:foreground "Orchid"))
- (((class color) (min-colors 16) (background dark)) (:foreground
"LightSteelBlue"))
- (((class color) (min-colors 8)) (:foreground "blue" :weight bold))
- (t (:weight bold)))
+ '((((class grayscale) (background light)) :foreground "LightGray" :weight
bold)
+ (((class grayscale) (background dark)) :foreground "DimGray" :weight bold)
+ (((class color) (min-colors 88) (background light)) :foreground "dark
slate blue")
+ (((class color) (min-colors 88) (background dark)) :foreground
"LightSteelBlue")
+ (((class color) (min-colors 16) (background light)) :foreground "Orchid")
+ (((class color) (min-colors 16) (background dark)) :foreground
"LightSteelBlue")
+ (((class color) (min-colors 8)) :foreground "blue" :weight bold)
+ (t :weight bold))
"Font Lock mode face used to highlight builtins."
:group 'font-lock-faces)
(defface font-lock-function-name-face
- '((((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
- (((class color) (min-colors 88) (background dark)) (:foreground
"LightSkyBlue"))
- (((class color) (min-colors 16) (background light)) (:foreground "Blue"))
- (((class color) (min-colors 16) (background dark)) (:foreground
"LightSkyBlue"))
- (((class color) (min-colors 8)) (:foreground "blue" :weight bold))
- (t (:inverse-video t :weight bold)))
+ '((((class color) (min-colors 88) (background light)) :foreground "Blue1")
+ (((class color) (min-colors 88) (background dark)) :foreground
"LightSkyBlue")
+ (((class color) (min-colors 16) (background light)) :foreground "Blue")
+ (((class color) (min-colors 16) (background dark)) :foreground
"LightSkyBlue")
+ (((class color) (min-colors 8)) :foreground "blue" :weight bold)
+ (t :inverse-video t :weight bold))
"Font Lock mode face used to highlight function names."
:group 'font-lock-faces)
(defface font-lock-variable-name-face
'((((class grayscale) (background light))
- (:foreground "Gray90" :weight bold :slant italic))
+ :foreground "Gray90" :weight bold :slant italic)
(((class grayscale) (background dark))
- (:foreground "DimGray" :weight bold :slant italic))
- (((class color) (min-colors 88) (background light)) (:foreground "sienna"))
- (((class color) (min-colors 88) (background dark)) (:foreground
"LightGoldenrod"))
- (((class color) (min-colors 16) (background light)) (:foreground
"DarkGoldenrod"))
- (((class color) (min-colors 16) (background dark)) (:foreground
"LightGoldenrod"))
- (((class color) (min-colors 8)) (:foreground "yellow" :weight light))
- (t (:weight bold :slant italic)))
+ :foreground "DimGray" :weight bold :slant italic)
+ (((class color) (min-colors 88) (background light)) :foreground "sienna")
+ (((class color) (min-colors 88) (background dark)) :foreground
"LightGoldenrod")
+ (((class color) (min-colors 16) (background light)) :foreground
"DarkGoldenrod")
+ (((class color) (min-colors 16) (background dark)) :foreground
"LightGoldenrod")
+ (((class color) (min-colors 8)) :foreground "yellow" :weight light)
+ (t :weight bold :slant italic))
"Font Lock mode face used to highlight variable names."
:group 'font-lock-faces)
(defface font-lock-type-face
- '((((class grayscale) (background light)) (:foreground "Gray90" :weight
bold))
- (((class grayscale) (background dark)) (:foreground "DimGray" :weight
bold))
- (((class color) (min-colors 88) (background light)) (:foreground
"ForestGreen"))
- (((class color) (min-colors 88) (background dark)) (:foreground
"PaleGreen"))
- (((class color) (min-colors 16) (background light)) (:foreground
"ForestGreen"))
- (((class color) (min-colors 16) (background dark)) (:foreground
"PaleGreen"))
- (((class color) (min-colors 8)) (:foreground "green"))
- (t (:weight bold :underline t)))
+ '((((class grayscale) (background light)) :foreground "Gray90" :weight bold)
+ (((class grayscale) (background dark)) :foreground "DimGray" :weight bold)
+ (((class color) (min-colors 88) (background light)) :foreground
"ForestGreen")
+ (((class color) (min-colors 88) (background dark)) :foreground
"PaleGreen")
+ (((class color) (min-colors 16) (background light)) :foreground
"ForestGreen")
+ (((class color) (min-colors 16) (background dark)) :foreground
"PaleGreen")
+ (((class color) (min-colors 8)) :foreground "green")
+ (t :weight bold :underline t))
"Font Lock mode face used to highlight type and classes."
:group 'font-lock-faces)
(defface font-lock-constant-face
'((((class grayscale) (background light))
- (:foreground "LightGray" :weight bold :underline t))
+ :foreground "LightGray" :weight bold :underline t)
(((class grayscale) (background dark))
- (:foreground "Gray50" :weight bold :underline t))
- (((class color) (min-colors 88) (background light)) (:foreground "dark
cyan"))
- (((class color) (min-colors 88) (background dark)) (:foreground
"Aquamarine"))
- (((class color) (min-colors 16) (background light)) (:foreground
"CadetBlue"))
- (((class color) (min-colors 16) (background dark)) (:foreground
"Aquamarine"))
- (((class color) (min-colors 8)) (:foreground "magenta"))
- (t (:weight bold :underline t)))
+ :foreground "Gray50" :weight bold :underline t)
+ (((class color) (min-colors 88) (background light)) :foreground "dark
cyan")
+ (((class color) (min-colors 88) (background dark)) :foreground
"Aquamarine")
+ (((class color) (min-colors 16) (background light)) :foreground
"CadetBlue")
+ (((class color) (min-colors 16) (background dark)) :foreground
"Aquamarine")
+ (((class color) (min-colors 8)) :foreground "magenta")
+ (t :weight bold :underline t))
"Font Lock mode face used to highlight constants and labels."
:group 'font-lock-faces)
=== modified file 'lisp/ido.el'
--- a/lisp/ido.el 2012-05-04 05:14:14 +0000
+++ b/lisp/ido.el 2012-06-08 16:39:49 +0000
@@ -791,44 +791,39 @@
:type 'boolean
:group 'ido)
-(defface ido-first-match '((t (:bold t)))
+(defface ido-first-match '((t :weight bold))
"Face used by ido for highlighting first match."
:group 'ido)
(defface ido-only-match '((((class color))
- (:foreground "ForestGreen"))
- (t (:italic t)))
+ :foreground "ForestGreen")
+ (t :slant italic))
"Face used by ido for highlighting only match."
:group 'ido)
(defface ido-subdir '((((min-colors 88) (class color))
- (:foreground "red1"))
- (((class color))
- (:foreground "red"))
- (t (:underline t)))
+ :foreground "red1")
+ (((class color))
+ :foreground "red")
+ (t :underline t))
"Face used by ido for highlighting subdirs in the alternatives."
:group 'ido)
-(defface ido-virtual '((t (:inherit font-lock-builtin-face)))
+(defface ido-virtual '((t :inherit font-lock-builtin-face))
"Face used by ido for matching virtual buffer names."
:version "24.1"
:group 'ido)
-(defface ido-indicator '((((min-colors 88) (class color))
- (:foreground "yellow1"
- :background "red1"
- :width condensed))
- (((class color))
- (:foreground "yellow"
- :background "red"
- :width condensed))
- (t (:inverse-video t)))
+(defface ido-indicator '((((min-colors 88) (class color))
+ :foreground "yellow1" :background "red1" :width
condensed)
+ (((class color))
+ :foreground "yellow" :background "red" :width
condensed)
+ (t :inverse-video t))
"Face used by ido for highlighting its indicators."
:group 'ido)
(defface ido-incomplete-regexp
- '((t
- (:inherit font-lock-warning-face)))
+ '((t :inherit font-lock-warning-face))
"Ido face for indicating incomplete regexps."
:group 'ido)
=== modified file 'lisp/net/newst-plainview.el'
--- a/lisp/net/newst-plainview.el 2012-01-19 07:21:25 +0000
+++ b/lisp/net/newst-plainview.el 2012-06-08 16:39:49 +0000
@@ -155,61 +155,39 @@
;; ======================================================================
;; faces
-(defface newsticker-new-item-face
- '((((class color) (background dark))
- (:family "sans" :bold t))
- (((class color) (background light))
- (:family "sans" :bold t)))
+(defface newsticker-new-item-face '((t :weight bold))
"Face for new news items."
:group 'newsticker-faces)
(defface newsticker-old-item-face
- '((((class color) (background dark))
- (:family "sans" :bold t :foreground "orange3"))
- (((class color) (background light))
- (:family "sans" :bold t :foreground "red4")))
+ '((default :weight bold)
+ (((class color) (background dark)) :foreground "orange3")
+ (((class color) (background light)) :foreground "red4"))
"Face for old news items."
:group 'newsticker-faces)
(defface newsticker-immortal-item-face
- '((((class color) (background dark))
- (:family "sans" :bold t :italic t :foreground "orange"))
- (((class color) (background light))
- (:family "sans" :bold t :italic t :foreground "blue")))
+ '((default :weight bold :slant italic)
+ (((class color) (background dark)) :foreground "orange")
+ (((class color) (background light)) :foreground "blue"))
"Face for immortal news items."
:group 'newsticker-faces)
(defface newsticker-obsolete-item-face
- '((((class color) (background dark))
- (:family "sans" :bold t :strike-through t))
- (((class color) (background light))
- (:family "sans" :bold t :strike-through t)))
+ '((t :weight bold :strike-through t))
"Face for old news items."
:group 'newsticker-faces)
-(defface newsticker-date-face
- '((((class color) (background dark))
- (:family "sans" :italic t :height 0.8))
- (((class color) (background light))
- (:family "sans" :italic t :height 0.8)))
- "Face for newsticker dates."
- :group 'newsticker-faces)
-
-(defface newsticker-statistics-face
- '((((class color) (background dark))
- (:family "sans" :italic t :height 0.8))
- (((class color) (background light))
- (:family "sans" :italic t :height 0.8)))
- "Face for newsticker dates."
- :group 'newsticker-faces)
-
-(defface newsticker-default-face
- '((((class color) (background dark))
- (:inherit default))
- (((class color) (background light))
- (:inherit default)))
+(defface newsticker-date-face '((t :slant italic :height 0.8))
+ "Face for newsticker dates."
+ :group 'newsticker-faces)
+
+(defface newsticker-statistics-face '((t :slant italic :height 0.8))
+ "Face for newsticker dates."
+ :group 'newsticker-faces)
+
+(defface newsticker-default-face '((t))
"Face for the description of news items."
- ;;:set 'newsticker--set-customvar
:group 'newsticker-faces)
(defcustom newsticker-hide-old-items-in-newsticker-buffer
=== modified file 'lisp/net/newst-reader.el'
--- a/lisp/net/newst-reader.el 2012-01-19 07:21:25 +0000
+++ b/lisp/net/newst-reader.el 2012-06-08 16:39:49 +0000
@@ -129,26 +129,23 @@
:group 'newsticker-reader)
(defface newsticker-feed-face
- '((((class color) (background dark))
- (:family "sans" :bold t :height 1.2 :foreground "white"))
- (((class color) (background light))
- (:family "sans" :bold t :height 1.2 :foreground "black")))
+ '((default :weight bold :height 1.2)
+ (((class color) (background dark)) :foreground "white")
+ (((class color) (background light)) :foreground "black"))
"Face for news feeds."
:group 'newsticker-faces)
(defface newsticker-extra-face
- '((((class color) (background dark))
- (:italic t :foreground "gray50" :height 0.8))
- (((class color) (background light))
- (:italic t :foreground "gray50" :height 0.8)))
+ '((default :slant italic :height 0.8)
+ (((class color) (background dark)) :foreground "gray50")
+ (((class color) (background light)) :foreground "gray50"))
"Face for newsticker dates."
:group 'newsticker-faces)
(defface newsticker-enclosure-face
- '((((class color) (background dark))
- (:bold t :background "orange"))
- (((class color) (background light))
- (:bold t :background "orange")))
+ '((default :weight bold)
+ (((class color) (background dark)) :background "orange")
+ (((class color) (background light)) :background "orange"))
"Face for enclosed elements."
:group 'newsticker-faces)
=== modified file 'lisp/net/newst-treeview.el'
--- a/lisp/net/newst-treeview.el 2012-01-19 07:21:25 +0000
+++ b/lisp/net/newst-treeview.el 2012-06-08 16:39:49 +0000
@@ -50,50 +50,36 @@
:group 'newsticker-reader)
(defface newsticker-treeview-face
- '((((class color) (background dark))
- (:family "sans" :foreground "white" :bold nil))
- (((class color) (background light))
- (:family "sans" :foreground "black" :bold nil)))
+ '((((class color) (background dark)) :foreground "white")
+ (((class color) (background light)) :foreground "black"))
"Face for newsticker tree."
:group 'newsticker-treeview)
(defface newsticker-treeview-new-face
- '((((class color) (background dark))
- (:inherit newsticker-treeview-face :bold t))
- (((class color) (background light))
- (:inherit newsticker-treeview-face :bold t)))
+ '((t :inherit newsticker-treeview-face :weight bold))
"Face for newsticker tree."
:group 'newsticker-treeview)
(defface newsticker-treeview-old-face
- '((((class color) (background dark))
- (:inherit newsticker-treeview-face))
- (((class color) (background light))
- (:inherit newsticker-treeview-face)))
+ '((t :inherit newsticker-treeview-face))
"Face for newsticker tree."
:group 'newsticker-treeview)
(defface newsticker-treeview-immortal-face
- '((((class color) (background dark))
- (:inherit newsticker-treeview-face :foreground "orange" :italic t))
- (((class color) (background light))
- (:inherit newsticker-treeview-face :foreground "blue" :italic t)))
+ '((default :inherit newsticker-treeview-face :slant italic)
+ (((class color) (background dark)) :foreground "orange")
+ (((class color) (background light)) :foreground "blue"))
"Face for newsticker tree."
:group 'newsticker-treeview)
(defface newsticker-treeview-obsolete-face
- '((((class color) (background dark))
- (:inherit newsticker-treeview-face :strike-through t))
- (((class color) (background light))
- (:inherit newsticker-treeview-face :strike-through t)))
+ '((t :inherit newsticker-treeview-face :strike-through t))
"Face for newsticker tree."
:group 'newsticker-treeview)
(defface newsticker-treeview-selection-face
- '((((class color) (background dark))
- (:background "#bbbbff"))
- (((class color) (background light))
- (:background "#bbbbff")))
+ '((((class color) (background dark)) :background "#bbbbff")
+ (((class color) (background light)) :background "#bbbbff"))
"Face for newsticker selection."
:group 'newsticker-treeview)
=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2012-06-02 10:56:09 +0000
+++ b/lisp/net/rcirc.el 2012-06-08 16:39:49 +0000
@@ -2886,67 +2886,65 @@
:group 'faces)
(defface rcirc-my-nick ; font-lock-function-name-face
- '((((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
- (((class color) (min-colors 88) (background dark)) (:foreground
"LightSkyBlue"))
- (((class color) (min-colors 16) (background light)) (:foreground "Blue"))
- (((class color) (min-colors 16) (background dark)) (:foreground
"LightSkyBlue"))
- (((class color) (min-colors 8)) (:foreground "blue" :weight bold))
- (t (:inverse-video t :weight bold)))
- "The face used to highlight my messages."
+ '((((class color) (min-colors 88) (background light)) :foreground "Blue1")
+ (((class color) (min-colors 88) (background dark)) :foreground
"LightSkyBlue")
+ (((class color) (min-colors 16) (background light)) :foreground "Blue")
+ (((class color) (min-colors 16) (background dark)) :foreground
"LightSkyBlue")
+ (((class color) (min-colors 8)) :foreground "blue" :weight bold)
+ (t :inverse-video t :weight bold))
+ "Rcirc face for my messages."
:group 'rcirc-faces)
(defface rcirc-other-nick ; font-lock-variable-name-face
'((((class grayscale) (background light))
- (:foreground "Gray90" :weight bold :slant italic))
+ :foreground "Gray90" :weight bold :slant italic)
(((class grayscale) (background dark))
- (:foreground "DimGray" :weight bold :slant italic))
- (((class color) (min-colors 88) (background light)) (:foreground
"DarkGoldenrod"))
- (((class color) (min-colors 88) (background dark)) (:foreground
"LightGoldenrod"))
- (((class color) (min-colors 16) (background light)) (:foreground
"DarkGoldenrod"))
- (((class color) (min-colors 16) (background dark)) (:foreground
"LightGoldenrod"))
- (((class color) (min-colors 8)) (:foreground "yellow" :weight light))
- (t (:weight bold :slant italic)))
- "The face used to highlight other messages."
+ :foreground "DimGray" :weight bold :slant italic)
+ (((class color) (min-colors 88) (background light)) :foreground
"DarkGoldenrod")
+ (((class color) (min-colors 88) (background dark)) :foreground
"LightGoldenrod")
+ (((class color) (min-colors 16) (background light)) :foreground
"DarkGoldenrod")
+ (((class color) (min-colors 16) (background dark)) :foreground
"LightGoldenrod")
+ (((class color) (min-colors 8)) :foreground "yellow" :weight light)
+ (t :weight bold :slant italic))
+ "Rcirc face for other users' messages."
:group 'rcirc-faces)
(defface rcirc-bright-nick
'((((class grayscale) (background light))
- (:foreground "LightGray" :weight bold :underline t))
+ :foreground "LightGray" :weight bold :underline t)
(((class grayscale) (background dark))
- (:foreground "Gray50" :weight bold :underline t))
- (((class color) (min-colors 88) (background light)) (:foreground
"CadetBlue"))
- (((class color) (min-colors 88) (background dark)) (:foreground
"Aquamarine"))
- (((class color) (min-colors 16) (background light)) (:foreground
"CadetBlue"))
- (((class color) (min-colors 16) (background dark)) (:foreground
"Aquamarine"))
- (((class color) (min-colors 8)) (:foreground "magenta"))
- (t (:weight bold :underline t)))
- "Face used for nicks matched by `rcirc-bright-nicks'."
+ :foreground "Gray50" :weight bold :underline t)
+ (((class color) (min-colors 88) (background light)) :foreground
"CadetBlue")
+ (((class color) (min-colors 88) (background dark)) :foreground
"Aquamarine")
+ (((class color) (min-colors 16) (background light)) :foreground
"CadetBlue")
+ (((class color) (min-colors 16) (background dark)) :foreground
"Aquamarine")
+ (((class color) (min-colors 8)) :foreground "magenta")
+ (t :weight bold :underline t))
+ "Rcirc face for nicks matched by `rcirc-bright-nicks'."
:group 'rcirc-faces)
(defface rcirc-dim-nick
'((t :inherit default))
- "Face used for nicks in `rcirc-dim-nicks'."
+ "Rcirc face for nicks in `rcirc-dim-nicks'."
:group 'rcirc-faces)
(defface rcirc-server ; font-lock-comment-face
'((((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))
+ :foreground "LightGray" :weight bold :slant italic)
(((class color) (min-colors 88) (background light))
- (:foreground "Firebrick"))
+ :foreground "Firebrick")
(((class color) (min-colors 88) (background dark))
- (:foreground "chocolate1"))
+ :foreground "chocolate1")
(((class color) (min-colors 16) (background light))
- (:foreground "red"))
+ :foreground "red")
(((class color) (min-colors 16) (background dark))
- (:foreground "red1"))
- (((class color) (min-colors 8) (background light))
- )
- (((class color) (min-colors 8) (background dark))
- )
- (t (:weight bold :slant italic)))
- "The face used to highlight server messages."
+ :foreground "red1")
+ (((class color) (min-colors 8) (background light)))
+ (((class color) (min-colors 8) (background dark)))
+ (t :weight bold :slant italic))
+ "Rcirc face for server messages."
:group 'rcirc-faces)
(defface rcirc-server-prefix ; font-lock-comment-delimiter-face
@@ -2957,57 +2955,53 @@
:foreground "red")
(((class color) (min-colors 8) (background dark))
:foreground "red1"))
- "The face used to highlight server prefixes."
+ "Rcirc face for server prefixes."
:group 'rcirc-faces)
(defface rcirc-timestamp
- '((t (:inherit default)))
- "The face used to highlight timestamps."
+ '((t :inherit default))
+ "Rcirc face for timestamps."
:group 'rcirc-faces)
(defface rcirc-nick-in-message ; font-lock-keyword-face
- '((((class grayscale) (background light)) (:foreground "LightGray" :weight
bold))
- (((class grayscale) (background dark)) (:foreground "DimGray" :weight
bold))
- (((class color) (min-colors 88) (background light)) (:foreground "Purple"))
- (((class color) (min-colors 88) (background dark)) (:foreground "Cyan1"))
- (((class color) (min-colors 16) (background light)) (:foreground "Purple"))
- (((class color) (min-colors 16) (background dark)) (:foreground "Cyan"))
- (((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
- (t (:weight bold)))
- "The face used to highlight instances of your nick within messages."
+ '((((class grayscale) (background light)) :foreground "LightGray" :weight
bold)
+ (((class grayscale) (background dark)) :foreground "DimGray" :weight bold)
+ (((class color) (min-colors 88) (background light)) :foreground "Purple")
+ (((class color) (min-colors 88) (background dark)) :foreground "Cyan1")
+ (((class color) (min-colors 16) (background light)) :foreground "Purple")
+ (((class color) (min-colors 16) (background dark)) :foreground "Cyan")
+ (((class color) (min-colors 8)) :foreground "cyan" :weight bold)
+ (t :weight bold))
+ "Rcirc face for instances of your nick within messages."
:group 'rcirc-faces)
-(defface rcirc-nick-in-message-full-line
- '((t (:bold t)))
- "The face used emphasize the entire message when your nick is mentioned."
+(defface rcirc-nick-in-message-full-line '((t :weight bold))
+ "Rcirc face for emphasizing the entire message when your nick is mentioned."
:group 'rcirc-faces)
(defface rcirc-prompt ; comint-highlight-prompt
- '((((min-colors 88) (background dark)) (:foreground "cyan1"))
- (((background dark)) (:foreground "cyan"))
- (t (:foreground "dark blue")))
- "The face used to highlight prompts."
+ '((((min-colors 88) (background dark)) :foreground "cyan1")
+ (((background dark)) :foreground "cyan")
+ (t :foreground "dark blue"))
+ "Rcirc face for prompts."
:group 'rcirc-faces)
(defface rcirc-track-nick
- '((((type tty)) (:inherit default))
- (t (:inverse-video t)))
- "The face used in the mode-line when your nick is mentioned."
- :group 'rcirc-faces)
-
-(defface rcirc-track-keyword
- '((t (:bold t )))
- "The face used in the mode-line when keywords are mentioned."
- :group 'rcirc-faces)
-
-(defface rcirc-url
- '((t (:bold t)))
- "The face used to highlight urls."
- :group 'rcirc-faces)
-
-(defface rcirc-keyword
- '((t (:inherit highlight)))
- "The face used to highlight keywords."
+ '((((type tty)) :inherit default)
+ (t :inverse-video t))
+ "Rcirc face used in the mode-line when your nick is mentioned."
+ :group 'rcirc-faces)
+
+(defface rcirc-track-keyword '((t :weight bold))
+ "Rcirc face used in the mode-line when keywords are mentioned."
+ :group 'rcirc-faces)
+
+(defface rcirc-url '((t :weight bold))
+ "Rcirc face used to highlight urls."
+ :group 'rcirc-faces)
+
+(defface rcirc-keyword '((t :inherit highlight))
+ "Rcirc face used to highlight keywords."
:group 'rcirc-faces)
=== modified file 'lisp/nxml/nxml-outln.el'
--- a/lisp/nxml/nxml-outln.el 2012-01-19 07:21:25 +0000
+++ b/lisp/nxml/nxml-outln.el 2012-06-08 16:39:49 +0000
@@ -109,23 +109,20 @@
:group 'nxml
:type 'integer)
-(defface nxml-heading
- '((t (:weight bold)))
- "Face used for the contents of abbreviated heading elements."
+(defface nxml-heading '((t :weight bold))
+ "Face for the contents of abbreviated heading elements."
:group 'nxml-faces)
-(defface nxml-outline-indicator
- '((t (:inherit default)))
- "Face used for `+' or `-' before element names in outlines."
+(defface nxml-outline-indicator '((t))
+ "Face for `+' or `-' before element names in outlines."
:group 'nxml-faces)
(defface nxml-outline-active-indicator
- '((t (:box t :inherit nxml-outline-indicator)))
- "Face used for clickable `+' or `-' before element names in outlines."
+ '((t :box t :inherit nxml-outline-indicator))
+ "Face for clickable `+' or `-' before element names in outlines."
:group 'nxml-faces)
-(defface nxml-outline-ellipsis
- '((t (:bold t :inherit default)))
+(defface nxml-outline-ellipsis '((t :weight bold))
"Face used for `...' in outlines."
:group 'nxml-faces)
=== modified file 'lisp/play/mpuz.el'
--- a/lisp/play/mpuz.el 2012-01-19 07:21:25 +0000
+++ b/lisp/play/mpuz.el 2012-06-08 16:39:49 +0000
@@ -56,26 +56,26 @@
:group 'mpuz)
(defface mpuz-unsolved
- '((((class color)) (:foreground "red1" :bold t))
- (t (:bold t)))
- "Face to use for letters to be solved."
+ '((default :weight bold)
+ (((class color)) :foreground "red1"))
+ "Face for letters to be solved."
:group 'mpuz)
(defface mpuz-solved
- '((((class color)) (:foreground "green1" :bold t))
- (t (:bold t)))
- "Face to use for solved digits."
+ '((default :weight bold)
+ (((class color)) :foreground "green1"))
+ "Face for solved digits."
:group 'mpuz)
(defface mpuz-trivial
- '((((class color)) (:foreground "blue" :bold t))
- (t (:bold t)))
- "Face to use for trivial digits solved for you."
+ '((default :weight bold)
+ (((class color)) :foreground "blue"))
+ "Face for trivial digits solved for you."
:group 'mpuz)
(defface mpuz-text
- '((t (:inherit variable-pitch)))
- "Face to use for text on right."
+ '((t :inherit variable-pitch))
+ "Face for text on right."
:group 'mpuz)
=== modified file 'lisp/progmodes/ebrowse.el'
--- a/lisp/progmodes/ebrowse.el 2012-04-09 13:05:48 +0000
+++ b/lisp/progmodes/ebrowse.el 2012-06-08 16:39:49 +0000
@@ -48,7 +48,6 @@
"Settings for the C++ class browser."
:group 'tools)
-
(defcustom ebrowse-search-path nil
"List of directories to search for source files in a class tree.
Elements should be directory names; nil as an element means to try
@@ -154,61 +153,42 @@
"Faces used by Ebrowse."
:group 'ebrowse)
-
(defface ebrowse-tree-mark
- '((((min-colors 88)) (:foreground "red1"))
- (t (:foreground "red")))
- "The face used for the mark character in the tree."
+ '((((min-colors 88)) :foreground "red1")
+ (t :foreground "red"))
+ "Face for the mark character in the Ebrowse tree."
:group 'ebrowse-faces)
-(define-obsolete-face-alias 'ebrowse-tree-mark-face 'ebrowse-tree-mark "22.1")
-
(defface ebrowse-root-class
- '((((min-colors 88)) (:weight bold :foreground "blue1"))
- (t (:weight bold :foreground "blue")))
- "The face used for root classes in the tree."
- :group 'ebrowse-faces)
-(define-obsolete-face-alias 'ebrowse-root-class-face 'ebrowse-root-class
"22.1")
-
-
-(defface ebrowse-file-name
- '((t (:italic t)))
- "The face for filenames displayed in the tree."
- :group 'ebrowse-faces)
-(define-obsolete-face-alias 'ebrowse-file-name-face 'ebrowse-file-name "22.1")
-
-
-(defface ebrowse-default
- '((t nil))
- "Face for everything else in the tree not having other faces."
- :group 'ebrowse-faces)
-(define-obsolete-face-alias 'ebrowse-default-face 'ebrowse-default "22.1")
-
+ '((((min-colors 88)) :weight bold :foreground "blue1")
+ (t :weight bold :foreground "blue"))
+ "Face for root classes in the Ebrowse tree."
+ :group 'ebrowse-faces)
+
+(defface ebrowse-file-name '((t :slant italic))
+ "Face for filenames in the Ebrowse tree."
+ :group 'ebrowse-faces)
+
+(defface ebrowse-default '((t))
+ "Face for items in the Ebrowse tree which do not have other faces."
+ :group 'ebrowse-faces)
(defface ebrowse-member-attribute
- '((((min-colors 88)) (:foreground "red1"))
- (t (:foreground "red")))
- "Face used to display member attributes."
+ '((((min-colors 88)) :foreground "red1")
+ (t :foreground "red"))
+ "Face for member attributes."
:group 'ebrowse-faces)
-(define-obsolete-face-alias 'ebrowse-member-attribute-face
- 'ebrowse-member-attribute "22.1")
-
(defface ebrowse-member-class
- '((t (:foreground "purple")))
+ '((t :foreground "purple"))
"Face used to display the class title in member buffers."
:group 'ebrowse-faces)
-(define-obsolete-face-alias 'ebrowse-member-class-face
- 'ebrowse-member-class "22.1")
-
(defface ebrowse-progress
- '((((min-colors 88)) (:background "blue1"))
- (t (:background "blue")))
+ '((((min-colors 88)) :background "blue1")
+ (t :background "blue"))
"Face for progress indicator."
:group 'ebrowse-faces)
-(define-obsolete-face-alias 'ebrowse-progress-face 'ebrowse-progress "22.1")
-
;;; Utilities.
=== modified file 'lisp/progmodes/flymake.el'
--- a/lisp/progmodes/flymake.el 2012-04-22 13:58:00 +0000
+++ b/lisp/progmodes/flymake.el 2012-06-08 16:39:49 +0000
@@ -796,16 +796,12 @@
has-flymake-overlays))
(defface flymake-errline
- '((((class color) (background dark)) (:background "Firebrick4"))
- (((class color) (background light)) (:background "LightPink"))
- (t (:bold t)))
+ '((t :inherit error))
"Face used for marking error lines."
:group 'flymake)
(defface flymake-warnline
- '((((class color) (background dark)) (:background "DarkBlue"))
- (((class color) (background light)) (:background "LightBlue2"))
- (t (:bold t)))
+ '((t :inherit warning))
"Face used for marking warning lines."
:group 'flymake)
=== modified file 'lisp/progmodes/vera-mode.el'
--- a/lisp/progmodes/vera-mode.el 2012-04-09 13:05:48 +0000
+++ b/lisp/progmodes/vera-mode.el 2012-06-08 16:39:49 +0000
@@ -670,23 +670,23 @@
"Face name to use for interface names.")
(defface vera-font-lock-number
- '((((class color) (background light)) (:foreground "Gold4"))
- (((class color) (background dark)) (:foreground "BurlyWood1"))
- (t (:italic t :bold t)))
+ '((((class color) (background light)) :foreground "Gold4")
+ (((class color) (background dark)) :foreground "BurlyWood1")
+ (t :slant italic :weight bold))
"Font lock mode face used to highlight @ definitions."
:group 'font-lock-highlighting-faces)
(defface vera-font-lock-function
- '((((class color) (background light)) (:foreground "DarkCyan"))
- (((class color) (background dark)) (:foreground "Orchid1"))
- (t (:italic t :bold t)))
+ '((((class color) (background light)) :foreground "DarkCyan")
+ (((class color) (background dark)) :foreground "Orchid1")
+ (t :slant italic :weight bold))
"Font lock mode face used to highlight predefined functions and tasks."
:group 'font-lock-highlighting-faces)
(defface vera-font-lock-interface
- '((((class color) (background light)) (:foreground "Grey40"))
- (((class color) (background dark)) (:foreground "Grey80"))
- (t (:italic t :bold t)))
+ '((((class color) (background light)) :foreground "Grey40")
+ (((class color) (background dark)) :foreground "Grey80")
+ (t :slant italic :weight bold))
"Font lock mode face used to highlight interface names."
:group 'font-lock-highlighting-faces)
=== modified file 'lisp/speedbar.el'
--- a/lisp/speedbar.el 2012-05-13 03:05:06 +0000
+++ b/lisp/speedbar.el 2012-06-08 16:39:49 +0000
@@ -4005,73 +4005,68 @@
;;; Color loading section.
;;
(defface speedbar-button-face '((((class color) (background light))
- (:foreground "green4"))
+ :foreground "green4")
(((class color) (background dark))
- (:foreground "green3")))
- "Face used for +/- buttons."
+ :foreground "green3"))
+ "Speedbar face for +/- buttons."
:group 'speedbar-faces)
(defface speedbar-file-face '((((class color) (background light))
- (:foreground "cyan4"))
+ :foreground "cyan4")
(((class color) (background dark))
- (:foreground "cyan"))
- (t (:bold t)))
- "Face used for file names."
+ :foreground "cyan")
+ (t :weight bold))
+ "Speedbar face for file names."
:group 'speedbar-faces)
(defface speedbar-directory-face '((((class color) (background light))
- (:foreground "blue4"))
+ :foreground "blue4")
(((class color) (background dark))
- (:foreground "light blue")))
- "Face used for directory names."
+ :foreground "light blue"))
+ "Speedbar face for directory names."
:group 'speedbar-faces)
+
(defface speedbar-tag-face '((((class color) (background light))
- (:foreground "brown"))
+ :foreground "brown")
(((class color) (background dark))
- (:foreground "yellow")))
- "Face used for displaying tags."
+ :foreground "yellow"))
+ "Speedbar face for tags."
:group 'speedbar-faces)
(defface speedbar-selected-face '((((class color) (background light))
- (:foreground "red" :underline t))
+ :foreground "red" :underline t)
(((class color) (background dark))
- (:foreground "red" :underline t))
- (t (:underline t)))
- "Face used to underline the file in the active window."
+ :foreground "red" :underline t)
+ (t :underline t))
+ "Speedbar face for the file in the active window."
:group 'speedbar-faces)
(defface speedbar-highlight-face '((((class color) (background light))
- (:background "green"))
+ :background "green")
(((class color) (background dark))
- (:background "sea green"))
- (((class grayscale monochrome)
- (background light))
- (:background "black"))
- (((class grayscale monochrome)
- (background dark))
- (:background "white")))
- "Face used for highlighting buttons with the mouse."
+ :background "sea green"))
+ "Speedbar face for highlighting buttons with the mouse."
:group 'speedbar-faces)
(defface speedbar-separator-face '((((class color) (background light))
- (:background "blue"
- :foreground "white"
- :overline "gray"))
+ :background "blue"
+ :foreground "white"
+ :overline "gray")
(((class color) (background dark))
- (:background "blue"
- :foreground "white"
- :overline "gray"))
+ :background "blue"
+ :foreground "white"
+ :overline "gray")
(((class grayscale monochrome)
(background light))
- (:background "black"
- :foreground "white"
- :overline "white"))
+ :background "black"
+ :foreground "white"
+ :overline "white")
(((class grayscale monochrome)
(background dark))
- (:background "white"
- :foreground "black"
- :overline "black")))
- "Face used for separator labels in a display."
+ :background "white"
+ :foreground "black"
+ :overline "black"))
+ "Speedbar face for separator labels in a display."
:group 'speedbar-faces)
;; some edebug hooks
=== modified file 'lisp/textmodes/flyspell.el'
--- a/lisp/textmodes/flyspell.el 2012-06-02 10:56:09 +0000
+++ b/lisp/textmodes/flyspell.el 2012-06-08 16:39:49 +0000
@@ -445,24 +445,14 @@
;;*---------------------------------------------------------------------*/
;;* Highlighting */
;;*---------------------------------------------------------------------*/
-(defface flyspell-incorrect
- '((((class color)) (:foreground "OrangeRed" :bold t :underline t))
- (t (:bold t)))
- "Face used for marking a misspelled word in Flyspell."
+(defface flyspell-incorrect '((t :underline t :inherit error))
+ "Flyspell face for misspelled words."
:group 'flyspell)
-(if (featurep 'emacs)
- (define-obsolete-face-alias 'flyspell-incorrect-face 'flyspell-incorrect
"22.1")
- (put 'flyspell-incorrect-face 'face-alias 'flyspell-incorrect))
-(defface flyspell-duplicate
- '((((class color)) (:foreground "Gold3" :bold t :underline t))
- (t (:bold t)))
- "Face used for marking a misspelled word that appears twice in the buffer.
+(defface flyspell-duplicate '((t :underline t :inherit warning))
+ "Flyspell face for words that appear twice in a row.
See also `flyspell-duplicate-distance'."
:group 'flyspell)
-(if (featurep 'emacs)
- (define-obsolete-face-alias 'flyspell-duplicate-face 'flyspell-duplicate
"22.1")
- (put 'flyspell-duplicate-face 'face-alias 'flyspell-duplicate))
(defvar flyspell-overlay nil)
=== modified file 'lisp/textmodes/table.el'
--- a/lisp/textmodes/table.el 2012-04-09 13:05:48 +0000
+++ b/lisp/textmodes/table.el 2012-06-08 16:39:49 +0000
@@ -678,11 +678,9 @@
:group 'table)
(defface table-cell
- '((((min-colors 88) (class color))
- (:foreground "gray90" :background "blue1"))
- (((class color))
- (:foreground "gray90" :background "blue"))
- (t (:bold t)))
+ '((((min-colors 88) (class color)) :foreground "gray90" :background "blue1")
+ (((class color)) :foreground "gray90" :background "blue")
+ (t :weight bold))
"Face used for table cell contents."
:tag "Cell Face"
:group 'table)
=== modified file 'lisp/whitespace.el'
--- a/lisp/whitespace.el 2012-06-02 10:56:09 +0000
+++ b/lisp/whitespace.el 2012-06-08 16:39:49 +0000
@@ -565,10 +565,10 @@
(defface whitespace-space
'((((class color) (background dark))
- (:background "grey20" :foreground "darkgray"))
+ :background "grey20" :foreground "darkgray")
(((class color) (background light))
- (:background "LightYellow" :foreground "lightgray"))
- (t (:inverse-video t)))
+ :background "LightYellow" :foreground "lightgray")
+ (t :inverse-video t))
"Face used to visualize SPACE."
:group 'whitespace)
@@ -583,10 +583,10 @@
(defface whitespace-hspace ; 'nobreak-space
'((((class color) (background dark))
- (:background "grey24" :foreground "darkgray"))
+ :background "grey24" :foreground "darkgray")
(((class color) (background light))
- (:background "LemonChiffon3" :foreground "lightgray"))
- (t (:inverse-video t)))
+ :background "LemonChiffon3" :foreground "lightgray")
+ (t :inverse-video t))
"Face used to visualize HARD SPACE."
:group 'whitespace)
@@ -601,10 +601,10 @@
(defface whitespace-tab
'((((class color) (background dark))
- (:background "grey22" :foreground "darkgray"))
+ :background "grey22" :foreground "darkgray")
(((class color) (background light))
- (:background "beige" :foreground "lightgray"))
- (t (:inverse-video t)))
+ :background "beige" :foreground "lightgray")
+ (t :inverse-video t))
"Face used to visualize TAB."
:group 'whitespace)
@@ -621,15 +621,13 @@
(defface whitespace-newline
- '((((class color) (background dark))
- (:foreground "darkgray" :bold nil))
- (((class color) (min-colors 88) (background light))
- (:foreground "lightgray" :bold nil))
+ '((default :weight normal)
+ (((class color) (background dark)) :foreground "darkgray")
+ (((class color) (min-colors 88) (background light)) :foreground
"lightgray")
;; Displays with 16 colors use lightgray as background, so using a
;; lightgray foreground makes the newline mark invisible.
- (((class color) (background light))
- (:foreground "brown" :bold nil))
- (t (:underline t :bold nil)))
+ (((class color) (background light)) :foreground "brown")
+ (t :underline t))
"Face used to visualize NEWLINE char mapping.
See `whitespace-display-mappings'."
@@ -645,8 +643,9 @@
(defface whitespace-trailing ; 'trailing-whitespace
- '((((class mono)) (:inverse-video t :bold t :underline t))
- (t (:background "red1" :foreground "yellow" :bold t)))
+ '((default :weight bold)
+ (((class mono)) :inverse-video t :underline t)
+ (t :background "red1" :foreground "yellow"))
"Face used to visualize trailing blanks."
:group 'whitespace)
@@ -662,8 +661,8 @@
(defface whitespace-line
- '((((class mono)) (:inverse-video t :bold t :underline t))
- (t (:background "gray20" :foreground "violet")))
+ '((((class mono)) :inverse-video t :weight bold :underline t)
+ (t :background "gray20" :foreground "violet"))
"Face used to visualize \"long\" lines.
See `whitespace-line-column'."
@@ -679,8 +678,8 @@
(defface whitespace-space-before-tab
- '((((class mono)) (:inverse-video t :bold t :underline t))
- (t (:background "DarkOrange" :foreground "firebrick")))
+ '((((class mono)) :inverse-video t :weight bold :underline t)
+ (t :background "DarkOrange" :foreground "firebrick"))
"Face used to visualize SPACEs before TAB."
:group 'whitespace)
@@ -694,8 +693,8 @@
(defface whitespace-indentation
- '((((class mono)) (:inverse-video t :bold t :underline t))
- (t (:background "yellow" :foreground "firebrick")))
+ '((((class mono)) :inverse-video t :weight bold :underline t)
+ (t :background "yellow" :foreground "firebrick"))
"Face used to visualize 8 or more SPACEs at beginning of line."
:group 'whitespace)
@@ -709,8 +708,8 @@
(defface whitespace-empty
- '((((class mono)) (:inverse-video t :bold t :underline t))
- (t (:background "yellow" :foreground "firebrick")))
+ '((((class mono)) :inverse-video t :weight bold :underline t)
+ (t :background "yellow" :foreground "firebrick"))
"Face used to visualize empty lines at beginning and/or end of buffer."
:group 'whitespace)
@@ -724,8 +723,8 @@
(defface whitespace-space-after-tab
- '((((class mono)) (:inverse-video t :bold t :underline t))
- (t (:background "yellow" :foreground "firebrick")))
+ '((((class mono)) :inverse-video t :weight bold :underline t)
+ (t :background "yellow" :foreground "firebrick"))
"Face used to visualize 8 or more SPACEs after TAB."
:group 'whitespace)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108528: Face cleanups. Remove some uses of old-style face spec and :bold/:italic.,
Chong Yidong <=