--- a/lisp/gnus/gnus-cite.el	Mon Aug 13 08:48:43 2007 +0200
+++ b/lisp/gnus/gnus-cite.el	Mon Aug 13 08:49:20 2007 +0200
@@ -1,5 +1,5 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus
-;; Copyright (C) 1995,96 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@iesd.auc.dk>
 ;; Keywords: news, mail
@@ -26,94 +26,231 @@
 ;;; Code:
 
 (require 'gnus)
-(require 'gnus-msg)
-(require 'gnus-ems)
-(eval-when-compile (require 'cl))
-
-(eval-and-compile
-  (autoload 'gnus-article-add-button "gnus-vis"))
+(require 'gnus-art)
+(require 'gnus-range)
 
 ;;; Customization:
 
-(defvar gnus-cited-text-button-line-format "%(%{[...]%}%)\n"
-  "Format of cited text buttons.")
+(defgroup gnus-cite nil
+  "Citation."
+  :prefix "gnus-cite-"
+  :link '(custom-manual "(gnus)Article Highlighting")
+  :group 'gnus-article)
+
+(defcustom gnus-cite-reply-regexp
+  "^\\(Subject: Re\\|In-Reply-To\\|References\\):"
+  "If headers match this regexp it is reasonable to believe that
+article has citations."
+  :group 'gnus-cite
+  :type 'string)
 
-(defvar gnus-cited-lines-visible nil
-  "The number of lines of hidden cited text to remain visible.")
+(defcustom gnus-cite-always-check nil
+  "Check article always for citations. Set it t to check all articles."
+  :group 'gnus-cite
+  :type '(choice (const :tag "no" nil)
+		  (const :tag "yes" t)))
 
-(defvar gnus-cite-parse-max-size 25000
+(defcustom gnus-cited-text-button-line-format "%(%{[...]%}%)\n"
+  "Format of cited text buttons."
+  :group 'gnus-cite
+  :type 'string)
+
+(defcustom gnus-cited-lines-visible nil
+  "The number of lines of hidden cited text to remain visible."
+  :group 'gnus-cite
+  :type '(choice (const :tag "none" nil)
+		 integer))
+
+(defcustom gnus-cite-parse-max-size 25000
   "Maximum article size (in bytes) where parsing citations is allowed.
-Set it to nil to parse all articles.")
+Set it to nil to parse all articles."
+  :group 'gnus-cite
+  :type '(choice (const :tag "all" nil)
+		 integer))
 
-(defvar gnus-cite-prefix-regexp 
+(defcustom gnus-cite-prefix-regexp 
     "^[]>|:}+ ]*[]>|:}+]\\(.*>\\)?\\|^.*>"
-  "Regexp matching the longest possible citation prefix on a line.")
+  "Regexp matching the longest possible citation prefix on a line."
+  :group 'gnus-cite
+  :type 'regexp)
 
-(defvar gnus-cite-max-prefix 20
-  "Maximum possible length for a citation prefix.")
+(defcustom gnus-cite-max-prefix 20
+  "Maximum possible length for a citation prefix."
+  :group 'gnus-cite
+  :type 'integer)
 
-(defvar gnus-supercite-regexp 
+(defcustom gnus-supercite-regexp 
   (concat "^\\(" gnus-cite-prefix-regexp "\\)? *"
 	  ">>>>> +\"\\([^\"\n]+\\)\" +==")
   "Regexp matching normal Supercite attribution lines.
-The first grouping must match prefixes added by other packages.")
+The first grouping must match prefixes added by other packages."
+  :group 'gnus-cite
+  :type 'regexp)
 
-(defvar gnus-supercite-secondary-regexp "^.*\"\\([^\"\n]+\\)\" +=="
+(defcustom gnus-supercite-secondary-regexp "^.*\"\\([^\"\n]+\\)\" +=="
   "Regexp matching mangled Supercite attribution lines.
-The first regexp group should match the Supercite attribution.")
-
-(defvar gnus-cite-minimum-match-count 2
-  "Minimum number of identical prefixes before we believe it's a citation.")
+The first regexp group should match the Supercite attribution."
+  :group 'gnus-cite
+  :type 'regexp)
 
-;see gnus-cus.el
-;(defvar gnus-cite-face-list 
-;  (if (eq gnus-display-type 'color)
-;      (if (eq gnus-background-mode 'dark) 'light 'dark)
-;    '(italic))
-;  "Faces used for displaying different citations.
-;It is either a list of face names, or one of the following special
-;values:
+(defcustom gnus-cite-minimum-match-count 2
+  "Minimum number of identical prefixes before we believe it's a citation."
+  :group 'gnus-cite
+  :type 'integer)
 
-;dark: Create faces from `gnus-face-dark-name-list'.
-;light: Create faces from `gnus-face-light-name-list'.
+(defcustom gnus-cite-attribution-prefix "in article\\|in <"
+  "Regexp matching the beginning of an attribution line."
+  :group 'gnus-cite
+  :type 'regexp)
 
-;The variable `gnus-make-foreground' determines whether the created
-;faces change the foreground or the background colors.")
-
-(defvar gnus-cite-attribution-prefix "in article\\|in <"
-  "Regexp matching the beginning of an attribution line.")
-
-(defvar gnus-cite-attribution-suffix
+(defcustom gnus-cite-attribution-suffix
   "\\(wrote\\|writes\\|said\\|says\\):[ \t]*$"
   "Regexp matching the end of an attribution line.
-The text matching the first grouping will be used as a button.")
+The text matching the first grouping will be used as a button."
+  :group 'gnus-cite
+  :type 'regexp)
+
+(defface gnus-cite-attribution-face '((t 
+				       (:underline t)))
+  "Face used for attribution lines.")
+
+(defcustom gnus-cite-attribution-face 'gnus-cite-attribution-face
+  "Face used for attribution lines.
+It is merged with the face for the cited text belonging to the attribution."
+  :group 'gnus-cite
+  :type 'face)
+
+(defface gnus-cite-face-1 '((((class color)
+			      (background dark))
+			     (:foreground "light blue"))
+			    (((class color)
+			      (background light))
+			     (:foreground "MidnightBlue"))
+			    (t 
+			     (:italic t)))
+  "Citation face.")
 
-;see gnus-cus.el
-;(defvar gnus-cite-attribution-face 'underline
-;  "Face used for attribution lines.
-;It is merged with the face for the cited text belonging to the attribution.")
+(defface gnus-cite-face-2 '((((class color)
+			      (background dark))
+			     (:foreground "light cyan"))
+			    (((class color)
+			      (background light))
+			     (:foreground "firebrick"))
+			    (t 
+			     (:italic t)))
+  "Citation face.")
+
+(defface gnus-cite-face-3 '((((class color)
+			      (background dark))
+			     (:foreground "light yellow"))
+			    (((class color)
+			      (background light))
+			     (:foreground "dark green"))
+			    (t 
+			     (:italic t)))
+  "Citation face.")
 
-;see gnus-cus.el
-;(defvar gnus-cite-hide-percentage 50
-;  "Only hide cited text if it is larger than this percent of the body.")
+(defface gnus-cite-face-4 '((((class color)
+			      (background dark))
+			     (:foreground "light pink"))
+			    (((class color)
+			      (background light))
+			     (:foreground "OrangeRed"))
+			    (t 
+			     (:italic t)))
+  "Citation face.")
+
+(defface gnus-cite-face-5 '((((class color)
+			      (background dark))
+			     (:foreground "pale green"))
+			    (((class color)
+			      (background light))
+			     (:foreground "dark khaki"))
+			    (t 
+			     (:italic t)))
+  "Citation face.")
 
-;see gnus-cus.el
-;(defvar gnus-cite-hide-absolute 10
-;  "Only hide cited text if there is at least this number of cited lines.")
+(defface gnus-cite-face-6 '((((class color)
+			      (background dark))
+			     (:foreground "beige"))
+			    (((class color)
+			      (background light))
+			     (:foreground "dark violet"))
+			    (t 
+			     (:italic t)))
+  "Citation face.")
+
+(defface gnus-cite-face-7 '((((class color)
+			      (background dark))
+			     (:foreground "orange"))
+			    (((class color)
+			      (background light))
+			     (:foreground "SteelBlue4"))
+			    (t 
+			     (:italic t)))
+  "Citation face.")
+
+(defface gnus-cite-face-8 '((((class color)
+			      (background dark))
+			     (:foreground "magenta"))
+			    (((class color)
+			      (background light))
+			     (:foreground "magenta"))
+			    (t 
+			     (:italic t)))
+  "Citation face.")
+
+(defface gnus-cite-face-9 '((((class color)
+			      (background dark))
+			     (:foreground "violet"))
+			    (((class color)
+			      (background light))
+			     (:foreground "violet"))
+			    (t 
+			     (:italic t)))
+  "Citation face.")
 
-;see gnus-cus.el
-;(defvar gnus-face-light-name-list
-;  '("light blue" "light cyan" "light yellow" "light pink"
-;    "pale green" "beige" "orange" "magenta" "violet" "medium purple"
-;    "turquoise")
-;  "Names of light colors.")
+(defface gnus-cite-face-10 '((((class color)
+			       (background dark))
+			      (:foreground "medium purple"))
+			     (((class color)
+			       (background light))
+			      (:foreground "medium purple"))
+			     (t 
+			      (:italic t)))
+  "Citation face.")
+
+(defface gnus-cite-face-11 '((((class color)
+			       (background dark))
+			      (:foreground "turquoise"))
+			     (((class color)
+			       (background light))
+			      (:foreground "turquoise"))
+			     (t 
+			      (:italic t)))
+  "Citation face.")
 
-;see gnus-cus.el
-;(defvar gnus-face-dark-name-list
-;  '("dark salmon" "firebrick"
-;    "dark green" "dark orange" "dark khaki" "dark violet"
-;    "dark turquoise")
-;  "Names of dark colors.")
+(defcustom gnus-cite-face-list 
+  '(gnus-cite-face-1 gnus-cite-face-2 gnus-cite-face-3 gnus-cite-face-4 
+    gnus-cite-face-5 gnus-cite-face-6 gnus-cite-face-7 gnus-cite-face-8 
+    gnus-cite-face-9 gnus-cite-face-10 gnus-cite-face-11)
+  "List of faces used for highlighting citations. 
+
+When there are citations from multiple articles in the same message,
+Gnus will try to give each citation from each article its own face.
+This should make it easier to see who wrote what."
+  :group 'gnus-cite
+  :type '(repeat face))
+
+(defcustom gnus-cite-hide-percentage 50
+  "Only hide excess citation if above this percentage of the body."
+  :group 'gnus-cite
+  :type 'number)
+
+(defcustom gnus-cite-hide-absolute 10
+  "Only hide excess citation if above this number of lines in the body."
+  :group 'gnus-cite
+  :type 'integer)
 
 ;;; Internal Variables:
 
@@ -141,8 +278,8 @@
 ;; TAG: Is a Supercite tag, if any.
 
 (defvar gnus-cited-text-button-line-format-alist 
-  `((?b beg ?d)
-    (?e end ?d)
+  `((?b (marker-position beg) ?d)
+    (?e (marker-position end) ?d)
     (?l (- end beg) ?d)))
 (defvar gnus-cited-text-button-line-format-spec nil)
 
@@ -161,13 +298,6 @@
 Lines matching `gnus-cite-attribution-suffix' and perhaps
 `gnus-cite-attribution-prefix' are considered attribution lines."
   (interactive (list 'force))
-  ;; Create dark or light faces if necessary.
-  (cond ((eq gnus-cite-face-list 'light)
-	 (setq gnus-cite-face-list
-	       (mapcar 'gnus-make-face gnus-face-light-name-list)))
-	((eq gnus-cite-face-list 'dark)
-	 (setq gnus-cite-face-list
-	       (mapcar 'gnus-make-face gnus-face-dark-name-list))))
   (save-excursion
     (set-buffer gnus-article-buffer)
     (gnus-cite-parse-maybe force)
@@ -202,11 +332,11 @@
 	      face (cdr (assoc prefix face-alist)))
 	;; Add attribution button.
 	(goto-line number)
-	(if (re-search-forward gnus-cite-attribution-suffix 
-			       (save-excursion (end-of-line 1) (point))
-			       t)
-	    (gnus-article-add-button (match-beginning 1) (match-end 1)
-				     'gnus-cite-toggle prefix))
+	(when (re-search-forward gnus-cite-attribution-suffix 
+				 (save-excursion (end-of-line 1) (point))
+				 t)
+	  (gnus-article-add-button (match-beginning 1) (match-end 1)
+				   'gnus-cite-toggle prefix))
 	;; Highlight attribution line.
 	(gnus-cite-add-face number skip face)
 	(gnus-cite-add-face number skip gnus-cite-attribution-face))
@@ -241,14 +371,17 @@
 	  (goto-char (point-min))
 	  (forward-line (1- number))
 	  (push (cons (point-marker) prefix) marks)))
+      ;; Skip to the beginning of the body.
       (goto-char (point-min))
       (search-forward "\n\n" nil t)
       (push (cons (point-marker) "") marks)
+      ;; Find the end of the body.
       (goto-char (point-max))
-      (re-search-backward gnus-signature-separator nil t)
+      (gnus-article-search-signature)
       (push (cons (point-marker) "") marks)
+      ;; Sort the marks.
       (setq marks (sort marks (lambda (m1 m2) (< (car m1) (car m2)))))
-      (let* ((omarks marks))
+      (let ((omarks marks))
 	(setq marks nil)
 	(while (cdr omarks)
 	  (if (= (caar omarks) (caadr omarks))
@@ -257,7 +390,10 @@
 		  (push (car omarks) marks))
 		(unless (equal (cdadr omarks) "")
 		  (push (cadr omarks) marks))
-		(setq omarks (cdr omarks)))
+		(unless (and (equal (cdar omarks) "")
+			     (equal (cdadr omarks) "")
+			     (not (cddr omarks)))
+		  (setq omarks (cdr omarks))))
 	    (push (car omarks) marks))
 	  (setq omarks (cdr omarks)))
 	(when (car omarks)
@@ -272,17 +408,18 @@
 	      (setcdr m (cdddr m))
 	    (setq m (cdr m))))
 	marks))))
-	    
 
-(defun gnus-article-fill-cited-article (&optional force)
-  "Do word wrapping in the current article."
-  (interactive (list t))
+(defun gnus-article-fill-cited-article (&optional force width)
+  "Do word wrapping in the current article.
+If WIDTH (the numerical prefix), use that text width when filling."
+  (interactive (list t current-prefix-arg))
   (save-excursion
     (set-buffer gnus-article-buffer)
     (let ((buffer-read-only nil)
 	  (inhibit-point-motion-hooks t)
 	  (marks (gnus-dissect-cited-text))
-	  (adaptive-fill-mode nil))
+	  (adaptive-fill-mode nil)
+	  (fill-column (if width (prefix-numeric-value width) fill-column)))
       (save-restriction
 	(while (cdr marks)
 	  (widen)
@@ -294,24 +431,35 @@
 	  (set-marker (caar marks) nil)
 	  (setq marks (cdr marks)))
 	(when marks
-	  (set-marker (caar marks) nil))))))
+	  (set-marker (caar marks) nil))
+	;; All this information is now incorrect.
+	(setq gnus-cite-prefix-alist nil
+	      gnus-cite-attribution-alist nil
+	      gnus-cite-loose-prefix-alist nil
+	      gnus-cite-loose-attribution-alist nil)))))
 
 (defun gnus-article-hide-citation (&optional arg force)
   "Toggle hiding of all cited text except attribution lines.
 See the documentation for `gnus-article-highlight-citation'.
 If given a negative prefix, always show; if given a positive prefix,
 always hide."
-  (interactive (append (gnus-hidden-arg) (list 'force)))
+  (interactive (append (gnus-article-hidden-arg) (list 'force)))
   (setq gnus-cited-text-button-line-format-spec 
 	(gnus-parse-format gnus-cited-text-button-line-format 
 			   gnus-cited-text-button-line-format-alist t))
-  (unless (gnus-article-check-hidden-text 'cite arg)
-    (save-excursion
-      (set-buffer gnus-article-buffer)
+  (save-excursion
+    (set-buffer gnus-article-buffer)
+    (cond
+     ((gnus-article-check-hidden-text 'cite arg)
+      t)
+     ((gnus-article-text-type-exists-p 'cite)
+      (let ((buffer-read-only nil))
+	(gnus-article-hide-text-of-type 'cite)))
+     (t
       (let ((buffer-read-only nil)
 	    (marks (gnus-dissect-cited-text))
 	    (inhibit-point-motion-hooks t)
-	    (props (nconc (list 'gnus-type 'cite)
+	    (props (nconc (list 'article-type 'cite)
 			  gnus-hidden-properties))
 	    beg end)
 	(while marks
@@ -337,11 +485,16 @@
 	    (goto-char beg)
 	    (unless (save-excursion (search-backward "\n\n" nil t))
 	      (insert "\n"))
-	    (gnus-article-add-button
+	    (put-text-property
 	     (point)
-	     (progn (eval gnus-cited-text-button-line-format-spec) (point))
-	     `gnus-article-toggle-cited-text (cons beg end))
-	    (set-marker beg (point))))))))
+	     (progn
+	       (gnus-article-add-button
+		(point)
+		(progn (eval gnus-cited-text-button-line-format-spec) (point))
+		`gnus-article-toggle-cited-text (cons beg end))
+	       (point))
+	     'article-type 'annotation)
+	    (set-marker beg (point)))))))))
 
 (defun gnus-article-toggle-cited-text (region)
   "Toggle hiding the text in REGION."
@@ -362,7 +515,7 @@
 cited text with attributions.  When called interactively, these two
 variables are ignored.
 See also the documentation for `gnus-article-highlight-citation'."
-  (interactive (append (gnus-hidden-arg) (list 'force)))
+  (interactive (append (gnus-article-hidden-arg) (list 'force)))
   (unless (gnus-article-check-hidden-text 'cite arg)
     (save-excursion
       (set-buffer gnus-article-buffer)
@@ -376,29 +529,28 @@
 	    (hiden 0)
 	    total)
 	(goto-char (point-max))
-	(re-search-backward gnus-signature-separator nil t)
+	(gnus-article-search-signature)
 	(setq total (count-lines start (point)))
 	(while atts
 	  (setq hiden (+ hiden (length (cdr (assoc (cdar atts)
 						   gnus-cite-prefix-alist))))
 		atts (cdr atts)))
-	(if (or force
-		(and (> (* 100 hiden) (* gnus-cite-hide-percentage total))
-		     (> hiden gnus-cite-hide-absolute)))
-	    (progn
-	      (setq atts gnus-cite-attribution-alist)
-	      (while atts
-		(setq total (cdr (assoc (cdar atts) gnus-cite-prefix-alist))
-		      atts (cdr atts))
-		(while total
-		  (setq hiden (car total)
-			total (cdr total))
-		  (goto-line hiden)
-		  (or (assq hiden gnus-cite-attribution-alist)
-		      (gnus-add-text-properties 
-		       (point) (progn (forward-line 1) (point))
-		       (nconc (list 'gnus-type 'cite)
-			      gnus-hidden-properties)))))))))))
+	(when (or force
+		  (and (> (* 100 hiden) (* gnus-cite-hide-percentage total))
+		       (> hiden gnus-cite-hide-absolute)))
+	  (setq atts gnus-cite-attribution-alist)
+	  (while atts
+	    (setq total (cdr (assoc (cdar atts) gnus-cite-prefix-alist))
+		  atts (cdr atts))
+	    (while total
+	      (setq hiden (car total)
+		    total (cdr total))
+	      (goto-line hiden)
+	      (unless (assq hiden gnus-cite-attribution-alist)
+		(gnus-add-text-properties 
+		 (point) (progn (forward-line 1) (point))
+		 (nconc (list 'article-type 'cite)
+			gnus-hidden-properties))))))))))
 
 (defun gnus-article-hide-citation-in-followups ()
   "Hide cited text in non-root articles."
@@ -423,26 +575,41 @@
 	  gnus-cite-loose-prefix-alist nil
 	  gnus-cite-loose-attribution-alist nil)
     ;; Parse if not too large.
-    (if (and (not force) 
+    (if (and (not force)
 	     gnus-cite-parse-max-size
 	     (> (buffer-size) gnus-cite-parse-max-size))
 	()
       (setq gnus-cite-article (cons (car gnus-article-current)
 				    (cdr gnus-article-current)))
-      (gnus-cite-parse))))
+      (gnus-cite-parse-wrapper))))
+
+(defun gnus-cite-parse-wrapper ()
+  ;; Wrap chopped gnus-cite-parse
+  (goto-char (point-min))
+  (unless (search-forward "\n\n" nil t)
+    (goto-char (point-max)))
+  (save-excursion 
+    (gnus-cite-parse-attributions))
+  ;; Try to avoid check citation if there is no reason to believe
+  ;; that article has citations
+  (if (or gnus-cite-always-check
+	  (save-excursion
+	    (re-search-backward gnus-cite-reply-regexp nil t))
+	  gnus-cite-loose-attribution-alist)
+      (progn (save-excursion
+	       (gnus-cite-parse))
+	     (save-excursion
+	       (gnus-cite-connect-attributions)))))
 
 (defun gnus-cite-parse ()
   ;; Parse and connect citation prefixes and attribution lines.
   
   ;; Parse current buffer searching for citation prefixes.
-  (goto-char (point-min))
-  (or (search-forward "\n\n" nil t)
-      (goto-char (point-max)))
   (let ((line (1+ (count-lines (point-min) (point))))
 	(case-fold-search t)
 	(max (save-excursion
 	       (goto-char (point-max))
-	       (re-search-backward gnus-signature-separator nil t)
+	       (gnus-article-search-signature)
 	       (point)))
 	alist entry start begin end numbers prefix)
     ;; Get all potential prefixes in `alist'.
@@ -453,13 +620,13 @@
 	    start end)
       (goto-char begin)
       ;; Ignore standard Supercite attribution prefix.
-      (if (looking-at gnus-supercite-regexp)
-	  (if (match-end 1)
-	      (setq end (1+ (match-end 1)))
-	    (setq end (1+ begin))))
+      (when (looking-at gnus-supercite-regexp)
+	(if (match-end 1)
+	    (setq end (1+ (match-end 1)))
+	  (setq end (1+ begin))))
       ;; Ignore very long prefixes.
-      (if (> end (+ (point) gnus-cite-max-prefix))
-	  (setq end (+ (point) gnus-cite-max-prefix)))
+      (when (> end (+ (point) gnus-cite-max-prefix))
+	(setq end (+ (point) gnus-cite-max-prefix)))
       (while (re-search-forward gnus-cite-prefix-regexp (1- end) t)
 	;; Each prefix.
 	(setq end (match-end 0)
@@ -468,14 +635,14 @@
 	(setq entry (assoc prefix alist))
 	(if entry 
 	    (setcdr entry (cons line (cdr entry)))
-	  (setq alist (cons (list prefix line) alist)))
+	  (push (list prefix line) alist))
 	(goto-char begin))
       (goto-char start)
       (setq line (1+ line)))
     ;; We got all the potential prefixes.  Now create
     ;; `gnus-cite-prefix-alist' containing the oldest prefix for each
     ;; line that appears at least gnus-cite-minimum-match-count
-    ;; times. First sort them by length.  Longer is older.
+    ;; times.  First sort them by length.  Longer is older.
     (setq alist (sort alist (lambda (a b)
 			      (> (length (car a)) (length (car b))))))
     (while alist
@@ -492,11 +659,10 @@
 	     ;; longer in case it is an exact match for an attribution
 	     ;; line, but we don't remove the line from other
 	     ;; prefixes. 
-	     (setq gnus-cite-prefix-alist
-		   (cons entry gnus-cite-prefix-alist)))
+	     (push entry gnus-cite-prefix-alist))
 	    (t
-	     (setq gnus-cite-prefix-alist (cons entry
-						gnus-cite-prefix-alist))
+	     (push entry
+		   gnus-cite-prefix-alist)
 	     ;; Remove articles from other prefixes.
 	     (let ((loop alist)
 		   current)
@@ -504,59 +670,73 @@
 		 (setq current (car loop)
 		       loop (cdr loop))
 		 (setcdr current 
-			 (gnus-set-difference (cdr current) numbers))))))))
+			 (gnus-set-difference (cdr current) numbers)))))))))
+
+(defun gnus-cite-parse-attributions ()
+  (let (al-alist)
+    ;; Parse attributions
+    (while (re-search-forward gnus-cite-attribution-suffix (point-max) t)
+      (let* ((start (match-beginning 0))
+	     (end (match-end 0))
+	     (wrote (count-lines (point-min) end))
+	     (prefix (gnus-cite-find-prefix wrote))
+	     ;; Check previous line for an attribution leader.
+	     (tag (progn
+		    (beginning-of-line 1)
+		    (when (looking-at gnus-supercite-secondary-regexp)
+		      (buffer-substring (match-beginning 1)
+					(match-end 1)))))
+	     (in (progn
+		   (goto-char start)
+		   (and (re-search-backward gnus-cite-attribution-prefix
+					    (save-excursion
+					      (beginning-of-line 0)
+					      (point))
+					    t)
+			(not (re-search-forward gnus-cite-attribution-suffix
+						start t))
+			(count-lines (point-min) (1+ (point)))))))
+	(when (eq wrote in)
+	  (setq in nil))
+	(goto-char end)
+	;; don't add duplicates
+	(let ((al (buffer-substring (save-excursion (beginning-of-line 0)
+						    (1+ (point)))
+				    end)))
+	  (if (not (assoc al al-alist))
+	      (progn
+		(push (list wrote in prefix tag) 
+		      gnus-cite-loose-attribution-alist)
+		(push (cons al t) al-alist))))))))
+
+(defun gnus-cite-connect-attributions ()
+  ;; Connect attributions to citations
+
   ;; No citations have been connected to attribution lines yet.
   (setq gnus-cite-loose-prefix-alist (append gnus-cite-prefix-alist nil))
 
   ;; Parse current buffer searching for attribution lines.
-  (goto-char (point-min))
-  (search-forward "\n\n" nil t)
-  (while (re-search-forward gnus-cite-attribution-suffix (point-max) t)
-    (let* ((start (match-beginning 0))
-	   (end (match-end 0))
-	   (wrote (count-lines (point-min) end))
-	   (prefix (gnus-cite-find-prefix wrote))
-	   ;; Check previous line for an attribution leader.
-	   (tag (progn
-		  (beginning-of-line 1)
-		  (and (looking-at gnus-supercite-secondary-regexp)
-		       (buffer-substring (match-beginning 1)
-					 (match-end 1)))))
-	   (in (progn
-		 (goto-char start)
-		 (and (re-search-backward gnus-cite-attribution-prefix
-					  (save-excursion
-					    (beginning-of-line 0)
-					    (point))
-					  t)
-		      (not (re-search-forward gnus-cite-attribution-suffix
-					      start t))
-		      (count-lines (point-min) (1+ (point)))))))
-      (if (eq wrote in)
-	  (setq in nil))
-      (goto-char end)
-      (setq gnus-cite-loose-attribution-alist
-	    (cons (list wrote in prefix tag)
-		  gnus-cite-loose-attribution-alist))))
   ;; Find exact supercite citations.
   (gnus-cite-match-attributions 'small nil
 				(lambda (prefix tag)
-				  (if tag
-				      (concat "\\`" 
-					      (regexp-quote prefix) "[ \t]*" 
-					      (regexp-quote tag) ">"))))
+				  (when tag
+				    (concat "\\`" 
+					    (regexp-quote prefix) "[ \t]*" 
+					    (regexp-quote tag) ">"))))
   ;; Find loose supercite citations after attributions.
   (gnus-cite-match-attributions 'small t
 				(lambda (prefix tag)
-				  (if tag (concat "\\<"
-						  (regexp-quote tag)
-						  "\\>"))))
+				  (when tag
+				    (concat "\\<"
+					    (regexp-quote tag)
+					    "\\>"))))
   ;; Find loose supercite citations anywhere.
   (gnus-cite-match-attributions 'small nil
 				(lambda (prefix tag)
-				  (if tag (concat "\\<"
-						  (regexp-quote tag)
-						  "\\>"))))
+				  (when tag
+				    (concat "\\<"
+					    (regexp-quote tag)
+					    "\\>"))))
   ;; Find nested citations after attributions.
   (gnus-cite-match-attributions 'small-if-unique t
 				(lambda (prefix tag)
@@ -571,11 +751,11 @@
     (while alist
       (setq entry (car alist)
 	    alist (cdr alist))
-      (if (< (length (cdr entry)) gnus-cite-minimum-match-count)
-	  (setq gnus-cite-prefix-alist
-		(delq entry gnus-cite-prefix-alist)
-		gnus-cite-loose-prefix-alist
-		(delq entry gnus-cite-loose-prefix-alist)))))
+      (when (< (length (cdr entry)) gnus-cite-minimum-match-count)
+	(setq gnus-cite-prefix-alist
+	      (delq entry gnus-cite-prefix-alist)
+	      gnus-cite-loose-prefix-alist
+	      (delq entry gnus-cite-loose-prefix-alist)))))
   ;; Find flat attributions.
   (gnus-cite-match-attributions 'first t nil)
   ;; Find any attributions (are we getting desperate yet?).
@@ -637,27 +817,25 @@
 	  ()
 	(setq gnus-cite-loose-attribution-alist
 	      (delq att gnus-cite-loose-attribution-alist))
-	(setq gnus-cite-attribution-alist 
-	      (cons (cons wrote (car best)) gnus-cite-attribution-alist))
-	(if in
-	    (setq gnus-cite-attribution-alist 
-		  (cons (cons in (car best)) gnus-cite-attribution-alist)))
-	(if (memq best gnus-cite-loose-prefix-alist)
-	    (let ((loop gnus-cite-prefix-alist)
-		  (numbers (cdr best))
-		  current)
-	      (setq gnus-cite-loose-prefix-alist
-		    (delq best gnus-cite-loose-prefix-alist))
-	      (while loop
-		(setq current (car loop)
-		      loop (cdr loop))
-		(if (eq current best)
-		    ()
-		  (setcdr current (gnus-set-difference (cdr current) numbers))
-		  (if (null (cdr current))
-		      (setq gnus-cite-loose-prefix-alist
-			    (delq current gnus-cite-loose-prefix-alist)
-			    atts (delq current atts)))))))))))
+	(push (cons wrote (car best)) gnus-cite-attribution-alist)
+	(when in
+	  (push (cons in (car best)) gnus-cite-attribution-alist))
+	(when (memq best gnus-cite-loose-prefix-alist)
+	  (let ((loop gnus-cite-prefix-alist)
+		(numbers (cdr best))
+		current)
+	    (setq gnus-cite-loose-prefix-alist
+		  (delq best gnus-cite-loose-prefix-alist))
+	    (while loop
+	      (setq current (car loop)
+		    loop (cdr loop))
+	      (if (eq current best)
+		  ()
+		(setcdr current (gnus-set-difference (cdr current) numbers))
+		(when (null (cdr current))
+		  (setq gnus-cite-loose-prefix-alist
+			(delq current gnus-cite-loose-prefix-alist)
+			atts (delq current atts)))))))))))
 
 (defun gnus-cite-find-loose (prefix)
   ;; Return a list of loose attribution lines prefixed by PREFIX.
@@ -667,8 +845,8 @@
       (setq att (car atts)
 	    line (car att)
 	    atts (cdr atts))
-      (if (string-equal (gnus-cite-find-prefix line) prefix)
-	  (setq lines (cons line lines))))
+      (when (string-equal (gnus-cite-find-prefix line) prefix)
+	(push line lines)))
     lines))
 
 (defun gnus-cite-add-face (number prefix face)
@@ -677,7 +855,7 @@
     (let ((inhibit-point-motion-hooks t)
 	  from to)
       (goto-line number)
-      (unless (eobp) ;; Sometimes things become confused.
+      (unless (eobp);; Sometimes things become confused.
 	(forward-char (length prefix))
 	(skip-chars-forward " \t")
 	(setq from (point))
@@ -705,8 +883,8 @@
 	      (t
 	       (gnus-add-text-properties 
 		(point) (progn (forward-line 1) (point))
-		 (nconc (list 'gnus-type 'cite)
-			gnus-hidden-properties))))))))
+		(nconc (list 'article-type 'cite)
+		       gnus-hidden-properties))))))))
 
 (defun gnus-cite-find-prefix (line)
   ;; Return citation prefix for LINE.
@@ -716,8 +894,8 @@
     (while alist
       (setq entry (car alist)
 	    alist (cdr alist))
-      (if (memq line (cdr entry))
-	  (setq prefix (car entry))))
+      (when (memq line (cdr entry))
+	(setq prefix (car entry))))
     prefix))
 
 (gnus-add-shutdown 'gnus-cache-close 'gnus)