From 33ab18beb9d686f0fdd52363dad6788ae5874a4e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 16 May 2005 04:27:48 +0000 Subject: [PATCH] Synch to No Gnus 200505160427. --- lisp/ChangeLog | 17 +++++++++++++++++ lisp/dgnushack.el | 1 + lisp/gnus-art.el | 3 --- lisp/gnus.el | 3 +-- lisp/hashcash.el | 3 --- lisp/nndb.el | 15 +++++---------- lisp/nntp.el | 13 ++++++++----- 7 files changed, 32 insertions(+), 23 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a36cdca..def398f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2005-05-16 Katsumi Yamaoka + + * dgnushack.el: Autoload mail-extract-address-components for XEmacs. + + * gnus-art.el: Don't autoload mail-extract-address-components. + + * gnus.el: Remove duplicated autoload for message-y-or-n-p; use + eval-and-compile to evaluate it. + + * hashcash.el: Don't autoload executable-find. + + * nndb.el: Don't declare the nndb back end two or more times; don't + autoload news-reply-mode, news-setup, cancel-timer and telnet. + + * nntp.el: Autoload format-spec instead of format; use + eval-and-compile to evaluate autoload forms. + 2005-05-09 Simon Josefsson * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching, diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index e26349f..2bf1051 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -301,6 +301,7 @@ adding the --with-addpath=FLIM_PATH option.\n" (autoload 'executable-find "executable") (autoload 'font-lock-fontify-buffer "font-lock" nil t) (autoload 'info "info" nil t) + (autoload 'mail-extract-address-components "mail-extr") (autoload 'mail-fetch-field "mail-utils") (autoload 'make-annotation "annotations") (autoload 'make-display-table "disp-table") diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index c4fee02..73d40c1 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -517,9 +517,6 @@ be fed to `format-time-string'." :link '(custom-manual "(gnus)Article Date") :group 'gnus-article-washing) -(eval-and-compile - (autoload 'mail-extract-address-components "mail-extr")) - (defcustom gnus-save-all-headers t "*If non-nil, don't remove any headers before saving." :group 'gnus-article-saving diff --git a/lisp/gnus.el b/lisp/gnus.el index d8b38fc..8e59d26 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -37,7 +37,6 @@ (require 'wid-edit) (require 'nnheader) -(autoload 'message-y-or-n-p "message" nil nil 'macro) (require 'gnus-vers) @@ -4080,7 +4079,7 @@ If NEWSGROUP is nil, return the global kill file name instead." (setq valids (cdr valids))) outs)) -(eval-when-compile +(eval-and-compile (autoload 'message-y-or-n-p "message" nil nil 'macro)) (defun gnus-read-group (prompt &optional default) diff --git a/lisp/hashcash.el b/lisp/hashcash.el index 8172590..db190b0 100644 --- a/lisp/hashcash.el +++ b/lisp/hashcash.el @@ -49,9 +49,6 @@ ;;; Code: -(eval-and-compile - (autoload 'executable-find "executable")) - (defcustom hashcash-default-payment 20 "*The default number of bits to pay to unknown users. If this is zero, no payment header will be generated. diff --git a/lisp/nndb.el b/lisp/nndb.el index dd477a3..533612e 100644 --- a/lisp/nndb.el +++ b/lisp/nndb.el @@ -1,6 +1,7 @@ ;;; nndb.el --- nndb access for Gnus -;; Copyright (C) 1997, 1998, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2000, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Kai Grossjohann @@ -50,7 +51,9 @@ ;;- ;; Register nndb with known select methods. -(gnus-declare-backend "nndb" 'mail 'respool 'address 'prompt-address) +(require 'gnus-start) +(unless (assoc "nndb" gnus-valid-select-methods) + (gnus-declare-backend "nndb" 'mail 'respool 'address 'prompt-address)) ;;; Code: @@ -59,14 +62,6 @@ (require 'nntp) (eval-when-compile (require 'cl)) -(eval-and-compile - (autoload 'news-setup "rnewspost") - (autoload 'news-reply-mode "rnewspost") - (autoload 'cancel-timer "timer") - (autoload 'telnet "telnet" nil t) - (autoload 'telnet-send-input "telnet" nil t) - (autoload 'gnus-declare-backend "gnus-start")) - ;; Declare nndb as derived from nntp (nnoo-declare nndb nntp) diff --git a/lisp/nntp.el b/lisp/nntp.el index 38b8c4d..e2ae447 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -1,7 +1,8 @@ ;;; nntp.el --- nntp access for Gnus ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996, -;; 1997, 1998, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Katsumi Yamaoka @@ -1279,9 +1280,10 @@ password contained in '~/.nntp-authinfo'." (open-network-stream-as-binary "nntpd" buffer nntp-address nntp-port-number)) -(autoload 'format-spec "format") -(autoload 'format-spec-make "format") -(autoload 'open-tls-stream "tls") +(eval-and-compile + (autoload 'format-spec "format-spec") + (autoload 'format-spec-make "format-spec") + (autoload 'open-tls-stream "tls")) (defun nntp-open-ssl-stream (buffer) (let* ((process-connection-type nil) @@ -2055,7 +2057,8 @@ Please refer to the following variables to customize the connection: (make-directory (directory-file-name dir) t) (nnheader-message 5 "Creating nntp marks directory %s" dir)))) -(autoload 'time-less-p "time-date") +(eval-and-compile + (autoload 'time-less-p "time-date")) (defun nntp-marks-changed-p (group server) (let ((file (expand-file-name -- 1.7.10.4