*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a651654..7b02069 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-04-21 14:11:39  David S. Goldberg  <dsg@mitre.org>
+
+       * gnus-art.el (gnus-boring-article-headers): Work on long CCs as
+       well. 
+
+2000-04-21 14:06:43  Rui Zhu  <sprache@iname.com>
+
+       * gnus-art.el (gnus-article-mode): Fix variable name.
+
 2000-04-21 13:54:51  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * mm-view.el: Fix autoload.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index e7547f6..53d9f1f 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -169,8 +169,8 @@ Possible values in this list are `empty', `newsgroups', `followup-to',
              (const :tag "Followup-to identical to newsgroups." followup-to)
              (const :tag "Reply-to identical to from." reply-to)
              (const :tag "Date less than four days old." date)
-             (const :tag "Very long To header." long-to)
-             (const :tag "Multiple To headers." many-to))
+             (const :tag "Very long To and/or Cc header." long-to)
+             (const :tag "Multiple To and/or Cc headers." many-to))
   :group 'gnus-article-hiding)
 
 (defcustom gnus-signature-separator '("^-- $" "^-- *$")
@@ -1168,11 +1168,15 @@ always hide."
                              4))
                  (gnus-article-hide-header "date"))))
             ((eq elem 'long-to)
-             (let ((to (message-fetch-field "to")))
+             (let ((to (message-fetch-field "to"))
+                   (cc (message-fetch-field "cc")))
                (when (> (length to) 1024)
-                 (gnus-article-hide-header "to"))))
+                 (gnus-article-hide-header "to"))
+               (when (> (length cc) 1024)
+                 (gnus-article-hide-header "cc"))))
             ((eq elem 'many-to)
-             (let ((to-count 0))
+             (let ((to-count 0)
+                   (cc-count 0))
                (goto-char (point-min))
                (while (re-search-forward "^to:" nil t)
                  (setq to-count (1+ to-count)))
@@ -1184,7 +1188,19 @@ always hide."
                      (forward-line -1)
                      (narrow-to-region (point) (point-max))
                      (gnus-article-hide-header "to"))
-                   (setq to-count (1- to-count)))))))))))))
+                   (setq to-count (1- to-count))))
+               (goto-char (point-min))
+               (while (re-search-forward "^cc:" nil t)
+                 (setq cc-count (1+ cc-count)))
+               (when (> cc-count 1)
+                 (while (> cc-count 0)
+                   (goto-char (point-min))
+                   (save-restriction
+                     (re-search-forward "^cc:" nil nil cc-count)
+                     (forward-line -1)
+                     (narrow-to-region (point) (point-max))
+                     (gnus-article-hide-header "cc"))
+                   (setq cc-count (1- cc-count)))))))))))))
 
 (defun gnus-article-hide-header (header)
   (save-excursion
@@ -2550,7 +2566,7 @@ commands:
   (make-local-variable 'gnus-article-mime-handles)
   (make-local-variable 'gnus-article-decoded-p)
   (make-local-variable 'gnus-article-mime-handle-alist)
-  (make-local-variable 'gnus-article-washed-types)
+  (make-local-variable 'gnus-article-wash-types)
   (gnus-set-default-directory)
   (buffer-disable-undo)
   (setq buffer-read-only t)

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 7302cda..1f89b48 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -42,7 +42,8 @@
                     rmail-update-summary url-retrieve
                     temp-directory babel-fetch babel-wash
                     find-coding-systems-for-charsets sc-cite-regexp
-                    vcard-pretty-print))
+                    vcard-pretty-print image-type-available-p
+                    make-overlay overlay-put))
       (maybe-bind '(global-face-data
                    mark-active transient-mark-mode mouse-selection-click-count
                    mouse-selection-click-count-buffer buffer-display-table
@@ -94,7 +95,7 @@
                 rmail-summary-exists rmail-select-summary rmail-update-summary
                 url-generic-parse-url valid-image-instantiator-format-p
                 babel-fetch babel-wash babel-as-string sc-cite-regexp
-                vcard-pretty-print)))
+                vcard-pretty-print image-type-available-p)))
 
 (setq load-path (cons "." load-path))
 (require 'custom)