* mh-exec.el: Require mh-acros, mh-buffers, and mh-utils for

standalone compile.
(mh-progs, mh-lib, mh-lib-progs): Move here from mh-init.el.

* mh-init.el (mh-progs, mh-lib, mh-lib-progs): Move to mh-exec.el,
where they are used.

3 files changed, 32 insertions, 19 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index fb3b1d70069..debaf5c943a 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,5 +1,12 @@
 2006-01-15  Bill Wohler  <wohler@newt.com>
 
+        * mh-exec.el: Require mh-acros, mh-buffers, and mh-utils for
+        standalone compile.
+        (mh-progs, mh-lib, mh-lib-progs): Move here from mh-init.el.
+
+        * mh-init.el (mh-progs, mh-lib, mh-lib-progs): Move to mh-exec.el,
+        where they are used.
+
         * mh-comp.el (mh-pgp-support-flag): Move here from mh-utils.el;
         needed to help remove dependency on mh-utils.
 
diff --git a/lisp/mh-e/mh-exec.el b/lisp/mh-e/mh-exec.el
index 71e40e5bdb0..e7a4a94b9a5 100644
--- a/lisp/mh-e/mh-exec.el
+++ b/lisp/mh-e/mh-exec.el
@@ -33,7 +33,31 @@
 
 ;;; Code:
 
-;;; 
+(eval-when-compile (require 'mh-acros))
+(mh-require-cl)
+
+(require 'mh-buffers)
+(require 'mh-utils)
+
+(defvar mh-progs nil
+  "Directory containing MH commands, such as inc, repl, and rmm.")
+
+;;;###autoload
+(put 'mh-progs 'risky-local-variable t)
+
+(defvar mh-lib nil
+  "Directory containing the MH library.
+This directory contains, among other things, the components file.")
+
+;;;###autoload
+(put 'mh-lib 'risky-local-variable t)
+
+(defvar mh-lib-progs nil
+  "Directory containing MH helper programs.
+This directory contains, among other things, the mhl program.")
+
+;;;###autoload
+(put 'mh-lib-progs 'risky-local-variable t)
 
 (defvar mh-index-max-cmdline-args 500
   "Maximum number of command line args.")
diff --git a/lisp/mh-e/mh-init.el b/lisp/mh-e/mh-init.el
index 86a62768980..180db2b22a5 100644
--- a/lisp/mh-e/mh-init.el
+++ b/lisp/mh-e/mh-init.el
@@ -68,27 +68,9 @@ directories to the customizable variable `mh-path'.")
 ;; was installed into.  But if you installed MH after building Emacs,
 ;; this would almost certainly be wrong, so now we do it at run time.
 
-(defvar mh-progs nil
-  "Directory containing MH commands, such as inc, repl, and rmm.")
-
-(defvar mh-lib nil
-  "Directory containing the MH library.
-This directory contains, among other things, the components file.")
-
-(defvar mh-lib-progs nil
-  "Directory containing MH helper programs.
-This directory contains, among other things, the mhl program.")
-
 (defvar mh-flists-present-flag nil
   "Non-nil means that we have \"flists\".")
 
-;;;###autoload
-(put 'mh-progs 'risky-local-variable t)
-;;;###autoload
-(put 'mh-lib 'risky-local-variable t)
-;;;###autoload
-(put 'mh-lib-progs 'risky-local-variable t)
-
 (defvar mh-variants nil
   "List describing known MH variants.
 Do not access this variable directly as it may not have yet been initialized.