2002-01-01 ShengHuo ZHU <zsh@cs.rochester.edu>

	* message.el, gnus-art.el, gnus.el, gnus-cite.el:
	Adapt face definitions to use :weight and :slant.

5 files changed, 136 insertions, 103 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e1dcca8c8dd..885687c043e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+        * message.el, gnus-art.el, gnus.el, gnus-cite.el: 
+        Adapt face definitions to use :weight and :slant.
+
 2001-12-12  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
         * gnus-mlspl.el (gnus-group-split-fancy): Doc fix (add reference
@@ -5,7 +10,11 @@
 
 2001-12-05  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
-        * mm-view.el: Partially sync with the Gnus CVS.
+        * mm-view.el (mm-inline-text): w3-coding-system-for-mime-charset
+        may not defined. From: Raja R Harinath <harinath@cs.umn.edu>.
+
+        * mm-view.el (mm-inline-message): Insert a newline unless bolp.
+
         * gnus-sum.el (gnus-summary-save-article): Nix
         gnus-display-mime-function and gnus-article-prepare-hook.
 
@@ -40,8 +49,23 @@
 
         * gnus-util.el (gnus-directory-sep-char-regexp): New variable.
         * gnus-score.el (gnus-score-find-bnews): Use it.
-        * mm-util.el: Sync. Read ChangeLog in Gnus CVS.
-
+        * mm-util.el (mm-iso-8859-x-to-15-region): Use
+        insert-before-markers.
+        From Jesper Harder <harder@ifa.au.dk>
+        * mm-util.el (mm-coding-system-priorities): Add backslash in the doc.
+        * mm-util.el (mm-coding-system-priorities): New variable.
+        (mm-sort-coding-systems-predicate): New function.
+        (mm-find-mime-charset-region): Resort coding systems if needed.
+        Suggested by Katsumi Yamaoka <yamaoka@jpl.org>.
+
+        * mm-util.el (mm-iso-8859-15-compatible): Fix doc.
+        (mm-hack-charsets): Fix doc.
+        
+        * mm-util.el (mm-iso-8859-15-compatible): Add inconvertible chars.
+        (mm-iso-8859-x-to-15-table): Ditto.
+        (mm-iso-8859-x-to-15-region): Ditto.
+        (mm-find-mime-charset-region): Ditto.
+        
         * gnus-sum.el (gnus-summary-limit-to-subject): An exclusion version.
         (gnus-summary-limit-to-author): Ditto.
         (gnus-summary-limit-to-extra): Ditto.
@@ -75,8 +99,17 @@
 
 2001-10-30  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
-        * mm-util.el, nnultimate.el, nnweb.el, nnslashdot.el: Sync with
-        the Gnus CVS.
+        * mm-util.el (mm-iso-8859-x-to-15-region): New function.
+        (mm-hack-charsets): New variable.
+        (mm-iso-8859-15-compatible): New variable.
+        (mm-iso-8859-x-to-15-table): New variable.
+        (mm-find-mime-charset-region): Add parameter hack-charsets.
+
+        * mm-util.el (mm-charset-to-coding-system): Return nil, if charset
+        is nil.
+
+        * nnultimate.el, nnweb.el, nnslashdot.el: Update, because the web
+        pages are changed.
 
         * mm-util.el (mm-mime-mule-charset-alist): Move down and call
         mm-coding-system-p. Don't correct it only in XEmacs.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index e3b560eaa7b..f4a1a88f41a 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1,6 +1,6 @@
 ;;; gnus-art.el --- article mode commands for Gnus
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -278,11 +278,11 @@ and the latter avoids underlining any whitespace at all."
   :group 'gnus-article-emphasis
   :type 'regexp)
 
-(defface gnus-emphasis-bold '((t (:bold t)))
+(defface gnus-emphasis-bold '((t (:weight bold)))
   "Face used for displaying strong emphasized text (*word*)."
   :group 'gnus-article-emphasis)
 
-(defface gnus-emphasis-italic '((t (:italic t)))
+(defface gnus-emphasis-italic '((t (:slant italic)))
   "Face used for displaying italic emphasized text (/word/)."
   :group 'gnus-article-emphasis)
 
@@ -290,20 +290,20 @@ and the latter avoids underlining any whitespace at all."
   "Face used for displaying underlined emphasized text (_word_)."
   :group 'gnus-article-emphasis)
 
-(defface gnus-emphasis-underline-bold '((t (:bold t :underline t)))
+(defface gnus-emphasis-underline-bold '((t (:weight bold :underline t)))
   "Face used for displaying underlined bold emphasized text (_*word*_)."
   :group 'gnus-article-emphasis)
 
-(defface gnus-emphasis-underline-italic '((t (:italic t :underline t)))
+(defface gnus-emphasis-underline-italic '((t (:slant italic :underline t)))
   "Face used for displaying underlined italic emphasized text (_/word/_)."
   :group 'gnus-article-emphasis)
 
-(defface gnus-emphasis-bold-italic '((t (:bold t :italic t)))
+(defface gnus-emphasis-bold-italic '((t (:weight bold :slant italic)))
   "Face used for displaying bold italic emphasized text (/*word*/)."
   :group 'gnus-article-emphasis)
 
 (defface gnus-emphasis-underline-bold-italic
-  '((t (:bold t :italic t :underline t)))
+  '((t (:weight bold :slant italic :underline t)))
   "Face used for displaying underlined bold italic emphasized text.
 Esample: (_/*word*/_)."
   :group 'gnus-article-emphasis)
@@ -489,7 +489,7 @@ Obsolete; use the face `gnus-signature-face' for customizations instead."
 
 (defface gnus-signature-face
   '((t
-     (:italic t)))
+     (:slant italic)))
   "Face used for highlighting a signature in the article buffer."
   :group 'gnus-article-highlight
   :group 'gnus-article-signature)
@@ -502,7 +502,7 @@ Obsolete; use the face `gnus-signature-face' for customizations instead."
       (background light))
      (:foreground "red3"))
     (t
-     (:italic t)))
+     (:slant italic)))
   "Face used for displaying from headers."
   :group 'gnus-article-headers
   :group 'gnus-article-highlight)
@@ -515,7 +515,7 @@ Obsolete; use the face `gnus-signature-face' for customizations instead."
       (background light))
      (:foreground "red4"))
     (t
-     (:bold t :italic t)))
+     (:weight bold :slant italic)))
   "Face used for displaying subject headers."
   :group 'gnus-article-headers
   :group 'gnus-article-highlight)
@@ -523,12 +523,12 @@ Obsolete; use the face `gnus-signature-face' for customizations instead."
 (defface gnus-header-newsgroups-face
   '((((class color)
       (background dark))
-     (:foreground "yellow" :italic t))
+     (:foreground "yellow" :slant italic))
     (((class color)
       (background light))
-     (:foreground "MidnightBlue" :italic t))
+     (:foreground "MidnightBlue" :slant italic))
     (t
-     (:italic t)))
+     (:slant italic)))
   "Face used for displaying newsgroups headers."
   :group 'gnus-article-headers
   :group 'gnus-article-highlight)
@@ -541,7 +541,7 @@ Obsolete; use the face `gnus-signature-face' for customizations instead."
       (background light))
      (:foreground "maroon"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying header names."
   :group 'gnus-article-headers
   :group 'gnus-article-highlight)
@@ -549,12 +549,12 @@ Obsolete; use the face `gnus-signature-face' for customizations instead."
 (defface gnus-header-content-face
   '((((class color)
       (background dark))
-     (:foreground "forest green" :italic t))
+     (:foreground "forest green" :slant italic))
     (((class color)
       (background light))
-     (:foreground "indianred4" :italic t))
+     (:foreground "indianred4" :slant italic))
     (t
-     (:italic t)))  "Face used for displaying header content."
+     (:slant italic)))  "Face used for displaying header content."
   :group 'gnus-article-headers
   :group 'gnus-article-highlight)
 
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index ef659175b14..2bca7c25d6e 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -1,6 +1,6 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus  -*- coding: iso-latin-1 -*-
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
@@ -124,7 +124,7 @@ The text matching the first grouping will be used as a button."
   :type 'regexp)
 
 (defface gnus-cite-attribution-face '((t
-                                       (:italic t)))
+                                       (:slant italic)))
   "Face used for attribution lines.")
 
 (defcustom gnus-cite-attribution-face 'gnus-cite-attribution-face
@@ -140,7 +140,7 @@ It is merged with the face for the cited text belonging to the attribution."
                               (background light))
                              (:foreground "MidnightBlue"))
                             (t
-                             (:italic t)))
+                             (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-face-2 '((((class color)
@@ -150,7 +150,7 @@ It is merged with the face for the cited text belonging to the attribution."
                               (background light))
                              (:foreground "firebrick"))
                             (t
-                             (:italic t)))
+                             (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-face-3 '((((class color)
@@ -160,7 +160,7 @@ It is merged with the face for the cited text belonging to the attribution."
                               (background light))
                              (:foreground "dark green"))
                             (t
-                             (:italic t)))
+                             (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-face-4 '((((class color)
@@ -170,7 +170,7 @@ It is merged with the face for the cited text belonging to the attribution."
                               (background light))
                              (:foreground "OrangeRed"))
                             (t
-                             (:italic t)))
+                             (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-face-5 '((((class color)
@@ -180,7 +180,7 @@ It is merged with the face for the cited text belonging to the attribution."
                               (background light))
                              (:foreground "dark khaki"))
                             (t
-                             (:italic t)))
+                             (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-face-6 '((((class color)
@@ -190,7 +190,7 @@ It is merged with the face for the cited text belonging to the attribution."
                               (background light))
                              (:foreground "dark violet"))
                             (t
-                             (:italic t)))
+                             (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-face-7 '((((class color)
@@ -200,7 +200,7 @@ It is merged with the face for the cited text belonging to the attribution."
                               (background light))
                              (:foreground "SteelBlue4"))
                             (t
-                             (:italic t)))
+                             (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-face-8 '((((class color)
@@ -210,7 +210,7 @@ It is merged with the face for the cited text belonging to the attribution."
                               (background light))
                              (:foreground "magenta"))
                             (t
-                             (:italic t)))
+                             (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-face-9 '((((class color)
@@ -220,7 +220,7 @@ It is merged with the face for the cited text belonging to the attribution."
                               (background light))
                              (:foreground "violet"))
                             (t
-                             (:italic t)))
+                             (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-face-10 '((((class color)
@@ -230,7 +230,7 @@ It is merged with the face for the cited text belonging to the attribution."
                                (background light))
                               (:foreground "medium purple"))
                              (t
-                              (:italic t)))
+                              (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-face-11 '((((class color)
@@ -240,7 +240,7 @@ It is merged with the face for the cited text belonging to the attribution."
                                (background light))
                               (:foreground "turquoise"))
                              (t
-                              (:italic t)))
+                              (:slant italic)))
   "Citation face.")
 
 (defcustom gnus-cite-face-list
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 10144d73fed..c34c45cc12d 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1,6 +1,6 @@
 ;;; gnus.el --- a newsreader for GNU Emacs
-;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996,
-;;        1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997,
+;;               1998, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;      Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -325,10 +325,10 @@ be set in `.emacs' instead."
 (defface gnus-group-news-1-face
   '((((class color)
       (background dark))
-     (:foreground "PaleTurquoise" :bold t))
+     (:foreground "PaleTurquoise" :weight bold))
     (((class color)
       (background light))
-     (:foreground "ForestGreen" :bold t))
+     (:foreground "ForestGreen" :weight bold))
     (t
      ()))
   "Level 1 newsgroup face.")
@@ -347,10 +347,10 @@ be set in `.emacs' instead."
 (defface gnus-group-news-2-face
   '((((class color)
       (background dark))
-     (:foreground "turquoise" :bold t))
+     (:foreground "turquoise" :weight bold))
     (((class color)
       (background light))
-     (:foreground "CadetBlue4" :bold t))
+     (:foreground "CadetBlue4" :weight bold))
     (t
      ()))
   "Level 2 newsgroup face.")
