Mercurial > emacs
changeset 57265:cee5a9d8ee71
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 29 Sep 2004 06:35:14 +0000 |
| parents | fc40eb786614 |
| children | c670bc6778bf b85b19b8eb65 e23928ac5a97 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-art.el lisp/gnus/gnus-diary.el lisp/gnus/gnus-fun.el lisp/gnus/gnus-picon.el lisp/gnus/gnus.el lisp/gnus/mml-sec.el lisp/gnus/mml-smime.el lisp/gnus/nnfolder.el lisp/gnus/nnml.el lisp/gnus/spam.el |
| diffstat | 11 files changed, 41 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/ChangeLog Wed Sep 29 06:35:14 2004 +0000 @@ -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.
--- a/lisp/gnus/gnus-art.el Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/gnus-art.el Wed Sep 29 06:35:14 2004 +0000 @@ -1464,6 +1464,8 @@ (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)
--- a/lisp/gnus/gnus-diary.el Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/gnus-diary.el Wed Sep 29 06:35:14 2004 +0000 @@ -204,7 +204,7 @@ (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
--- a/lisp/gnus/gnus-fun.el Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/gnus-fun.el Wed Sep 29 06:35:14 2004 +0000 @@ -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."
--- a/lisp/gnus/gnus-picon.el Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/gnus-picon.el Wed Sep 29 06:35:14 2004 +0000 @@ -40,8 +40,9 @@ ;; ;;; Code: +(eval-when-compile (require 'cl)) + (require 'gnus) -(require 'custom) (require 'gnus-art) ;;; User variables:
--- a/lisp/gnus/gnus.el Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/gnus.el Wed Sep 29 06:35:14 2004 +0000 @@ -3308,38 +3308,6 @@ (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.
--- a/lisp/gnus/mml-sec.el Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/mml-sec.el Wed Sep 29 06:35:14 2004 +0000 @@ -113,7 +113,7 @@ (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
--- a/lisp/gnus/mml-smime.el Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/mml-smime.el Wed Sep 29 06:35:14 2004 +0000 @@ -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)
--- a/lisp/gnus/nnfolder.el Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/nnfolder.el Wed Sep 29 06:35:14 2004 +0000 @@ -1174,7 +1174,7 @@ (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
--- a/lisp/gnus/nnml.el Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/nnml.el Wed Sep 29 06:35:14 2004 +0000 @@ -923,7 +923,7 @@ (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
--- a/lisp/gnus/spam.el Wed Sep 29 03:14:30 2004 +0000 +++ b/lisp/gnus/spam.el Wed Sep 29 06:35:14 2004 +0000 @@ -1746,7 +1746,7 @@ (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 @@ `("-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))