summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-art.el
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-09-04 22:17:09 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-09-04 22:17:09 +0000
commit052bd38a56ad14a7f311677051e778de6c4bdc1c (patch)
tree9665d674fcb17743e603175e33986a81c2d30309 /lisp/gnus/gnus-art.el
parent86633eab8a77697f6e15aae568868781a5a1023f (diff)
downloademacs-052bd38a56ad14a7f311677051e778de6c4bdc1c.tar.gz
Merge changes made in Gnus trunk.
gnus.el (gnus-home-directory): Add warning about setting in .gnus.el (bug#9405). gnus-score.el (gnus-summary-increase-score): Doc clarification (bug#9421). gnus-spec.el (gnus-face-0): Make all the face specs into defcustoms (bug#9425). gnus-art.el (gnus-treatment-function-alist): Remove CRs as the first thing (bug#9426).
Diffstat (limited to 'lisp/gnus/gnus-art.el')
-rw-r--r--lisp/gnus/gnus-art.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index eaf0ed52f51..9d962fc6d99 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1657,14 +1657,14 @@ regexp."
(defvar gnus-article-mime-handle-alist-1 nil)
(defvar gnus-treatment-function-alist
- '((gnus-treat-x-pgp-sig gnus-article-verify-x-pgp-sig)
+ '((gnus-treat-strip-cr gnus-article-remove-cr)
+ (gnus-treat-x-pgp-sig gnus-article-verify-x-pgp-sig)
(gnus-treat-strip-banner gnus-article-strip-banner)
(gnus-treat-strip-headers-in-body gnus-article-strip-headers-in-body)
(gnus-treat-highlight-signature gnus-article-highlight-signature)
(gnus-treat-buttonize gnus-article-add-buttons)
(gnus-treat-fill-article gnus-article-fill-cited-article)
(gnus-treat-fill-long-lines gnus-article-fill-cited-long-lines)
- (gnus-treat-strip-cr gnus-article-remove-cr)
(gnus-treat-unsplit-urls gnus-article-unsplit-urls)
(gnus-treat-display-x-face gnus-article-display-x-face)
(gnus-treat-display-face gnus-article-display-face)