From f35cbaa7e458dd873a973ca6b2199e47f0bb69e5 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 25 Aug 2003 03:57:13 +0000 Subject: [PATCH] Synch to Gnus 200308250352. --- lisp/ChangeLog | 12 ++++++++++++ lisp/gnus-art.el | 26 ++++++++++++++++++++++---- texi/ChangeLog | 4 ++++ texi/gnus-ja.texi | 2 +- texi/gnus.texi | 2 +- 5 files changed, 40 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 16f4036..64369a0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2003-08-25 Katsumi Yamaoka + + * gnus-art.el: Don't use defvaralias. + (gnus-treat-display-x-face): Warn if the obsolete variable + `gnus-treat-display-xface' exists. + +2003-08-25 Jesper Harder + + * gnus-art.el (gnus-treat-display-face): Fix typo. + (gnus-treat-display-xface): Rename to gnus-treat-display-x-face + (reported by Jochen K,A|(Bpper ) + 2003-08-24 Jesper Harder * gnus-art.el (gnus-header-button-alist, gnus-button-alist): Fix diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index d0f8a42..faa513c 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1198,7 +1198,10 @@ See Info node `(gnus)Customizing Articles' for details." :type gnus-article-treat-custom) (put 'gnus-treat-overstrike 'highlight t) -(defcustom gnus-treat-display-xface +(make-obsolete-variable 'gnus-treat-display-xface + 'gnus-treat-display-x-face) + +(defcustom gnus-treat-display-x-face (and (not noninteractive) (or (memq gnus-article-x-face-command '(x-face-decode-message-header @@ -1218,8 +1221,23 @@ See Info node `(gnus)Customizing Articles' and Info node ;;:version "21.1" :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) + :type gnus-article-treat-head-custom + :set (lambda (symbol value) + (custom-set-default + symbol + (cond ((boundp 'gnus-treat-display-xface) + (message "\ +** gnus-treat-display-xface is an obsolete variable;\ + use gnus-treat-display-x-face instead") + (default-value 'gnus-treat-display-xface)) + ((get 'gnus-treat-display-xface 'saved-value) + (message "\ +** gnus-treat-display-xface is an obsolete variable;\ + use gnus-treat-display-x-face instead") + (eval (car (get 'gnus-treat-display-xface 'saved-value)))) + (t + value))))) +(put 'gnus-treat-display-x-face 'highlight t) (defcustom gnus-article-should-use-smiley-mule (not (or (featurep 'xemacs) @@ -1501,7 +1519,7 @@ This requires GNU Libidn, and by default only enabled if it is found." (gnus-treat-fold-headers gnus-article-treat-fold-headers) ;; Displaying X-Face should be done after unfolding headers ;; to protect bitmap lines. - (gnus-treat-display-xface gnus-article-display-x-face) + (gnus-treat-display-x-face gnus-article-display-x-face) (gnus-treat-fold-newsgroups gnus-article-treat-fold-newsgroups) (gnus-treat-buttonize-head gnus-article-add-buttons-to-head) (gnus-treat-display-smileys gnus-treat-smiley) diff --git a/texi/ChangeLog b/texi/ChangeLog index 309b525..33d2e89 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2003-08-25 Jesper Harder + + * gnus.texi (Customizing Articles): xface -> x-face. + 2003-08-20 Simon Josefsson * gnus.texi (GroupLens): Move text around. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 3619d85..f34ac48 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -10328,7 +10328,7 @@ GNUS $B$d(B Gnus $B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N, @xref{Smileys}. -@item gnus-treat-display-xface (head) +@item gnus-treat-display-x-face (head) @xref{X-Face}. diff --git a/texi/gnus.texi b/texi/gnus.texi index f93c4b6..ff8b7a5 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -10987,7 +10987,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}. -- 1.7.10.4