@@ -369,10 +369,10 @@ be set in `.emacs' instead."
 (defface gnus-group-news-3-face
   '((((class color)
       (background dark))
-     (:bold t))
+     (:weight bold))
     (((class color)
       (background light))
-     (:bold t))
+     (:weight bold))
     (t
      ()))
   "Level 3 newsgroup face.")
@@ -391,10 +391,10 @@ be set in `.emacs' instead."
 (defface gnus-group-news-4-face
   '((((class color)
       (background dark))
-     (:bold t))
+     (:weight bold))
     (((class color)
       (background light))
-     (:bold t))
+     (:weight bold))
     (t
      ()))
   "Level 4 newsgroup face.")
@@ -413,10 +413,10 @@ be set in `.emacs' instead."
 (defface gnus-group-news-5-face
   '((((class color)
       (background dark))
-     (:bold t))
+     (:weight bold))
     (((class color)
       (background light))
-     (:bold t))
+     (:weight bold))
     (t
      ()))
   "Level 5 newsgroup face.")
@@ -435,10 +435,10 @@ be set in `.emacs' instead."
 (defface gnus-group-news-6-face
   '((((class color)
       (background dark))
-     (:bold t))
+     (:weight bold))
     (((class color)
       (background light))
-     (:bold t))
+     (:weight bold))
     (t
      ()))
   "Level 6 newsgroup face.")
