(ps-font-lock-face-attributes): Use :weight and :slant.

diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 8f0b99f29727b8138342f07d2b3a7bc3b3ce742f..babb5083076d264d427365f6e4474a424d3ef958 100644 (file)
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -850,7 +850,7 @@ this variable represents.")
 
 (defface viper-minibuffer-emacs-face
   '((((class color)) (:foreground "Black" :background "darkseagreen2"))
-    (t (:bold t)))
+    (t (:weight bold)))
   "Face used in the Minibuffer when it is in Emacs state."
   :group 'viper-highlighting)
 ;; An internal variable.  Viper takes the face from here.
@@ -864,7 +864,7 @@ this variable represents.")
 
 (defface viper-minibuffer-insert-face
   '((((class color)) (:foreground "Black" :background "pink"))
-    (t (:italic t)))
+    (t (:slant italic)))
   "Face used in the Minibuffer when it is in Insert state."
   :group 'viper-highlighting)
 ;; An internal variable.  Viper takes the face from here.

diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index b3961f254f4f0b35f08e7ac6ee5c8101b42963f3..d4ec875978f4331ec2376313d192d7ca0bcf62c8 100644 (file)
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -4011,9 +4011,9 @@ If EXTENSION is any other symbol, it is ignored."
                   (setq face-spec (cons ':background
                                         (cons background face-spec))))
                 (when bold-p
-                  (setq face-spec (append '(:bold t) face-spec)))
+                  (setq face-spec (append '(:weight bold) face-spec)))
                 (when italic-p
-                  (setq face-spec (append '(:italic t) face-spec)))
+                  (setq face-spec (append '(:slant italic) face-spec)))
                 (when underline-p
                   (setq face-spec (append '(:underline t) face-spec)))
                 (custom-declare-face face (list (list t face-spec)) nil)

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index ca6bd1dc3a4679c11967c1885681b4e7dbdfb762..6ef77a3bfd5dccf1e72864b97c3d26eb3268e393 100644 (file)
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -111,7 +111,7 @@ This exists as a variable so it can be set locally in certain buffers.")
   "Face used for buttons in widgets.
 This exists as a variable so it can be set locally in certain buffers.")
 
-(defface widget-button-face '((t (:bold t)))
+(defface widget-button-face '((t (:weight bold)))
   "Face used for widget buttons."
   :group 'widget-faces)
 
@@ -132,7 +132,7 @@ This exists as a variable so it can be set locally in certain buffers.")
                               (background dark))
                              (:background "dim gray"))
                             (t
-                             (:italic t)))
+                             (:slant italic)))
   "Face used for editable fields."
   :group 'widget-faces)
 
@@ -145,7 +145,7 @@ This exists as a variable so it can be set locally in certain buffers.")
                                           (background dark))
                                          (:background "dim gray"))
                                         (t
-                                         (:italic t)))
+                                         (:slant italic)))
   "Face used for editable fields spanning only a single line."
   :group 'widget-faces)
 
@@ -433,7 +433,7 @@ new value.")
                                  (background light))
                                 (:foreground "dim gray"))
                                (t
-                                (:italic t)))
+                                (:slant italic)))
   "Face used for inactive widgets."
   :group 'widget-faces)
 
@@ -850,7 +850,7 @@ Recommended as a parent keymap for modes using widgets.")
   '((((class color))
      (:foreground "red"))
     (t
-     (:bold t :underline t)))
+     (:weight bold :underline t)))
   "Face used for pressed buttons."
   :group 'widget-faces)
 

diff --git a/lisp/woman.el b/lisp/woman.el
index e4440be46903498b0f5641643a7f1ea773c8742c..902fd21174493520d30a69af64baeb40b3d432e7 100644 (file)
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -840,14 +840,14 @@ or different fonts."
 ;; You should probably select either italic or underline as you prefer, but
 ;; not both, although italic and underline work together perfectly well!
 (defface woman-italic-face
-  `((((background light)) (:italic t :underline t :foreground "red"))
-    (((background dark)) (:italic t :underline t)))
+  `((((background light)) (:slant italic :underline t :foreground "red"))
+    (((background dark)) (:slant italic :underline t)))
   "Face for italic font in man pages."
   :group 'woman-faces)
 
 (defface woman-bold-face
-  '((((background light)) (:bold t :foreground "blue"))
-    (((background dark)) (:bold t :foreground "green2")))
+  '((((background light)) (:weight bold :foreground "blue"))
+    (((background dark)) (:weight bold :foreground "green2")))
   "Face for bold font in man pages."
   :group 'woman-faces)