(various face definitions): Use :weight and :slant.

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index c46d152d97e3d6b0e92e08b2e4e6748381ef5afa..14781556c03ab45f31ef679cffefe50d245dd5e9 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -173,27 +173,27 @@ when editing big diffs)."
 
 (defface diff-header-face
   '((((type tty pc) (class color) (background light))
-     (:foreground "blue1" :bold t))
+     (:foreground "blue1" :weight bold))
     (((type tty pc) (class color) (background dark))
-     (:foreground "green" :bold t))
+     (:foreground "green" :weight bold))
     (((class color) (background light))
      (:background "grey85"))
     (((class color) (background dark))
      (:background "grey45"))
-    (t (:bold t)))
+    (t (:weight bold)))
   "`diff-mode' face inherited by hunk and index header faces.")
 (defvar diff-header-face 'diff-header-face)
 
 (defface diff-file-header-face
   '((((type tty pc) (class color) (background light))
-     (:foreground "yellow" :bold t))
+     (:foreground "yellow" :weight bold))
     (((type tty pc) (class color) (background dark))
-     (:foreground "cyan" :bold t))
+     (:foreground "cyan" :weight bold))
     (((class color) (background light))
-     (:background "grey70" :bold t))
+     (:background "grey70" :weight bold))
     (((class color) (background dark))
-     (:background "grey60" :bold t))
-    (t (:bold t)))                     ; :height 1.3
+     (:background "grey60" :weight bold))
+    (t (:weight bold)))                        ; :height 1.3
   "`diff-mode' face used to highlight file header lines.")
 (defvar diff-file-header-face 'diff-file-header-face)
 
@@ -219,9 +219,9 @@ when editing big diffs)."
 
 (defface diff-changed-face
   '((((type tty pc) (class color) (background light))
-     (:foreground "magenta" :bold t :italic t))
+     (:foreground "magenta" :weight bold :slant italic))
     (((type tty pc) (class color) (background dark))
-     (:foreground "yellow" :bold t :italic t))
+     (:foreground "yellow" :weight bold :slant italic))
     (t ()))
   "`diff-mode' face used to highlight changed lines.")
 (defvar diff-changed-face 'diff-changed-face)

diff --git a/lisp/enriched.el b/lisp/enriched.el
index 6cb7dd782d2db32299c7bf207b76bf5b658b9e83..71fc2cd146c542976cd3e2482272c6e76effe3b2 100644 (file)
--- a/lisp/enriched.el
+++ b/lisp/enriched.el
@@ -63,7 +63,7 @@
 ;; have to be fixed-width.  So we just pick one that looks different from the
 ;; default.
 (defface fixed
-  '((t (:bold t)))
+  '((t (:weight bold)))
   "Face used for text that must be shown in fixed width.
 Currently, emacs can only display fixed-width fonts, but this may change.
 This face is used for text specifically marked as fixed-width, for example
@@ -71,7 +71,7 @@ in text/enriched files."
   :group 'enriched)
 
 (defface excerpt
-  '((t (:italic t)))
+  '((t (:slant italic)))
   "Face used for text that is an excerpt from another document.
 This is used in Enriched mode for text explicitly marked as an excerpt."
   :group 'enriched)

diff --git a/lisp/info.el b/lisp/info.el
index 7bbfcd9e79e95681106e3dde666416289414214a..9ce5bb7ea4447d3de51dee80d64c4e8e56858e83 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -61,9 +61,9 @@ The Lisp code is executed when the node is selected.")
   :group 'info)
 
 (defface info-node
-  '((((class color) (background light)) (:foreground "brown" :bold t :italic t))
-    (((class color) (background dark)) (:foreground "white" :bold t :italic t))
-    (t (:bold t :italic t)))
+  '((((class color) (background light)) (:foreground "brown" :weight bold :slant italic))
+    (((class color) (background dark)) (:foreground "white" :weight bold :slant italic))
+    (t (:weight bold :slant italic)))
   "Face for Info node names."
   :group 'info)
 
@@ -74,9 +74,9 @@ The Lisp code is executed when the node is selected.")
   :group 'info)
 
 (defface info-xref
-  '((((class color) (background light)) (:foreground "magenta4" :bold t))
-    (((class color) (background dark)) (:foreground "cyan" :bold t))
-    (t (:bold t)))
+  '((((class color) (background light)) (:foreground "magenta4" :weight bold))
+    (((class color) (background dark)) (:foreground "cyan" :weight bold))
+    (t (:weight bold)))
   "Face for Info cross-references."
   :group 'info)
 

diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index ba172471930a2620306b4ef236bbb85c2d25fafa..0074e77b2b289dc539b7a2adb36260e4a2a46cf7 100644 (file)
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-info.el,v 1.6 2000/12/18 03:17:31 monnier Exp $
+;; Revision: $Id: pcvs-info.el,v 1.7 2001/07/16 07:46:48 pj Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -70,10 +70,10 @@ to confuse some users sometimes."
 
 (defface cvs-header-face
   '((((class color) (background dark))
-     (:foreground "lightyellow" :bold t))
+     (:foreground "lightyellow" :weight bold))
     (((class color) (background light))
-     (:foreground "blue4" :bold t))
-    (t (:bold t)))
+     (:foreground "blue4" :weight bold))
+    (t (:weight bold)))
   "PCL-CVS face used to highlight directory changes."
   :group 'pcl-cvs)
 
