From 5ed79118a0312f8ab9d001ae0e84281ab46aeb8f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 5 Feb 2004 03:21:20 +0000 Subject: [PATCH] Synch to No Gnus 200402050242. --- lisp/ChangeLog | 19 ++++++++++++++++ lisp/gnus-art.el | 3 ++- lisp/gnus-diary.el | 2 +- lisp/gnus-fun.el | 3 +++ lisp/gnus-picon.el | 1 - lisp/gnus.el | 64 ++++++++++++++++++++++++++-------------------------- lisp/mml-sec.el | 2 +- lisp/mml-smime.el | 3 +++ lisp/pop3.el | 1 + 9 files changed, 62 insertions(+), 36 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 532f427..55a8eb4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,22 @@ +2004-02-05 Jesper Harder + + * pop3.el: Require nnheader. + + * mml-smime.el: Require cl. Autoload message-fetch-field. + + * mml-sec.el (mml-signencrypt-style): Don't depend on Gnus. + + * gnus-picon.el: Require cl. + + * gnus-fun.el: Require gnus-ems and gnus-util. + + * gnus.el (gnus-method-to-server): Move defsubst before first use. + + * gnus-diary.el (gnus-diary-header-schedule): caddr -> car (cddr + + * gnus-art.el (gnus-article-edit-mode): Define before first + reference. + 2004-02-04 Jesper Harder * gnus-uu.el (gnus-uu-check-correct-stripped-uucode): Simplify. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 57f481f..0e429eb 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1576,6 +1576,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) @@ -5870,7 +5872,6 @@ If given a prefix, show the hidden text instead." (defvar gnus-article-edit-done-function nil) (defvar gnus-article-edit-mode-map nil) -(defvar gnus-article-edit-mode nil) ;; Should we be using derived.el for this? (unless gnus-article-edit-mode-map diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el index b7c3148..620f7ca 100644 --- a/lisp/gnus-diary.el +++ b/lisp/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-fun.el b/lisp/gnus-fun.el index b293d4e..67acf02 100644 --- a/lisp/gnus-fun.el +++ b/lisp/gnus-fun.el @@ -29,6 +29,9 @@ (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." :group 'gnus-fun diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index 7c6c5e1..ebd226d 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -43,7 +43,6 @@ (eval-when-compile (require 'cl)) (require 'gnus) -(require 'custom) (require 'gnus-art) ;;; User variables: diff --git a/lisp/gnus.el b/lisp/gnus.el index 63823ce..6dce09b 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -3335,6 +3335,38 @@ that that variable is buffer-local to the summary buffers." (nth 1 method)))) method))) +(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-to-method (server) "Map virtual server names to select methods." (or (and server (listp server) server) @@ -3382,38 +3414,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/mml-sec.el b/lisp/mml-sec.el index c1a494b..be4665b 100644 --- a/lisp/mml-sec.el +++ b/lisp/mml-sec.el @@ -112,7 +112,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/mml-smime.el b/lisp/mml-smime.el index 45e06d7..dbcd1c1 100644 --- a/lisp/mml-smime.el +++ b/lisp/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/pop3.el b/lisp/pop3.el index 7d120e0..59afc3f 100644 --- a/lisp/pop3.el +++ b/lisp/pop3.el @@ -56,6 +56,7 @@ (require 'path-util) (require 'mail-utils) +(require 'nnheader) (defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER") nil) "*POP3 maildrop.") -- 1.7.10.4