# HG changeset patch # User Bill Wohler # Date 1137349646 0 # Node ID 3e14f7a3572ed09284676254ca500f63fc97d829 # Parent 1893489ad8115ed1de02aa02b70d3e818d2832eb * 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. diff -r 1893489ad811 -r 3e14f7a3572e lisp/mh-e/ChangeLog --- a/lisp/mh-e/ChangeLog Sun Jan 15 12:07:55 2006 +0000 +++ b/lisp/mh-e/ChangeLog Sun Jan 15 18:27:26 2006 +0000 @@ -1,5 +1,12 @@ 2006-01-15 Bill Wohler + * 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 -r 1893489ad811 -r 3e14f7a3572e lisp/mh-e/mh-exec.el --- a/lisp/mh-e/mh-exec.el Sun Jan 15 12:07:55 2006 +0000 +++ b/lisp/mh-e/mh-exec.el Sun Jan 15 18:27:26 2006 +0000 @@ -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 -r 1893489ad811 -r 3e14f7a3572e lisp/mh-e/mh-init.el --- a/lisp/mh-e/mh-init.el Sun Jan 15 12:07:55 2006 +0000 +++ b/lisp/mh-e/mh-init.el Sun Jan 15 18:27:26 2006 +0000 @@ -68,27 +68,9 @@ ;; 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.