@@ -91,7 +91,7 @@ to confuse some users sometimes."
      (:foreground "red"))
     (((class color) (background light))
      (:foreground "red"))
-    (t (:italic t)))
+    (t (:slant italic)))
   "PCL-CVS face used to highlight unknown file status."
   :group 'pcl-cvs)
 
@@ -109,21 +109,21 @@ to confuse some users sometimes."
      (:foreground "orange"))
     (((class color) (background light))
      (:foreground "orange"))
-    (t (:italic t)))
+    (t (:slant italic)))
   "PCL-CVS face used to highlight status of files needing action."
   :group 'pcl-cvs)
 
 (defface cvs-marked-face
   '((((class color) (background dark))
-     (:foreground "green" :bold t))
+     (:foreground "green" :weight bold))
     (((class color) (background light))
-     (:foreground "green3" :bold t))
-    (t (:bold t)))
+     (:foreground "green3" :weight bold))
+    (t (:weight bold)))
   "PCL-CVS face used to highlight marked file indicator."
   :group 'pcl-cvs)
 
 (defface cvs-msg-face
-  '((t (:italic t)))
+  '((t (:slant italic)))
   "PCL-CVS face used to highlight CVS messages."
   :group 'pcl-cvs)
 

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 72dd4928517a438f880155b6c2d99b02fa7fb71f..156d2f7f18e7c424fb134063ad0f313f90f5b78c 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -552,40 +552,40 @@ when syntaxifying a chunk of buffer."
 
       (defface cperl-nonoverridable-face
        `((((class grayscale) (background light))
-          (:background "Gray90" :italic t :underline t))
+          (:background "Gray90" :slant italic :underline t))
          (((class grayscale) (background dark))
-          (:foreground "Gray80" :italic t :underline t :bold t))
+          (:foreground "Gray80" :slant italic :underline t :weight bold))
          (((class color) (background light))
           (:foreground "chartreuse3"))
          (((class color) (background dark))
           (:foreground ,cperl-dark-foreground))
-         (t (:bold t :underline t)))
+         (t (:weight bold :underline t)))
        "Font Lock mode face used to highlight array names."
        :group 'cperl-faces)
 
       (defface cperl-array-face
        `((((class grayscale) (background light))
-          (:background "Gray90" :bold t))
+          (:background "Gray90" :weight bold))
          (((class grayscale) (background dark))
-          (:foreground "Gray80" :bold t))
+          (:foreground "Gray80" :weight bold))
          (((class color) (background light))
-          (:foreground "Blue" :background "lightyellow2" :bold t))
+          (:foreground "Blue" :background "lightyellow2" :weight bold))
          (((class color) (background dark))
-          (:foreground "yellow" :background ,cperl-dark-background :bold t))
-         (t (:bold t)))
+          (:foreground "yellow" :background ,cperl-dark-background :weight bold))
+         (t (:weight bold)))
        "Font Lock mode face used to highlight array names."
        :group 'cperl-faces)
 
       (defface cperl-hash-face
        `((((class grayscale) (background light))
-          (:background "Gray90" :bold t :italic t))
+          (:background "Gray90" :weight bold :slant italic))
          (((class grayscale) (background dark))
-          (:foreground "Gray80" :bold t :italic t))
+          (:foreground "Gray80" :weight bold :slant italic))
          (((class color) (background light))
-          (:foreground "Red" :background "lightyellow2" :bold t :italic t))
+          (:foreground "Red" :background "lightyellow2" :weight bold :slant italic))
          (((class color) (background dark))
-          (:foreground "Red" :background ,cperl-dark-background :bold t :italic t))
-         (t (:bold t :italic t)))
+          (:foreground "Red" :background ,cperl-dark-background :weight bold :slant italic))
+         (t (:weight bold :slant italic)))
        "Font Lock mode face used to highlight hash names."
        :group 'cperl-faces)))
 

diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 3cb35c8acd8409809b79522607cc965929ce3893..e41c9bd58efe27a06f18b6d8b625b2e936673768 100644 (file)
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -9424,8 +9424,8 @@ This does background highlighting of translate-off regions.")
  'vhdl-highlight-faces 'font-lock-variable-name-face 'custom-face)
 
 (defface vhdl-font-lock-prompt-face
-  '((((class color) (background light)) (:foreground "Red" :bold t))
-    (((class color) (background dark)) (:foreground "Pink" :bold t))
+  '((((class color) (background light)) (:foreground "Red" :weight bold))
+    (((class color) (background dark)) (:foreground "Pink" :weight bold))
     (t (:inverse-video t)))
   "Font lock mode face used to highlight prompts."
   :group 'vhdl-highlight-faces
@@ -9434,7 +9434,7 @@ This does background highlighting of translate-off regions.")
 (defface vhdl-font-lock-attribute-face
   '((((class color) (background light)) (:foreground "Orchid"))
     (((class color) (background dark)) (:foreground "LightSteelBlue"))
-    (t (:italic t :bold t)))
+    (t (:slant italic :weight bold)))
   "Font lock mode face used to highlight standardized attributes."
   :group 'vhdl-highlight-faces
   :group 'font-lock-highlighting-faces)
@@ -9442,7 +9442,7 @@ This does background highlighting of translate-off regions.")
 (defface vhdl-font-lock-enumvalue-face
   '((((class color) (background light)) (:foreground "Gold4"))
     (((class color) (background dark)) (:foreground "BurlyWood"))
-    (t (:italic t :bold t)))
+    (t (:slant italic :weight bold)))
   "Font lock mode face used to highlight standardized enumeration values."
   :group 'vhdl-highlight-faces
   :group 'font-lock-highlighting-faces)
@@ -9450,7 +9450,7 @@ This does background highlighting of translate-off regions.")
 (defface vhdl-font-lock-function-face
   '((((class color) (background light)) (:foreground "Orchid4"))
     (((class color) (background dark)) (:foreground "Orchid1"))
-    (t (:italic t :bold t)))
+    (t (:slant italic :weight bold)))
   "Font lock mode face used to highlight standardized functions and packages."
   :group 'vhdl-highlight-faces
   :group 'font-lock-highlighting-faces)
@@ -9458,14 +9458,14 @@ This does background highlighting of translate-off regions.")
 (defface vhdl-font-lock-directive-face
   '((((class color) (background light)) (:foreground "CadetBlue"))
     (((class color) (background dark)) (:foreground "Aquamarine"))
-    (t (:italic t :bold t)))
+    (t (:slant italic :weight bold)))
   "Font lock mode face used to highlight directives."
   :group 'vhdl-highlight-faces
   :group 'font-lock-highlighting-faces)
 
 (defface vhdl-font-lock-reserved-words-face
-  '((((class color) (background light)) (:foreground "Orange" :bold t))
-    (((class color) (background dark)) (:foreground "Yellow" :bold t))
+  '((((class color) (background light)) (:foreground "Orange" :weight bold))
+    (((class color) (background dark)) (:foreground "Yellow" :weight bold))
     (t ()))
   "Font lock mode face used to highlight additional reserved words."
   :group 'vhdl-highlight-faces