(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/mail/rmail.el b/lisp/mail/rmail.el
index ee990f2fdd3ac3b8700bdaa1acd2a58c6e4f5c0f..ff588d6ff70ee48f16073a3e6fb4e8c77d7b7db6 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -239,6 +239,10 @@ 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.
+(rmail-movemail-variant-p)
+
 ;;;###autoload
 (defcustom rmail-dont-reply-to-names nil "\
 *A regexp specifying addresses to prune from a reply message.
@@ -1818,10 +1822,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)