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 daa6862..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
@@ -139,7 +140,8 @@ the envelope From line."
 
 (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.
@@ -156,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))
@@ -166,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))
@@ -176,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))
@@ -186,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))
@@ -196,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))
@@ -206,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))
@@ -216,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))
@@ -226,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))
@@ -236,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))
@@ -246,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))
@@ -256,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
@@ -1004,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)