From 759af2e28f6c2da88c537d7346951bbfaea6c42a Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 6 Sep 2005 00:12:40 +0000
Subject: [PATCH] Synch to No Gnus 200509052359.

---
 lisp/ChangeLog    |   34 +++++++++++++++++++++++++++++++++-
 lisp/gnus-art.el  |    3 ++-
 lisp/gnus-spec.el |    1 +
 lisp/gnus-util.el |    3 +++
 lisp/gnus.el      |   11 +++++++++++
 lisp/mm-decode.el |    2 ++
 lisp/mm-extern.el |    2 ++
 lisp/mm-url.el    |    4 ++++
 lisp/mm-view.el   |    8 ++++++++
 lisp/mml-smime.el |    4 +++-
 lisp/mml.el       |   10 ++++++++++
 lisp/mml1991.el   |    6 ++++--
 lisp/mml2015.el   |    2 ++
 lisp/nnheader.el  |    2 ++
 lisp/rfc1843.el   |    4 ++++
 lisp/spam-stat.el |    2 ++
 texi/ChangeLog    |    3 +++
 texi/gnus-ja.texi |    3 ++-
 texi/gnus.texi    |    3 ++-
 19 files changed, 100 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a66d478..91bd3f6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -103,6 +103,38 @@
 	(gnus-article-jump-to-part): Don't use `read-number'.  Use last
 	part if argument is bogus.
 
+2005-08-31  Juanma Barranquero  <lekktu@gmail.com>
+
+	* gnus-art.el (w3m-minor-mode-map):
+	* gnus-spec.el (gnus-newsrc-file-version):
+	* gnus-util.el (nnmail-active-file-coding-system)
+	(gnus-original-article-buffer, gnus-user-agent):
+	* gnus.el (gnus-ham-process-destinations)
+	(gnus-parameter-ham-marks-alist)
+	(gnus-parameter-spam-marks-alist, gnus-spam-autodetect)
+	(gnus-spam-autodetect-methods, gnus-spam-newsgroup-contents)
+	(gnus-spam-process-destinations, gnus-spam-process-newsgroups):
+	* mm-decode.el (gnus-current-window-configuration):
+	* mm-extern.el (gnus-article-mime-handles):
+	* mm-url.el (url-current-object, url-package-name)
+	(url-package-version):
+	* mm-view.el (gnus-article-mime-handles, gnus-newsgroup-charset)
+	(smime-keys, w3m-cid-retrieve-function-alist)
+	(w3m-current-buffer, w3m-display-inline-images)
+	(w3m-minor-mode-map):
+	* mml-smime.el (gnus-extract-address-components):
+	* mml.el (gnus-article-mime-handles, gnus-mouse-2)
+	(gnus-newsrc-hashtb, message-default-charset)
+	(message-deletable-headers, message-options)
+	(message-posting-charset, message-required-mail-headers)
+	(message-required-news-headers):
+	* mml1991.el (mc-pgp-always-sign):
+	* mml2015.el (mc-pgp-always-sign):
+	* nnheader.el (nnmail-extra-headers):
+	* rfc1843.el (gnus-decode-encoded-word-function)
+	(gnus-decode-header-function, gnus-newsgroup-name):
+	* spam-stat.el (gnus-original-article-buffer): Add defvars.
+
 2005-08-22  Karl Chen  <quarl@cs.berkeley.edu>  (tiny change)
 
 	* gnus-art.el (gnus-treatment-function-alist): Move date-lapsed to
@@ -145,7 +177,7 @@
 
 	* message.el (message-user-fqdn): Fix typo in docstring.
 
