Synch with Oort Gnus.

[elisp/gnus.git-] / lisp / gnus-cite.el

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index f888492..65ce313 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -442,7 +442,8 @@ If WIDTH (the numerical prefix), use that text width when filling."
                 (concat "^" (regexp-quote (cdar marks)) " *"))
                (fill-prefix
                 (if (string= (cdar marks) "") ""
-                  (concat (cdar marks) " "))))
+                  (concat (cdar marks) " ")))
+               use-hard-newlines)
            (fill-region (point-min) (point-max)))
          (set-marker (caar marks) nil)
          (setq marks (cdr marks)))
@@ -511,8 +512,7 @@ always hide."
                    (setq beg nil)
                  (setq end (point-marker))))))
          (when (and beg end)
-           (or (memq 'cite gnus-article-wash-types)
-               (push 'cite gnus-article-wash-types))
+           (gnus-add-wash-type 'cite)
            ;; We use markers for the end-points to facilitate later
            ;; wrapping and mangling of text.
            (setq beg (set-marker (make-marker) beg)
@@ -558,8 +558,7 @@ means show, nil means toggle."
             'article-type 'cite beg end
             (cons 'article-type (cons 'cite
                                       gnus-hidden-properties))))
-       (or (memq 'cite gnus-article-wash-types)
-           (push 'cite gnus-article-wash-types))
+       (gnus-add-wash-type 'cite)
        (gnus-add-text-properties-when
         'article-type nil beg end
         (cons 'article-type (cons 'cite
@@ -974,8 +973,7 @@ See also the documentation for `gnus-article-highlight-citation'."
                                       gnus-hidden-properties))
              ((assq number gnus-cite-attribution-alist))
              (t
-              (or (memq 'cite gnus-article-wash-types)
-                  (push 'cite gnus-article-wash-types))
+              (gnus-add-wash-type 'cite)
               (gnus-add-text-properties
                (point) (progn (forward-line 1) (point))
                (nconc (list 'article-type 'cite)