* spam.el (spam-check-spamoracle, spam-spamoracle-learn): Fix

format string mismatch.

* sieve.el (sieve-deactivate-all): do.

* nnfolder.el (nnfolder-request-set-mark, nnfolder-save-marks): do.

* nnlistserv.el (nnlistserv-kk-wash-article): do.

* nnml.el (nnml-request-set-mark, nnml-save-marks): do.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dbe2a66..822466b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
 2004-02-03  Jesper Harder  <harder@ifa.au.dk>
 
+       * spam.el (spam-check-spamoracle, spam-spamoracle-learn): Fix
+       format string mismatch.
+
+       * sieve.el (sieve-deactivate-all): do.
+
+       * nnfolder.el (nnfolder-request-set-mark, nnfolder-save-marks): do.
+
+       * nnlistserv.el (nnlistserv-kk-wash-article): do.
+
+       * nnml.el (nnml-request-set-mark, nnml-save-marks): do. 
+
        * mm-bodies.el (mm-7bit-chars): Don't include \r.
 
 2004-02-02  Teodor Zlatanov  <tzz@lifelogs.com>

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 68e4f24..ffb7b73 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -1174,7 +1174,7 @@ This command does not work if you use short group names."
       (let ((range (nth 0 action))
            (what  (nth 1 action))
            (marks (nth 2 action)))
-       (assert (or (eq what 'add) (eq what 'del)) t
+       (assert (or (eq what 'add) (eq what 'del)) nil
                "Unknown request-set-mark action: %s" what)
        (dolist (mark marks)
          (setq nnfolder-marks (gnus-update-alist-soft
@@ -1240,7 +1240,7 @@ This command does not work if you use short group names."
                        nnfolder-marks-modtime))
       (error (or (gnus-yes-or-no-p
                  (format "Could not write to %s (%s).  Continue? " file err))
-                (error "Cannot write to %s (%s)" err))))))
+                (error "Cannot write to %s (%s)" file err))))))
 
 (defun nnfolder-open-marks (group server)
   (let ((file (nnfolder-group-marks-pathname group)))

diff --git a/lisp/nnlistserv.el b/lisp/nnlistserv.el
index 1008141..6391dd4 100644 (file)
--- a/lisp/nnlistserv.el
+++ b/lisp/nnlistserv.el
@@ -122,7 +122,7 @@
     (mm-url-decode-entities)
     (while headers
       (goto-char (point-min))
-      (re-search-forward (format "<!-- %s=\"\\([^\"]+\\)" (car headers) nil t))
+      (re-search-forward (format "<!-- %s=\"\\([^\"]+\\)" (car headers)) nil t)
       (set (pop headers) (match-string 1)))
     (goto-char (point-min))
     (search-forward "<!-- body" nil t)

diff --git a/lisp/nnml.el b/lisp/nnml.el
index 4e8337e..ecbb4fc 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -923,7 +923,7 @@ Use the nov database for the current group if available."
       (let ((range (nth 0 action))
            (what  (nth 1 action))
            (marks (nth 2 action)))
-       (assert (or (eq what 'add) (eq what 'del)) t
+       (assert (or (eq what 'add) (eq what 'del)) nil
                "Unknown request-set-mark action: %s" what)
        (dolist (mark marks)
          (setq nnml-marks (gnus-update-alist-soft
@@ -984,7 +984,7 @@ Use the nov database for the current group if available."
                        nnml-marks-modtime))
       (error (or (gnus-yes-or-no-p
                  (format "Could not write to %s (%s).  Continue? " file err))
-                (error "Cannot write to %s (%s)" err))))))
+                (error "Cannot write to %s (%s)" file err))))))
 
 (defun nnml-open-marks (group server)
   (let ((file (expand-file-name

diff --git a/lisp/sieve.el b/lisp/sieve.el
index 83dd4f3..2b044ad 100644 (file)
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -173,7 +173,7 @@ require \"fileinto\";
     (sieve-refresh-scriptlist)
     (if (sieve-manage-ok-p err)
        (message "Deactivating scripts...done")
-      (message "Deactivating scripts...failed" (nth 2 err)))))
+      (message "Deactivating scripts...failed: %s" (nth 2 err)))))
 
 (defalias 'sieve-deactivate 'sieve-deactivate-all)
 

diff --git a/lisp/spam.el b/lisp/spam.el
index 43b047e..4b6aeb5 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1977,7 +1977,7 @@ REMOVE not nil, remove the ADDRESSES."
                  (goto-char (point-min))
                  (when (re-search-forward "^X-Spam: yes;" nil t)
                    spam-split-group))
-             (error "Error running spamoracle" status))))))))
+             (error "Error running spamoracle: %s" status))))))))
 
 (defun spam-spamoracle-learn (articles article-is-spam-p &optional unregister)
   "Run spamoracle in training mode."
@@ -1999,8 +1999,8 @@ REMOVE not nil, remove the ADDRESSES."
                           `("-f" ,spam-spamoracle-database
                             "add" ,arg)
                         `("add" ,arg)))))
-         (when (not (eq 0 status))
-           (error "Error running spamoracle" status)))))))
+         (unless (eq 0 status)
+           (error "Error running spamoracle: %s" status)))))))
 
 (defun spam-spamoracle-learn-ham (articles &optional unregister)
   (spam-spamoracle-learn articles nil unregister))