* message.el (message-send-news): Call `message-maybe-split-and-send-news'

with an arg `method'.
(message-maybe-split-and-send-news): Accept an arg `method'.

* rfc1843.el: Defvar `gnus-decode-encoded-word-function'.

* mm-uu.el: Require `gnus-mailcap'.
* mm-decode.el: Require `gnus-mailcap' instead of `mailcap'.
* mm-encode.el: Ditto.
* gnus-mailcap.el: Provide `gnus-mailcap' instead of `mailcap'.

diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el
index 6e85b13..923e5b0 100644 (file)
--- a/lisp/gnus-mailcap.el
+++ b/lisp/gnus-mailcap.el
@@ -846,6 +846,6 @@ The path of COMMAND will be returned iff COMMAND is a command."
                       (not (file-directory-p file)))
              (throw 'found file))))))))
 
-(provide 'mailcap)
+(provide 'gnus-mailcap)
 
 ;;; mailcap.el ends here

diff --git a/lisp/message.el b/lisp/message.el
index 846f11e..4a8f10c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2524,7 +2524,7 @@ to find out how to use this."
            (error "Sending failed; " result)))
       (error "Sending failed; no recipients"))))
 
-(defsubst message-maybe-split-and-send-news ()
+(defsubst message-maybe-split-and-send-news (method)
   "Split a message if necessary, and send it via news.
 Returns nil if sending succeeded, returns t if sending failed.
 This sub function is for exclusive use of `message-send-news'."
@@ -2592,7 +2592,7 @@ This sub function is for exclusive use of `message-send-news'."
            ;; require one newline at the end.
            (or (= (preceding-char) ?\n)
                (insert ?\n))
-           (setq result (message-maybe-split-and-send-news)))
+           (setq result (message-maybe-split-and-send-news method)))
        (kill-buffer tembuf))
       (set-buffer message-edit-buffer)
       (if result

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index ab07f8d..cd78c35 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (require 'mail-parse)
-(require 'mailcap)
+(require 'gnus-mailcap)
 (require 'mm-bodies)
 
 ;;; Convenience macros.

diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el
index 30bc8cd..7f0f26f 100644 (file)
--- a/lisp/mm-encode.el
+++ b/lisp/mm-encode.el
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (require 'mail-parse)
-(require 'mailcap)
+(require 'gnus-mailcap)
 
 (defvar mm-content-transfer-encoding-defaults
   '(("text/.*" quoted-printable)

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index 5247559..a1faf5b 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -2,7 +2,7 @@
 ;; Copyright (c) 1998 by Shenghuo Zhu <zsh@cs.rochester.edu>
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
-;; $Revision: 1.1.2.2 $
+;; $Revision: 1.1.2.4 $
 ;; Keywords: news postscript uudecode binhex shar
   
 ;; This file is not part of GNU Emacs, but the same permissions
@@ -28,6 +28,8 @@
 
 ;;; Code:
 
+(require 'gnus-mailcap)
+
 (eval-and-compile
   (autoload 'binhex-decode-region "binhex")
   (autoload 'binhex-decode-region-external "binhex")

diff --git a/lisp/rfc1843.el b/lisp/rfc1843.el
index a812d50..07fc33a 100644 (file)
--- a/lisp/rfc1843.el
+++ b/lisp/rfc1843.el
@@ -2,7 +2,7 @@
 ;; Copyright (c) 1998 by Shenghuo Zhu <zsh@cs.rochester.edu>
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
-;; $Revision: 1.1.2.3 $
+;; $Revision: 1.1.2.5 $
 ;; Keywords: news HZ 
 ;; Time-stamp: <Tue Oct  6 23:48:49 EDT 1998 zsh>
   
@@ -146,6 +146,7 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
 (defvar rfc1843-old-gnus-decode-header-function  nil)
 (defvar gnus-decode-header-methods)
 (defvar gnus-decode-encoded-word-methods)
+(defvar gnus-decode-encoded-word-function)
 
 (defun rfc1843-gnus-setup ()
   "Setup HZ decoding for Gnus."