@@ -457,10 +457,10 @@ be set in `.emacs' instead."
 (defface gnus-group-news-low-face
   '((((class color)
       (background dark))
-     (:foreground "DarkTurquoise" :bold t))
+     (:foreground "DarkTurquoise" :weight bold))
     (((class color)
       (background light))
-     (:foreground "DarkGreen" :bold t))
+     (:foreground "DarkGreen" :weight bold))
     (t
      ()))
   "Low level newsgroup face.")
@@ -479,12 +479,12 @@ be set in `.emacs' instead."
 (defface gnus-group-mail-1-face
   '((((class color)
       (background dark))
-     (:foreground "aquamarine1" :bold t))
+     (:foreground "aquamarine1" :weight bold))
     (((class color)
       (background light))
-     (:foreground "DeepPink3" :bold t))
+     (:foreground "DeepPink3" :weight bold))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Level 1 mailgroup face.")
 
 (defface gnus-group-mail-1-empty-face
@@ -495,18 +495,18 @@ be set in `.emacs' instead."
       (background light))
      (:foreground "DeepPink3"))
     (t
-     (:italic t :bold t)))
+     (:slant italic :weight bold)))
   "Level 1 empty mailgroup face.")
 
 (defface gnus-group-mail-2-face
   '((((class color)
       (background dark))
-     (:foreground "aquamarine2" :bold t))
+     (:foreground "aquamarine2" :weight bold))
     (((class color)
       (background light))
-     (:foreground "HotPink3" :bold t))
+     (:foreground "HotPink3" :weight bold))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Level 2 mailgroup face.")
 
 (defface gnus-group-mail-2-empty-face
@@ -517,18 +517,18 @@ be set in `.emacs' instead."
       (background light))
      (:foreground "HotPink3"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Level 2 empty mailgroup face.")
 
 (defface gnus-group-mail-3-face
   '((((class color)
       (background dark))
-     (:foreground "aquamarine3" :bold t))
+     (:foreground "aquamarine3" :weight bold))
     (((class color)
       (background light))
-     (:foreground "magenta4" :bold t))
+     (:foreground "magenta4" :weight bold))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Level 3 mailgroup face.")
 
 (defface gnus-group-mail-3-empty-face
@@ -545,12 +545,12 @@ be set in `.emacs' instead."
 (defface gnus-group-mail-low-face
   '((((class color)
       (background dark))
-     (:foreground "aquamarine4" :bold t))
+     (:foreground "aquamarine4" :weight bold))
     (((class color)
       (background light))
-     (:foreground "DeepPink4" :bold t))
+     (:foreground "DeepPink4" :weight bold))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Low level mailgroup face.")
 
 (defface gnus-group-mail-low-empty-face
@@ -561,7 +561,7 @@ be set in `.emacs' instead."
       (background light))
      (:foreground "DeepPink4"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Low level empty mailgroup face.")
 
 ;; Summary mode faces.
@@ -578,23 +578,23 @@ be set in `.emacs' instead."
 (defface gnus-summary-high-ticked-face
   '((((class color)
       (background dark))
-     (:foreground "pink" :bold t))
+     (:foreground "pink" :weight bold))
     (((class color)
       (background light))
-     (:foreground "firebrick" :bold t))
+     (:foreground "firebrick" :weight bold))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for high interest ticked articles.")
 
 (defface gnus-summary-low-ticked-face
   '((((class color)
       (background dark))
-     (:foreground "pink" :italic t))
+     (:foreground "pink" :slant italic))
     (((class color)
       (background light))
-     (:foreground "firebrick" :italic t))
+     (:foreground "firebrick" :slant italic))
     (t
-     (:italic t)))
+     (:slant italic)))
   "Face used for low interest ticked articles.")
 
 (defface gnus-summary-normal-ticked-face
@@ -611,23 +611,23 @@ be set in `.emacs' instead."
 (defface gnus-summary-high-ancient-face
   '((((class color)
       (background dark))
-     (:foreground "SkyBlue" :bold t))
+     (:foreground "SkyBlue" :weight bold))
     (((class color)
       (background light))
-     (:foreground "RoyalBlue" :bold t))
+     (:foreground "RoyalBlue" :weight bold))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for high interest ancient articles.")
 
 (defface gnus-summary-low-ancient-face
   '((((class color)
       (background dark))
