Synch to No Gnus 200603212039.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23c8b64..aae486b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2006-03-21  Simon Josefsson  <jas@extundo.com>
+
+       * pgg-gpg.el: Ideas below based on patch from Sascha Wilde
+       <wilde@sha-bang.de>.
+       (pgg-gpg-use-agent): New variable.
+       (pgg-gpg-process-region): Use it.
+       (pgg-gpg-encrypt-region): Likewise.
+       (pgg-gpg-encrypt-symmetric-region): Likewise.
+       (pgg-gpg-decrypt-region): Likewise.
+       (pgg-gpg-sign-region): Likewise.
+       (pgg-gpg-possibly-cache-passphrase): Don't cache a nil password.
+
+2006-03-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-agent.el (gnus-agent-queue-mail): Fix custom tag for `t'.
+
+       * spam.el (spam-mark-new-messages-in-spam-group-as-spam): Add
+       comment on version.
+
+2006-03-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * smiley.el: Add missing test smiley.
+
 2006-03-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-decode.el (mm-with-part): New macro.
@@ -145,6 +168,7 @@
 2006-03-03  Daniel Pittman <daniel@rimspace.net>
 
        * nnimap.el (nnimap-request-update-info-internal): Optimize.
+       Don't `gnus-uncompress-range' to avoid excessive memory usage.
 
 2006-03-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -5630,14 +5654,16 @@
        * spam.el (spam-group-spam-contents-p): handle empty groupname
        strings
        (spam-report-articles-resend)
-       (spam-report-resend-register-routine): allow spam-report-resend-to
-       to be a group parameter or a global value
-       (tiny change).  From Daniel Pittman <daniel@rimspace.net>.
        (spam-register-routine): do registration iff any articles warrant
        it.
        (spam-summary-prepare-exit): changed log message for nil group
        destinations
 
+2004-05-27  Daniel Pittman  <daniel@rimspace.net>
+
+       * spam.el (spam-report-resend-register-routine): allow
+       spam-report-resend-to to be a group parameter or a global value
+
 2004-05-26  Simon Josefsson  <jas@extundo.com>
 
        * starttls.el: Merge with my GNUTLS based starttls.el.
@@ -5663,13 +5689,14 @@
 
 2004-05-26  Teodor Zlatanov  <tzz@lifelogs.com>
 
-       * spam.el (spam-mark-junk-as-spam-routine)
-       (spam-mark-new-messages-in-spam-group-as-spam): allow user to
-       disable assigning the spam-mark to new messages
+       * spam.el (spam-mark-new-messages-in-spam-group-as-spam): New
+       variable.
+       (spam-mark-junk-as-spam-routine): Use it.  Allow to disable
+       assigning the spam-mark to new messages.
 
 2004-05-26  Adam Sj\e,Ax\e(Bgren  <asjo@koldfront.dk>  (tiny change)
 
-       (spam-ham-copy-or-move-routine): todo decleared twice
+       (spam-ham-copy-or-move-routine): Don't declare `todo' twice.
 
 2004-05-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 5cd6935..d3408aa 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -215,7 +215,7 @@ queue.  Otherwise, queue if and only if unplugged."
   :group 'gnus-agent
   :type '(radio (const :format "Always" always)
                (const :format "Never" nil)
-               (const :format "When plugged" t)))
+               (const :format "When unplugged" t)))
 
 (defcustom gnus-agent-prompt-send-queue nil
   "If non-nil, `gnus-group-send-queue' will prompt if called when

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 841d52c..35225fb 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1183,11 +1183,11 @@ function is generally only called when Gnus is shutting down."
          (let (seen unseen)
            ;; read info could contain articles marked unread by other
            ;; imap clients!  we correct this
-           (setq unseen (gnus-compress-sequence 
+           (setq unseen (gnus-compress-sequence
                          (imap-search "UNSEEN UNDELETED"))
                  seen (gnus-range-difference (gnus-info-read info) unseen)
-                 seen (gnus-range-add seen 
-                                      (gnus-compress-sequence 
+                 seen (gnus-range-add seen
+                                      (gnus-compress-sequence
                                        (imap-search "SEEN")))
                  seen (if (and (integerp (car seen))
                                (null (cdr seen)))
@@ -1525,7 +1525,7 @@ function is generally only called when Gnus is shutting down."
   ;; return articles not deleted
   articles)
 
-(deffoo nnimap-request-move-article (article group server accept-form 
+(deffoo nnimap-request-move-article (article group server accept-form
                                             &optional last move-is-internal)
   (when (nnimap-possibly-change-server server)
     (save-excursion

diff --git a/lisp/smiley.el b/lisp/smiley.el
index 4a317a8..fe93aea 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -42,6 +42,7 @@
 ;; indifferent       :-|
 ;; wry               :-/  :-\
 ;; sad               :-(
+;; frown             :-{
 ;; evil              >:-)
 ;; cry               ;-(
 ;; dead              X-)

diff --git a/lisp/spam.el b/lisp/spam.el
index 5c689bf..1c5ac62 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -109,6 +109,7 @@ a group through group/topic parameters overrides this mechanism."
 (defcustom spam-mark-new-messages-in-spam-group-as-spam t
   "Whether new messages in a spam group should get the spam-mark."
   :type 'boolean
+  ;; :version "22.1" ;; Gnus 5.10.8 / No Gnus 0.3
   :group 'spam)
 
 (defcustom spam-log-to-registry nil