# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1187753617 0
# Node ID 58298f7fd6710cdf2602c5912576f71943cb706e
# Parent  614e3fc32bdff3decc28d29789600330512c1919
(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 -r 614e3fc32bdf -r 58298f7fd671 lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Wed Aug 22 03:33:13 2007 +0000
+++ b/lisp/mail/rmail.el	Wed Aug 22 03:33:37 2007 +0000
@@ -239,6 +239,10 @@
     (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 @@
 		 (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)