2001-10-12 Simon Josefsson <jas@extundo.com>

	Suggested by david.goldberg6@verizon.net (David S. Goldberg)

	* gnus-cite.el (gnus-article-hide-citation): Add `c' mode line
	character.
	(gnus-article-toggle-cited-text): Toggle `c' mode line character.

	* gnus-art.el (gnus-treat-hide-citation-maybe): Remove duplicate
	definition.
	(gnus-signature-toggle): Toggle `s' mode line character.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 798b14f..d65dbd2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,19 @@
 2001-10-12  Simon Josefsson  <jas@extundo.com>
+       Suggested by david.goldberg6@verizon.net (David S. Goldberg)
+
+       * gnus-cite.el (gnus-article-hide-citation): Add `c' mode line
+       character.
+       (gnus-article-toggle-cited-text): Toggle `c' mode line character.
+
+       * gnus-art.el (gnus-treat-hide-citation-maybe): Remove duplicate
+       definition.
+       (gnus-signature-toggle): Toggle `s' mode line character.
 
        * gnus-art.el (article-emphasize): Set `g-a-wash-types' after
        doing stuff that clears it.
 
+2001-10-12  Simon Josefsson  <jas@extundo.com>
+
        * gnus-cache.el (gnus-summary-limit-include-cached): Rewrite.
        From Eric Marsden <emarsden@laas.fr>.
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 0908c13..160a553 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -883,13 +883,6 @@ See the manual for details."
   :group 'gnus-article-treat
   :type gnus-article-treat-custom)
 
-(defcustom gnus-treat-hide-citation-maybe nil
-  "Hide cited text.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-See the manual for details."
-  :group 'gnus-article-treat
-  :type gnus-article-treat-custom)
-
 (defcustom gnus-treat-strip-list-identifiers 'head
   "Strip list identifiers from `gnus-list-identifiers`.
 Valid values are nil, t, `head', `last', an integer or a predicate.
@@ -5058,14 +5051,21 @@ specified by `gnus-button-alist'."
     (let ((buffer-read-only nil)
          (inhibit-point-motion-hooks t))
       (if (text-property-any end (point-max) 'article-type 'signature)
-         (gnus-remove-text-properties-when
-          'article-type 'signature end (point-max)
-          (cons 'article-type (cons 'signature
-                                    gnus-hidden-properties)))
+         (progn
+           (setq gnus-article-wash-types
+                 (delq 'signature gnus-article-wash-types))
+           (gnus-remove-text-properties-when
+            'article-type 'signature end (point-max)
+            (cons 'article-type (cons 'signature
+                                      gnus-hidden-properties))))
+       (or (memq 'signature gnus-article-wash-types)
+           (push 'signature gnus-article-wash-types))
        (gnus-add-text-properties-when
         'article-type nil end (point-max)
         (cons 'article-type (cons 'signature
-                                  gnus-hidden-properties)))))))
+                                  gnus-hidden-properties)))))
+    (let ((gnus-article-mime-handle-alist-1 gnus-article-mime-handle-alist))
+      (gnus-set-mode-line 'article))))
 
 (defun gnus-button-entry ()
   ;; Return the first entry in `gnus-button-alist' matching this place.

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index f752099..5fe38f2 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -510,6 +510,7 @@ always hide."
                      (setq beg nil)
                  (setq end (point-marker))))))
            (when (and beg end)
+             (push 'cite gnus-article-wash-types)
              ;; We use markers for the end-points to facilitate later
              ;; wrapping and mangling of text.
              (setq beg (set-marker (make-marker) beg)
@@ -548,14 +549,21 @@ means show, nil means toggle."
              (and (> arg 0) (not hidden))
              (and (< arg 0) hidden))
       (if hidden
-         (gnus-remove-text-properties-when
-          'article-type 'cite beg end
-          (cons 'article-type (cons 'cite
-                                    gnus-hidden-properties)))
+         (progn
+           (setq gnus-article-wash-types
+                 (delq 'cite gnus-article-wash-types))
+           (gnus-remove-text-properties-when
+            '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-text-properties-when
         'article-type nil beg end
         (cons 'article-type (cons 'cite
                                   gnus-hidden-properties))))
+      (let ((gnus-article-mime-handle-alist-1 gnus-article-mime-handle-alist))
+       (gnus-set-mode-line 'article))
       (save-excursion
        (goto-char start)
        (gnus-delete-line)