* spam.el: removed unnecessary condition-case for loading bbdb-com.el

[gnus] / lisp / gnus-cite.el

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index f482729..59ccf01 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -1,6 +1,6 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
@@ -259,6 +259,11 @@ This should make it easier to see who wrote what."
   :group 'gnus-cite
   :type 'integer)
 
+(defcustom gnus-cite-blank-line-after-header t
+  "If non-nil, put a blank line between the citation header and the button."
+  :group 'gnus-cite
+  :type 'boolean)
+
 ;;; Internal Variables:
 
 (defvar gnus-cite-article nil)
@@ -441,7 +446,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)))
@@ -510,15 +516,15 @@ 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)
                    end (set-marker (make-marker) end))
              (gnus-add-text-properties-when 'article-type nil beg end props)
              (goto-char beg)
-             (unless (save-excursion (search-backward "\n\n" nil t))
+             (when (and gnus-cite-blank-line-after-header
+                        (not (save-excursion (search-backward "\n\n" nil t))))
                (insert "\n"))
              (put-text-property
               (setq start (point-marker))
@@ -557,8 +563,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
@@ -968,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)