Synch to Gnus 200311301730.

diff --git a/contrib/starttls.el b/contrib/starttls.el
index ff5efc4..95db27f 100644 (file)
--- a/contrib/starttls.el
+++ b/contrib/starttls.el
@@ -27,8 +27,9 @@
 ;; This package implements a simple wrapper around the GNU TLS command
 ;; line application "gnutls-cli" to make Emacs support STARTTLS.  It
 ;; is backwards compatible (same API functions) with the "starttls.el"
-;; that is part of Emacs 21 (that version used an external program
-;; "starttls" that isn't widely installed, and was based on OpenSSL).
+;; that is part of Emacs 21 written by Daiki Ueno <ueno@unixuser.org>.
+;; (That version used an external program "starttls" that isn't widely
+;; installed, and was based on OpenSSL.)
 
 ;; This package require GNUTLS 0.9.90 (released 2003-10-08) or later.
 
@@ -81,7 +82,10 @@
 
 ;; Revision history:
 ;;
-;; 2003-11-15: cleanup, and posted to gnu.emacs.sources.
+;; 2003-09-20: Added to Gnus CVS.
+;; 2003-10-02: Minor fixes.
+;; 2003-11-15: Cleanup, and posted to gnu.emacs.sources.
+;; 2003-11-28: Fixes variable name conflicts, various other fixes, posted g.e.s.
 
 ;;; Code:
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9cb78a9..4fa312f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2003-11-30  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-agent.el (gnus-agent-expire-group-1): Bind message-log-max
+       when messaging "X % completed" to inhibit logging them to the
+       message buffer.
+       (gnus-agent-expire-group-1): Mention group name in messages.
+       (gnus-agent-expire-group-1): Only print a message for an article
+       when there actually was something done to it.
+
+       * mm-util.el (mm-enable-multibyte): Call set-buffer-multibyte with
+       'to argument.  Fixes something or other in Emacs 22, and is
+       backwards compatible.  From Kenichi Handa <handa@m17n.org>.
+
+       * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Custom fix.
+
+2003-11-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-agent.el (gnus-agent-covered-methods): Remove nil methods. 
+
 2003-11-29  Kevin Greiner <kgreiner@xpediantsolutions.com>
        * gnus-start.el (gnus-activate-group): The active range of the
        group must include the articles known to the agent.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index f6c4ba3..a8e2f38 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -179,9 +179,12 @@ enable expiration per categories, topics, and groups."
                 (const :format "Disable " DISABLE)))
 
 (defcustom gnus-agent-expire-unagentized-dirs t
-"Have gnus-agent-expire scan the directories under
-\(gnus-agent-directory) for groups that are no longer agentized.  When
-found, offer to remove them.")
+  "*Whether expiration should expire in unagentized directories.
+Have gnus-agent-expire scan the directories under
+\(gnus-agent-directory) for groups that are no longer agentized.
+When found, offer to remove them."
+  :type 'boolean
+  :group 'gnus-agent)
 
 ;;; Internal variables
 
@@ -1227,7 +1230,7 @@ This can be added to `gnus-select-article-hook' or
 
 (defun gnus-agent-covered-methods ()
   "Return the subset of methods that are covered by the agent."
-  (mapcar #'gnus-server-to-method gnus-agent-covered-methods))
+  (delq nil (mapcar #'gnus-server-to-method gnus-agent-covered-methods)))
 
 ;;; History functions
 
@@ -2744,7 +2747,8 @@ line." (point) nov-file)))
           (while dlist
             (let ((new-completed (truncate (* 100.0
                                               (/ (setq cnt (1+ cnt))
-                                                 len)))))
+                                                 len))))
+                 message-log-max)
               (when (> new-completed completed)
                 (setq completed new-completed)
                 (gnus-message 7 "%3d%% completed..."  completed)))
@@ -2758,16 +2762,16 @@ line." (point) nov-file)))
                ;; Kept articles are unread, marked, or special.
                (keep
                 (gnus-agent-message 10
-                                    "gnus-agent-expire: Article %d: Kept %s article%s."
-                                    article-number keep (if fetch-date " and file" ""))
+                                    "gnus-agent-expire: %s:%d: Kept %s article%s."
+                                    group article-number keep (if fetch-date " and file" ""))
                 (when fetch-date
                   (unless (file-exists-p
                            (concat dir (number-to-string
                                         article-number)))
                     (setf (nth 1 entry) nil)
                     (gnus-agent-message 3 "gnus-agent-expire cleared \
-download flag on article %d as the cached article file is missing."
-                                        (caar dlist)))
+download flag on %s:%d as the cached article file is missing."
+                                        group (caar dlist)))
                   (unless marker
                     (gnus-message 1 "gnus-agent-expire detected a \
 missing NOV entry.  Run gnus-agent-regenerate-group to restore it.")))
@@ -2835,13 +2839,14 @@ missing NOV entry.  Run gnus-agent-regenerate-group to restore it.")))
                     (push (format "Removed %s article number from \
 article alist" type) actions))
 
-                  (gnus-agent-message 8 "gnus-agent-expire: Article %d: %s"
-                                      article-number
-                                      (mapconcat 'identity actions ", "))))
+                 (when actions
+                   (gnus-agent-message 8 "gnus-agent-expire: %s:%d: %s"
+                                       group article-number
+                                       (mapconcat 'identity actions ", ")))))
                (t
                 (gnus-agent-message
-                 10 "gnus-agent-expire: Article %d: Article kept as \
-expiration tests failed." article-number)
+                 10 "gnus-agent-expire: %s:%d: Article kept as \
+expiration tests failed." group article-number)
                 (gnus-agent-append-to-list
                  tail-alist (cons article-number fetch-date)))
                )

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 43e1d1f..5c1ea1e 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -416,7 +416,7 @@ used as the line break code type of the coding system."
        "Set the multibyte flag of the current buffer.
 Only do this if the default value of `enable-multibyte-characters' is
 non-nil.  This is a no-op in XEmacs."
-       (set-buffer-multibyte t))
+       (set-buffer-multibyte 'to))
     (defalias 'mm-enable-multibyte 'ignore))
 
   (if mm-emacs-mule