Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-191

Merge from gnus--rel--5.10

Patches applied:

 * emacs--cvs-trunk--0  (patch 525)

   - Update from CVS

 * gnus--rel--5.10  (patch 111)

   - Merge from emacs--cvs-trunk--0

2005-08-31  Juanma Barranquero  <lekktu@gmail.com>

   * lisp/gnus-art.el (w3m-minor-mode-map):
   * lisp/gnus-spec.el (gnus-newsrc-file-version):
   * lisp/gnus-util.el (nnmail-active-file-coding-system)
   (gnus-original-article-buffer, gnus-user-agent):
   * lisp/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):
   * lisp/mm-decode.el (gnus-current-window-configuration):
   * lisp/mm-extern.el (gnus-article-mime-handles):
   * lisp/mm-url.el (url-current-object, url-package-name)
   (url-package-version):
   * lisp/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):
   * lisp/mml-smime.el (gnus-extract-address-components):
   * lisp/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):
   * lisp/mml1991.el (mc-pgp-always-sign):
   * lisp/mml2015.el (mc-pgp-always-sign):
   * lisp/nnheader.el (nnmail-extra-headers):
   * lisp/rfc1843.el (gnus-decode-encoded-word-function)
   (gnus-decode-header-function, gnus-newsgroup-name):
   * lisp/spam-stat.el (gnus-original-article-buffer): Add defvars.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d17d921..24f0396 100644 (file)
--- 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 beb3406..36d43ae 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -29,7 +29,8 @@
 
 (eval-when-compile
   (require 'cl)
-  (defvar tool-bar-map))
+  (defvar tool-bar-map)
+  (defvar w3m-minor-mode-map))
 
 (require 'gnus)
 ;; Avoid the "Recursive load suspected" error in Emacs 21.1.

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index b52c73e..e06d8c7 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -28,6 +28,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(defvar gnus-newsrc-file-version)
 
 (require 'gnus)
 

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index af57466..eba6eae 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -39,9 +39,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)
 (require 'netrc)

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 44c86b3..c765318 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -35,6 +35,17 @@
 (require 'mm-util)
 (require 'nnheader)
 
+;; 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 4af88ee..18ec58a 100644 (file)
--- 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 27263d2..2f75139 100644 (file)
--- 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 9387fb3..fbea1f1 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -40,6 +40,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 c39e698..2218c70 100644 (file)
--- 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 e9dd6dc..b290489 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -29,6 +29,8 @@
 
 (eval-when-compile (require 'cl))
 
+(defvar gnus-extract-address-components)
+
 (require 'smime)
 (require 'mm-decode)
 (autoload 'message-narrow-to-headers "message")
@@ -54,7 +56,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 205c868..dc068ff 100644 (file)
--- 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 fc6d9e8..932737d 100644 (file)
--- 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 8537b47..a9d56a3 100644 (file)
--- 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 620e87b..5f2e94b 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -31,6 +31,8 @@
 
 (eval-when-compile (require 'cl))
 
+(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 2214a1b..55150fb 100644 (file)
--- 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 6d6f87c..bade0d5 100644 (file)
--- 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