Synch to Gnus 200310242210.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 31a005e..f0abd9d 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-24  Steve Youngs  <sryoungs@bigpond.net.au>
+
+       * nnir.el: Autoload `read-kbd-macro' at compile time.
+
 2003-09-30  Kai Grossjohann  <kai.grossjohann@gmx.net>
        From Torsten Hilbrich <torsten.hilbrich@gmx.net>.
 

diff --git a/contrib/nnir.el b/contrib/nnir.el
index d6209d6..fe297b5 100644 (file)
--- a/contrib/nnir.el
+++ b/contrib/nnir.el
@@ -298,7 +298,7 @@
 
 ;;; Setup Code:
 
-(defconst nnir-version "$Id: nnir.el,v 1.1.2.1 2003-09-30 22:48:21 yamaoka Exp $"
+(defconst nnir-version "$Id: nnir.el,v 1.1.2.2 2003-10-25 04:35:24 yamaoka Exp $"
   "Version of NNIR.")
 
 (require 'cl)
@@ -308,7 +308,8 @@
 (eval-and-compile
   (require 'gnus-util))
 (eval-when-compile
-  (require 'nnimap))
+  (require 'nnimap)
+  (autoload 'read-kbd-macro "edmacro" nil t))
 
 (nnoo-declare nnir)
 (nnoo-define-basics nnir)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce0e547..ba51440 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,20 @@
+2003-10-25  Steve Youngs  <sryoungs@bigpond.net.au>
+
+       * Makefile.in (clean-some): Remove auto-autoloads.* and
+       custom-load.* as well.
+       (distclean): Ditto.
+
+       * dgnushack.el (dgnushack-make-load): Add a local vars section to
+       the dummy gnus-load.el.
+
 2003-10-24  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el (spam-ham-copy-or-move-routine): do not delete if copy
        is t, also don't intepret the list of groups as a list of lists
+       (spam-mark-spam-as-expired-and-move-routine)
+       (spam-ham-copy-or-move-routine): delete articles only if 1 or
+       more groups were specified (and "copy" was not specified for
+       spam-ham-copy-or-move-routine) (fixed twice)
 
 2003-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 87169f0..cd5408e 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -26,7 +26,7 @@ all total: clean-some gnus-load.el
        $(EMACS_COMP) -f dgnushack-compile
 
 clean-some:
-       rm -f *.elc gnus-load.el
+       rm -f *.elc gnus-load.el auto-autoloads.* custom-load.*
 
 warn: clean-some gnus-load.el
        $(EMACS_COMP) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index f8f6afc..92b9b69 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -803,7 +803,14 @@ Modify to suit your needs."))
     (with-temp-file (expand-file-name "gnus-load.el")
       (insert "\
 
-\(provide 'gnus-load)"))))
+\(provide 'gnus-load)
+
+;;; Local Variables:
+;;; version-control: never
+;;; no-byte-compile: t
+;;; no-update-autoloads: t
+;;; End:
+;;; gnus-load.el ends here"))))
 
 \f
 (defconst dgnushack-info-file-regexp-en

diff --git a/lisp/spam.el b/lisp/spam.el
index f24b1c3..6a0b403 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -548,12 +548,12 @@ spamoracle database."
 (defun spam-mark-spam-as-expired-and-move-routine (&rest groups)
   (gnus-summary-kill-process-mark)
   (let ((articles gnus-newsgroup-articles)
-       article tomove)
+       article tomove todelete)
     (dolist (article articles)
       (when (eq (gnus-summary-article-mark article) gnus-spam-mark)
        (gnus-summary-mark-article article gnus-expirable-mark)
        (push article tomove)))
-
+    
     ;; now do the actual copies
     (dolist (group groups)
       (when (and tomove
@@ -561,20 +561,22 @@ spamoracle database."
        (dolist (article tomove)
          (gnus-summary-set-process-mark article))
        (when tomove
-         (gnus-summary-copy-article nil group))))
-
-    ;; now delete the articles
-    (dolist (article tomove)
-      (gnus-summary-set-process-mark article))
-    (when tomove
-      (gnus-summary-delete-article nil)))
-
-  (gnus-summary-yank-process-mark))
+         (gnus-summary-copy-article nil group)
+         (setq todelete t))))
+    
+    ;; now delete the articles, if there was a copy done
+    (when todelete
+      (dolist (article tomove)
+       (gnus-summary-set-process-mark article))
+      (when tomove
+       (gnus-summary-delete-article nil)))
+    
+    (gnus-summary-yank-process-mark)))
  
 (defun spam-ham-copy-or-move-routine (copy groups)
   (gnus-summary-kill-process-mark)
   (let ((articles gnus-newsgroup-articles)
-       article mark todo)
+       article mark todo todelete)
     (dolist (article articles)
       (when (spam-group-ham-mark-p gnus-newsgroup-name
                                   (gnus-summary-article-mark article))
@@ -582,19 +584,21 @@ spamoracle database."
 
     ;; now do the actual move
     (dolist (group groups)
-      (when todo
+      (when (and todo (stringp group))
        (dolist (article todo)
          (when spam-mark-ham-unread-before-move-from-spam-group
            (gnus-summary-mark-article article gnus-unread-mark))
          (gnus-summary-set-process-mark article))
-       (gnus-summary-copy-article nil group)))
+       (gnus-summary-copy-article nil group)
+       (setq todelete t)))
   
-    ;; now delete the articles, unless copy is t
+    ;; now delete the articles, unless copy is t, and when there was a copy done
     (unless copy
-      (dolist (article todo)
-       (gnus-summary-set-process-mark article))
-      (when todo
-       (gnus-summary-delete-article nil))))
+      (when todelete
+       (dolist (article todo)
+         (gnus-summary-set-process-mark article))
+       (when todo
+         (gnus-summary-delete-article nil)))))
   
   (gnus-summary-yank-process-mark))