Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-580

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-37
   Update from CVS

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d0023ce9aa578abb8f208cf9a479f60badfa99f7..3cdda661e86a3567ebde84e5dd4770dd3cf1d630 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,25 @@
+2004-09-28  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-picon.el: Require cl.
+
+       * mml-sec.el (mml-signencrypt-style): Don't depend on Gnus.
+
+       * mml-smime.el: Require cl.  Autoload message-fetch-field.
+
+       * gnus-fun.el: Require gnus-ems and gnus-util.
+
+       * gnus-diary.el (gnus-diary-header-schedule): caddr -> car (cddr
+
+       * gnus-art.el (gnus-article-edit-mode): Define before first
+       reference.
+
+       * gnus.el (gnus-method-to-server): Move defsubst before first use.
+
+       * spam.el (spam-check-spamoracle, spam-spamoracle-learn): Fix
+       format string mismatch.
+       * nnml.el (nnml-request-set-mark, nnml-save-marks): do. 
+       * nnfolder.el (nnfolder-request-set-mark, nnfolder-save-marks): do.
+
 2004-09-27  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus.el (gnus-version-number): Set to 5.11.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5544c28f96754bbb3bdfb16f408706a5d76885e6..d4dbe1319e04a0aed306f88c4c5969d6eea45510 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1464,6 +1464,8 @@ Initialized from `text-mode-syntax-table.")
 
 (defvar gnus-inhibit-hiding nil)
 
+(defvar gnus-article-edit-mode nil)
+
 ;;; Macros for dealing with the article buffer.
 
 (defmacro gnus-with-article-headers (&rest forms)

diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 120b812c209f80ccf046c4fb980ac2e11c76350c..e82d77fa58be8e125c7896edd6f50a590df62264 100644 (file)
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -204,7 +204,7 @@ There are currently two built-in format functions:
      (let ((head (cdr (assoc (intern (format "X-Diary-%s" (car elt)))
                             headers))))
        (when head
-        (nndiary-parse-schedule-value head (cadr elt) (caddr elt)))))
+        (nndiary-parse-schedule-value head (cadr elt) (car (cddr elt))))))
    nndiary-headers))
 
 ;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any

diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 087c30da5df045782d1fd2be1fe94ac20cd8cef6..82282e084f7b18cbd8648796c22e9eb30b7d35cf 100644 (file)
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -26,8 +26,11 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)
-  (require 'mm-util))
+  (require 'cl))
+
+(require 'mm-util)
+(require 'gnus-ems)
+(require 'gnus-util)
 
 (defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory)
   "*Directory where X-Face PBM files are stored."

diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index dbb96333d75346f03cf245c00b31e33efc2414b3..817696ed974da554034066abda86afefbc9c27e4 100644 (file)
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -40,8 +40,9 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
-(require 'custom)
 (require 'gnus-art)
 
 ;;; User variables:

diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 87c7702193b580efd9591882cf7de9e2ce28cd96..28ef2c22a15c9f9fdfac7f6d1151386d9e4de066 100644 (file)
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3308,38 +3308,6 @@ that that variable is buffer-local to the summary buffers."
           (push (cons server result) gnus-server-method-cache))
        result)))
 
-(defsubst gnus-method-to-server (method)
-  (catch 'server-name
-    (setq method (or method gnus-select-method))
-
-    ;; Perhaps it is already in the cache.
-    (mapc (lambda (name-method)
-            (if (equal (cdr name-method) method)
-                (throw 'server-name (car name-method))))
-          gnus-server-method-cache)
-
-    (mapc
-     (lambda (server-alist)
-       (mapc (lambda (name-method)
-               (when (gnus-methods-equal-p (cdr name-method) method)
-                 (unless (member name-method gnus-server-method-cache)
-                   (push name-method gnus-server-method-cache))
-                 (throw 'server-name (car name-method))))
-             server-alist))
-     (let ((alists (list gnus-server-alist
-                         gnus-predefined-server-alist)))
-       (if gnus-select-method
-           (push (list (cons "native" gnus-select-method)) alists))
-       alists))
-
-    (let* ((name (if (member (cadr method) '(nil ""))
-                     (format "%s" (car method))
-                   (format "%s:%s" (car method) (cadr method))))
-           (name-method (cons name method)))
-      (unless (member name-method gnus-server-method-cache)
-        (push name-method gnus-server-method-cache))
-      name)))
-
 (defsubst gnus-server-get-method (group method)
   ;; Input either a server name, and extended server name, or a
   ;; select method, and return a select method.

diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index c9f5cb80190a0f35c17e4430ae190cf45c9365f2..b8107364411e44273f7c54c95d91f7b26ef0416f 100644 (file)
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -113,7 +113,7 @@ You can also customize or set `mml-signencrypt-style-alist' instead."
            (setf (second style-item) style)
          ;; otherwise, just return the current value
          (second style-item))
-      (gnus-message 3 "Warning, attempt to set invalid signencrypt-style"))))
+      (message "Warning, attempt to set invalid signencrypt style"))))
 
 ;;; Security functions
 

diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 596585afc722786901bd3fc189342cc3bda3e0f8..3313d6a4118ba72fc47d1c5b5f2f4fed82c22130 100644 (file)
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -25,9 +25,12 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'smime)
 (require 'mm-decode)
 (autoload 'message-narrow-to-headers "message")
+(autoload 'message-fetch-field "message")
 
 (defun mml-smime-sign (cont)
   (when (null smime-keys)

diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 142202cb4d21ed93cc4347b7cf5e35741bd77f7a..369631ce653db5b28cfbe5de7e0a2b18287d9512 100644 (file)
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/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

diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index cb820b094c171ac91b4613a839548d58523d2200..4a9cfd32943099a5e59f162edc095bd45fb056c3 100644 (file)
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/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

diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 6fb99db157a161642a5f974baadcb595d7dee0da..85534f3828c4d45d80d0f94bb7ccbfc8d793ae6b 100644 (file)
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -1746,7 +1746,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."
@@ -1768,8 +1768,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))