Synch to No Gnus 200506091113.

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

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index a8c13e3..3ab4ad5 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -1,6 +1,7 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
@@ -125,6 +126,7 @@ The text matching the first grouping will be used as a button."
 (defcustom gnus-cite-unsightly-citation-regexp
   "^-----Original Message-----\nFrom: \\(.+\n\\)+\n"
   "Regexp matching Microsoft-type rest-of-message citations."
+  :version "22.1"
   :group 'gnus-cite
   :type 'regexp)
 
@@ -132,16 +134,19 @@ The text matching the first grouping will be used as a button."
   "Non-nil means don't regard lines beginning with \">From \" as cited text.
 Those lines may have been quoted by MTAs in order not to mix up with
 the envelope From line."
+  :version "22.1"
   :group 'gnus-cite
   :type 'boolean)
 
 (defface gnus-cite-attribution-face '((t
                                       (:italic t)))
-  "Face used for attribution lines.")
+  "Face used for attribution lines."
+  :group 'gnus-cite)
 
 (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."
+  :version "22.1"
   :group 'gnus-cite
   :type 'face)
 
@@ -153,7 +158,8 @@ It is merged with the face for the cited text belonging to the attribution."
                             (:foreground "MidnightBlue"))
                            (t
                             (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defface gnus-cite-face-2 '((((class color)
                              (background dark))
@@ -163,7 +169,8 @@ It is merged with the face for the cited text belonging to the attribution."
                             (:foreground "firebrick"))
                            (t
                             (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defface gnus-cite-face-3 '((((class color)
                              (background dark))
@@ -173,7 +180,8 @@ It is merged with the face for the cited text belonging to the attribution."
                             (:foreground "dark green"))
                            (t
                             (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defface gnus-cite-face-4 '((((class color)
                              (background dark))
@@ -183,7 +191,8 @@ It is merged with the face for the cited text belonging to the attribution."
                             (:foreground "OrangeRed"))
                            (t
                             (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defface gnus-cite-face-5 '((((class color)
                              (background dark))
@@ -193,7 +202,8 @@ It is merged with the face for the cited text belonging to the attribution."
                             (:foreground "dark khaki"))
                            (t
                             (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defface gnus-cite-face-6 '((((class color)
                              (background dark))
@@ -203,7 +213,8 @@ It is merged with the face for the cited text belonging to the attribution."
                             (:foreground "dark violet"))
                            (t
                             (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defface gnus-cite-face-7 '((((class color)
                              (background dark))
@@ -213,7 +224,8 @@ It is merged with the face for the cited text belonging to the attribution."
                             (:foreground "SteelBlue4"))
                            (t
                             (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defface gnus-cite-face-8 '((((class color)
                              (background dark))
@@ -223,7 +235,8 @@ It is merged with the face for the cited text belonging to the attribution."
                             (:foreground "magenta"))
                            (t
                             (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defface gnus-cite-face-9 '((((class color)
                              (background dark))
@@ -233,7 +246,8 @@ It is merged with the face for the cited text belonging to the attribution."
                             (:foreground "violet"))
                            (t
                             (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defface gnus-cite-face-10 '((((class color)
                               (background dark))
@@ -243,7 +257,8 @@ It is merged with the face for the cited text belonging to the attribution."
                              (:foreground "medium purple"))
                             (t
                              (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defface gnus-cite-face-11 '((((class color)
                               (background dark))
@@ -253,7 +268,8 @@ It is merged with the face for the cited text belonging to the attribution."
                              (:foreground "turquoise"))
                             (t
                              (:italic t)))
-  "Citation face.")
+  "Citation face."
+  :group 'gnus-cite)
 
 (defcustom gnus-cite-face-list
   '(gnus-cite-face-1 gnus-cite-face-2 gnus-cite-face-3 gnus-cite-face-4
@@ -279,7 +295,6 @@ This should make it easier to see who wrote what."
 
 (defcustom gnus-cite-blank-line-after-header t
   "If non-nil, put a blank line between the citation header and the button."
-  :version "21.4"
   :group 'gnus-cite
   :type 'boolean)
 
@@ -291,7 +306,6 @@ This should make it easier to see who wrote what."
 If an article has more pages below the one you are looking at, but
 nothing on those pages is a word of at least three letters that is not
 in a boring face, then the pages will be skipped."
-  :version "21.4"
   :type '(repeat face)
   :group 'gnus-article-hiding)
 
@@ -1003,6 +1017,7 @@ See also the documentation for `gnus-article-highlight-citation'."
        (when (< from to)
          (push (setq overlay (gnus-make-overlay from to))
                gnus-cite-overlay-list)
+         (gnus-overlay-put overlay 'evaporate t)
          (gnus-overlay-put overlay 'face face))))))
 
 (defun gnus-cite-toggle (prefix)