-     (:foreground "SkyBlue" :italic t))
+     (:foreground "SkyBlue" :slant italic))
     (((class color)
       (background light))
-     (:foreground "RoyalBlue" :italic t))
+     (:foreground "RoyalBlue" :slant italic))
     (t
-     (:italic t)))
+     (:slant italic)))
   "Face used for low interest ancient articles.")
 
 (defface gnus-summary-normal-ancient-face
@@ -643,12 +643,12 @@ be set in `.emacs' instead."
 
 (defface gnus-summary-high-unread-face
   '((t
-     (:bold t)))
+     (:weight bold)))
   "Face used for high interest unread articles.")
 
 (defface gnus-summary-low-unread-face
   '((t
-     (:italic t)))
+     (:slant italic)))
   "Face used for low interest unread articles.")
 
 (defface gnus-summary-normal-unread-face
@@ -660,26 +660,26 @@ be set in `.emacs' instead."
   '((((class color)
       (background dark))
      (:foreground "PaleGreen"
-                  :bold t))
+                  :weight bold))
     (((class color)
       (background light))
      (:foreground "DarkGreen"
-                  :bold t))
+                  :weight bold))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for high interest read articles.")
 
 (defface gnus-summary-low-read-face
   '((((class color)
       (background dark))
      (:foreground "PaleGreen"
-                  :italic t))
+                  :slant italic))
     (((class color)
       (background light))
      (:foreground "DarkGreen"
-                  :italic t))
+                  :slant italic))
     (t
-     (:italic t)))
+     (:slant italic)))
   "Face used for low interest read articles.")
 
 (defface gnus-summary-normal-read-face
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ea92525e8d9..c6eac7c9aeb 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1,5 +1,5 @@
 ;;; message.el --- composing mail and news messages  -*- coding: iso-latin-1 -*-
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -716,24 +716,24 @@ Defaults to `text-mode-abbrev-table'.")
 (defface message-header-to-face
   '((((class color)
       (background dark))
-     (:foreground "green2" :bold t))
+     (:foreground "green2" :weight bold))
     (((class color)
       (background light))
-     (:foreground "MidnightBlue" :bold t))
+     (:foreground "MidnightBlue" :weight bold))
     (t
-     (:bold t :italic t)))
+     (:weight bold :slant italic)))
   "Face used for displaying From headers."
   :group 'message-faces)
 
 (defface message-header-cc-face
   '((((class color)
       (background dark))
-     (:foreground "green4" :bold t))
+     (:foreground "green4" :weight bold))
     (((class color)
       (background light))
      (:foreground "MidnightBlue"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying Cc headers."
   :group 'message-faces)
 
@@ -743,21 +743,21 @@ Defaults to `text-mode-abbrev-table'.")
      (:foreground "green3"))
     (((class color)
       (background light))
-     (:foreground "navy blue" :bold t))
+     (:foreground "navy blue" :weight bold))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying subject headers."
   :group 'message-faces)
 
 (defface message-header-newsgroups-face
   '((((class color)
       (background dark))
