(rmail-movemail-variant-p): Call on load to set movemail related variables.

(rmail-insert-inbox-text): Use only rmail-movemail-program, which
will now be set before this is called.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 274533830df2b7876b49f89693b6e5645d348532..d338b717bb90c8c8033da28123c9a8c97c7abeaa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-22  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmail.el (rmail-movemail-variant-p): Call on load to set
+       movemail related variables.
+       (rmail-insert-inbox-text): Use only rmail-movemail-program, which
+       will now be set before this is called.
+
 2007-08-21  Juri Linkov  <juri@jurta.org>
 
        * delsel.el (delete-selection-pre-hook):

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 429d85a7fed967c96ff39c059b2e92c0316ffed3..0589824d95844d2f926a44e2ecee0b6b184b7330 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -239,6 +239,12 @@ Currently known variants are 'emacs and 'mailutils."
     (setq rmail-movemail-variant-in-use (rmail-autodetect)))
   (not (null (member rmail-movemail-variant-in-use variants))))
 
+;; Call for effect, to set rmail-movemail-program (if not set by the
+;; user), and rmail-movemail-variant-in-use. Used by various functions.
+;; I'm not sure if M-x rmail is the only entry point to this package.
+;; If so, this can be moved there.
+(rmail-movemail-variant-p)
+
 ;;;###autoload
 (defcustom rmail-dont-reply-to-names nil "\
 *A regexp specifying addresses to prune from a reply message.
@@ -1818,10 +1824,7 @@ is non-nil if the user has supplied the password interactively.
                 (buffer-disable-undo errors)
                 (let ((args
                        (append
-                        (list (or rmail-movemail-program
-                                  (expand-file-name "movemail"
-                                                    exec-directory))
-                              nil errors nil)
+                        (list rmail-movemail-program nil errors nil)
                         (if rmail-preserve-inbox
                             (list "-p")
                           nil)