-2005-08-05  Daiki Ueno <ueno@unixuser.org>
+2005-08-05  Daiki Ueno  <ueno@unixuser.org>
 
 	* mml2015.el (mml2015-pgg-sign): Make sure micalg is correct.
 
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index bb43598..3c200b0 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -32,7 +32,8 @@
 (eval-when-compile
   (require 'cl)
   (require 'static)
-  (defvar tool-bar-map))
+  (defvar tool-bar-map)
+  (defvar w3m-minor-mode-map))
 
 (require 'path-util)
 (require 'gnus)
diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index b93e681..187e3e5 100644
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -29,6 +29,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(defvar gnus-newsrc-file-version)
 
 (require 'alist)
 (require 'gnus)
diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 2ce13ac..8ca0ad4 100644
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -40,9 +40,12 @@
   (require 'cl)
   ;; Fixme: this should be a gnus variable, not nnmail-.
   (defvar nnmail-pathname-coding-system)
+  (defvar nnmail-active-file-coding-system)
 
   ;; Inappropriate references to other parts of Gnus.
   (defvar gnus-emphasize-whitespace-regexp)
+  (defvar gnus-original-article-buffer)
+  (defvar gnus-user-agent)
   )
 
 (require 'time-date)
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 7b1bacb..992845e 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -40,6 +40,17 @@
 
 (require 'gnus-vers)
 
+;; These are defined afterwards with gnus-define-group-parameter
+(defvar gnus-ham-process-destinations)
+(defvar gnus-parameter-ham-marks-alist)
+(defvar gnus-parameter-spam-marks-alist)
+(defvar gnus-spam-autodetect)
+(defvar gnus-spam-autodetect-methods)
+(defvar gnus-spam-newsgroup-contents)
+(defvar gnus-spam-process-destinations)
+(defvar gnus-spam-process-newsgroups)
+
+
 (defgroup gnus nil
   "The coffee-brewing, all singing, all dancing, kitchen sink newsreader."
   :group 'news
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index bc52e59..3b48733 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -37,6 +37,8 @@
   (autoload 'mm-inline-external-body "mm-extern")
   (autoload 'mm-insert-inline "mm-view"))
 
+(defvar gnus-current-window-configuration)
+
 (add-hook 'gnus-exit-gnus-hook 'mm-destroy-postponed-undisplay-list)
 
 (defgroup mime-display ()
diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index b32b6d4..3c13b33 100644
--- a/lisp/mm-extern.el
+++ b/lisp/mm-extern.el
@@ -33,6 +33,8 @@
 (require 'mm-decode)
 (require 'mm-url)
 
+(defvar gnus-article-mime-handles)
+
 (defvar mm-extern-function-alist
   '((local-file . mm-extern-local-file)
     (url . mm-extern-url)
diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 3dcdbc8..9f9c560 100644
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -43,6 +43,10 @@
       (require 'timer-funcs)
     (require 'timer)))
 
+(defvar url-current-object)
+(defvar url-package-name)
+(defvar url-package-version)
+
 (defgroup mm-url nil
   "A wrapper of url package and external url command for Gnus."
   :group 'gnus)
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 616febe..5bf538d 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -38,6 +38,14 @@
   (autoload 'fill-flowed "flow-fill")
   (autoload 'html2text "html2text"))
 
+(defvar gnus-article-mime-handles)
+(defvar gnus-newsgroup-charset)
+(defvar smime-keys)
+(defvar w3m-cid-retrieve-function-alist)
+(defvar w3m-current-buffer)
+(defvar w3m-display-inline-images)
+(defvar w3m-minor-mode-map)
+
 (defvar mm-text-html-renderer-alist
   '((w3  . mm-inline-text-html-render-with-w3)
     (w3m . mm-inline-text-html-render-with-w3m)
diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 0802dac..09c61dc 100644
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -27,6 +27,8 @@
 
 (eval-when-compile (require 'cl))
 
+(defvar gnus-extract-address-components)
+
 ;; EMIKO doesn't provide the smime.el module.
 (condition-case nil
     (require 'smime)
@@ -55,7 +57,7 @@
       (if (not (and (not (file-exists-p tmp))
 		    (get-buffer tmp)))
 	  (push tmp certfiles)
-	(setq file (mm-make-temp-file (expand-file-name "mml." 
+	(setq file (mm-make-temp-file (expand-file-name "mml."
 							mm-tmp-directory)))
 	(with-current-buffer tmp
 	  (write-region (point-min) (point-max) file))
diff --git a/lisp/mml.el b/lisp/mml.el
index 7c53260..d24d030 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -44,6 +44,16 @@
 (eval-when-compile
   (autoload 'dnd-get-local-file-name "dnd"))
 
+(defvar gnus-article-mime-handles)
+(defvar gnus-mouse-2)
+(defvar gnus-newsrc-hashtb)
+(defvar message-default-charset)
+(defvar message-deletable-headers)
+(defvar message-options)
+(defvar message-posting-charset)
+(defvar message-required-mail-headers)
+(defvar message-required-news-headers)
+
 (defcustom mml-content-type-parameters
   '(name access-type expiration size permission format)
   "*A list of acceptable parameters in MML tag.
diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 230bbfd..183c019 100644
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -32,6 +32,8 @@
   (require 'cl)
   (require 'mm-util))
 
+(defvar mc-pgp-always-sign)
+
 (autoload 'quoted-printable-decode-region "qp")
 (autoload 'quoted-printable-encode-region "qp")
 
@@ -182,7 +184,7 @@
       (delete-region (point-min) (point)))
     (mm-with-unibyte-current-buffer
       (with-temp-buffer
-	(flet ((gpg-encrypt-func 
+	(flet ((gpg-encrypt-func
 		(sign plaintext ciphertext result recipients &optional
 		      passphrase sign-with-key armor textmode)
 		(if sign
@@ -270,7 +272,7 @@
       (delete-region (point-min) (point)))
     (mm-decode-content-transfer-encoding cte)
     (unless (pgg-encrypt-region
-	     (point-min) (point-max) 
+	     (point-min) (point-max)
 	     (split-string
 	      (or
 	       (message-options-get 'message-recipients)
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index d53a705..7da07ff 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -35,6 +35,8 @@
 (require 'mm-util)
 (require 'mml)
 
+(defvar mc-pgp-always-sign)
+
 (defvar mml2015-use (or
 		     (progn
 		       (ignore-errors
diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 4fd0c4d..8888fc3 100644
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -34,6 +34,8 @@
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'static))
 
+(defvar nnmail-extra-headers)
+
 ;; Requiring `gnus-util' at compile time creates a circular
 ;; dependency between nnheader.el and gnus-util.el.
 ;;(eval-when-compile (require 'gnus-util))
diff --git a/lisp/rfc1843.el b/lisp/rfc1843.el
index 34ca0a5..2bce314 100644
--- a/lisp/rfc1843.el
+++ b/lisp/rfc1843.el
@@ -37,6 +37,10 @@
 (eval-when-compile (require 'cl))
 (require 'mm-util)
 
+(defvar gnus-decode-encoded-word-function)
+(defvar gnus-decode-header-function)
+(defvar gnus-newsgroup-name)
+
 (defvar rfc1843-word-regexp
   "~\\({\\([\041-\167][\041-\176]\\| \\)+\\)\\(~}\\|$\\)")
 
diff --git a/lisp/spam-stat.el b/lisp/spam-stat.el
index 6fcc195..4cd1768 100644
--- a/lisp/spam-stat.el
+++ b/lisp/spam-stat.el
@@ -124,6 +124,8 @@
 ;;; Code:
 (require 'mail-parse)
 
+(defvar gnus-original-article-buffer)
+
 (defgroup spam-stat nil
   "Statistical spam detection for Emacs.
 Use the functions to build a dictionary of words and their statistical
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 4ca2bd8..6db605c 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -4,6 +4,9 @@
 
 2005-09-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
+	* gnus.texi (Mail Source Customization): Fix descriptions of
+	mail-source-incoming-file-prefix.
+
 	* message.texi (MIME): Describe mml-dnd-protocol-alist and
 	mml-dnd-attach-options.
 
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 91e1b09..ec51091 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -13245,7 +13245,8 @@ UNDELETED} はおそらくたいていの人には最良の選択でしょうが、ときど
 入ってきたメールを保存するファイルの接頭辞です。初期値
 は @file{Incoming} で、この場合ファイル
 は @file{Incoming30630D_} や @file{Incoming298602ZD} のようになります。
-@code{mail-source-delete-incoming} が @code{nil} の場合だけですが。
+@code{mail-source-delete-incoming} が @code{nil} または数値の場合だけで
+すが。
 
 @item mail-source-default-file-modes
 @vindex mail-source-default-file-modes
diff --git a/texi/gnus.texi b/texi/gnus.texi
index cfc0c7f..fdfc76c 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -14007,7 +14007,8 @@ is to say where the incoming files will be stored if the variable
 Prefix for file name for storing incoming mail.  The default is
 @file{Incoming}, in which case files will end up with names like
 @file{Incoming30630D_} or @file{Incoming298602ZD}.  This is really only
-relevant if @code{mail-source-delete-incoming} is @code{nil}.
+relevant if @code{mail-source-delete-incoming} is @code{nil} or a
+number.
 
 @item mail-source-default-file-modes
 @vindex mail-source-default-file-modes
-- 
1.7.10.4