* gnus-art.el (gnus-treat-display-face): Fix typo.

(gnus-treat-display-xface): Rename to gnus-treat-display-x-face
(reported by Jochen Küpper <jochen@jochen-kuepper.de>)

* gnus.texi (Customizing Articles): xface -> x-face.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16f4036..74f407e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-25  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-art.el (gnus-treat-display-face): Fix typo.
+       (gnus-treat-display-xface): Rename to gnus-treat-display-x-face
+       (reported by Jochen K\e,A|\e(Bpper <jochen@jochen-kuepper.de>)
+
 2003-08-24  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus-art.el (gnus-header-button-alist, gnus-button-alist): Fix

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 7d1a504..74d22eb 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1145,7 +1145,11 @@ See Info node `(gnus)Customizing Articles' for details."
   :type gnus-article-treat-custom)
 (put 'gnus-treat-overstrike 'highlight t)
 
-(defcustom gnus-treat-display-xface
+(defvaralias 'gnus-treat-display-xface 'gnus-treat-display-x-face)
+(make-obsolete-variable 'gnus-treat-display-xface 
+                       'gnus-treat-display-x-face)
+
+(defcustom gnus-treat-display-x-face
   (and (not noninteractive)
        (or (and (fboundp 'image-type-available-p)
                (image-type-available-p 'xbm)
@@ -1163,7 +1167,7 @@ See Info node `(gnus)Customizing Articles' and Info node
   :link '(custom-manual "(gnus)Customizing Articles")
   :link '(custom-manual "(gnus)X-Face")
   :type gnus-article-treat-head-custom)
-(put 'gnus-treat-display-xface 'highlight t)
+(put 'gnus-treat-display-x-face 'highlight t)
 
 (defcustom gnus-treat-display-face
   (and (not noninteractive)
@@ -1181,7 +1185,7 @@ See Info node `(gnus)Customizing Articles' and Info node
   :link '(custom-manual "(gnus)Customizing Articles")
   :link '(custom-manual "(gnus)X-Face")
   :type gnus-article-treat-head-custom)
-(put 'gnus-treat-display-xface 'highlight t)
+(put 'gnus-treat-display-face 'highlight t)
 
 (defcustom gnus-treat-display-smileys
   (if (or (and (featurep 'xemacs)
@@ -1367,7 +1371,7 @@ This requires GNU Libidn, and by default only enabled if it is found."
     (gnus-treat-date-original gnus-article-date-original)
     (gnus-treat-date-user-defined gnus-article-date-user)
     (gnus-treat-date-iso8601 gnus-article-date-iso8601)
-    (gnus-treat-display-xface gnus-article-display-x-face)
+    (gnus-treat-display-x-face gnus-article-display-x-face)
     (gnus-treat-display-face gnus-article-display-face)
     (gnus-treat-hide-headers gnus-article-maybe-hide-headers)
     (gnus-treat-hide-boring-headers gnus-article-hide-boring-headers)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 309b525..33d2e89 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-25  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi (Customizing Articles): xface -> x-face.
+
 2003-08-20  Simon Josefsson  <jas@extundo.com>
 
        * gnus.texi (GroupLens): Move text around.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index a250e2c..f292fb1 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -11078,7 +11078,7 @@ is controlled by @code{gnus-body-boundary-delimiter}.
 
 @xref{Smileys}.
 
-@item gnus-treat-display-xface (head)
+@item gnus-treat-display-x-face (head)
 
 @xref{X-Face}.