From 4a2639880bbe741d2d5a55c42f7c0ca236604752 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Mon, 24 Oct 2005 20:46:06 +0000 Subject: [PATCH] * 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. --- lisp/mh-e/ChangeLog | 8 ++++++++ lisp/mh-e/mh-gnus.el | 11 +++++++---- lisp/mh-e/mh-mime.el | 6 ------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 352b3e9ace5..6c206258d79 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,11 @@ +2005-10-24 Bill Wohler + + * 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 * .arch-inventory: New file. diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el index 9d12a54bcd1..23209275d12 100644 --- a/lisp/mh-e/mh-gnus.el +++ b/lisp/mh-e/mh-gnus.el @@ -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 --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 18a2995d7a1..70cc1f261db 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -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") -- 2.39.2