-     (:foreground "yellow" :bold t :italic t))
+     (:foreground "yellow" :weight bold :slant italic))
     (((class color)
       (background light))
-     (:foreground "blue4" :bold t :italic t))
+     (:foreground "blue4" :weight bold :slant italic))
     (t
-     (:bold t :italic t)))
+     (:weight bold :slant italic)))
   "Face used for displaying newsgroups headers."
   :group 'message-faces)
 
@@ -769,7 +769,7 @@ Defaults to `text-mode-abbrev-table'.")
       (background light))
      (:foreground "steel blue"))
     (t
-     (:bold t :italic t)))
+     (:weight bold :slant italic)))
   "Face used for displaying newsgroups headers."
   :group 'message-faces)
 
@@ -781,7 +781,7 @@ Defaults to `text-mode-abbrev-table'.")
       (background light))
      (:foreground "cornflower blue"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying header names."
   :group 'message-faces)
 
@@ -793,7 +793,7 @@ Defaults to `text-mode-abbrev-table'.")
       (background light))
      (:foreground "blue"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying X-Header headers."
   :group 'message-faces)
 
@@ -805,7 +805,7 @@ Defaults to `text-mode-abbrev-table'.")
       (background light))
      (:foreground "brown"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying the separator."
   :group 'message-faces)
 
@@ -817,7 +817,7 @@ Defaults to `text-mode-abbrev-table'.")
       (background light))
      (:foreground "red"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying cited text names."
   :group 'message-faces)
 
@@ -829,7 +829,7 @@ Defaults to `text-mode-abbrev-table'.")
       (background light))
      (:foreground "ForestGreen"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying MML."
   :group 'message-faces)