# HG changeset patch
# User Bill Wohler <wohler@newt.com>
# Date 1130186766 0
# Node ID 779be9915a306acbdec70c8421a130b8c83f4cae
# Parent  5a25cc5e524a6f26b53e30a38a08158cd83c8083
* mh-gnus.el: Load mml.el in order to see if
mml-minibuffer-read-disposition is defined or not.

* mh-mime.el: Now that mh-gnus.el loads mml, we shouldn't need the mml
autoloads.

diff -r 5a25cc5e524a -r 779be9915a30 lisp/mh-e/ChangeLog
--- a/lisp/mh-e/ChangeLog	Mon Oct 24 19:37:30 2005 +0000
+++ b/lisp/mh-e/ChangeLog	Mon Oct 24 20:46:06 2005 +0000
@@ -1,3 +1,11 @@
+2005-10-24  Bill Wohler  <wohler@newt.com>
+
+	* mh-gnus.el: Load mml.el in order to see if
+	mml-minibuffer-read-disposition is defined or not.
+
+	* mh-mime.el: Now that mh-gnus.el loads mml, we shouldn't need the
+	mml autoloads.
+
 2005-10-23  Miles Bader  <miles@gnu.org>
 
 	* .arch-inventory: New file.
diff -r 5a25cc5e524a -r 779be9915a30 lisp/mh-e/mh-gnus.el
--- a/lisp/mh-e/mh-gnus.el	Mon Oct 24 19:37:30 2005 +0000
+++ b/lisp/mh-e/mh-gnus.el	Mon Oct 24 20:46:06 2005 +0000
@@ -30,11 +30,14 @@
 
 ;;; Code:
 
-(load "mm-decode" t t)                  ; Non-fatal dependency
-(load "mm-uu" t t)                      ; Non-fatal dependency
-(load "mailcap" t t)                    ; Non-fatal dependency
-(load "smiley" t t)                     ; Non-fatal dependency
+;;; Load libraries in a non-fatal way in order to see if certain functions are
+;;; pre-defined.
 (load "mailabbrev" t t)
+(load "mailcap" t t)
+(load "mm-decode" t t)
+(load "mm-uu" t t)
+(load "mml" t t)
+(load "smiley" t t)
 
 (defmacro mh-defun-compat (function arg-list &rest body)
   "This is a macro to define functions which are not defined.
diff -r 5a25cc5e524a -r 779be9915a30 lisp/mh-e/mh-mime.el
--- a/lisp/mh-e/mh-mime.el	Mon Oct 24 19:37:30 2005 +0000
+++ b/lisp/mh-e/mh-mime.el	Mon Oct 24 20:46:06 2005 +0000
@@ -48,12 +48,6 @@
 (autoload 'gnus-get-buffer-create "gnus")
 (autoload 'message-options-set-recipient "message")
 (autoload 'mm-uu-dissect "mm-uu")
-(autoload 'mml-attach-file "mml")
-(autoload 'mml-insert-empty-tag "mml")
-(autoload 'mml-minibuffer-read-description "mml")
-(autoload 'mml-minibuffer-read-disposition "mml")
-(autoload 'mml-minibuffer-read-file "mml")
-(autoload 'mml-to-mime "mml")
 (autoload 'mml-unsecure-message "mml-sec")
 (autoload 'rfc2047-decode-region "rfc2047")
 (autoload 'widget-convert-button "wid-edit")