changeset 82511:ad03d7b3a351

(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.
author Glenn Morris <rgm@gnu.org>
date Wed, 22 Aug 2007 03:36:42 +0000
parents 73e2928cb544
children 1394a4fd4724
files lisp/mail/rmail.el
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/mail/rmail.el	Wed Aug 22 02:17:45 2007 +0000
+++ b/lisp/mail/rmail.el	Wed Aug 22 03:36:42 2007 +0000
@@ -239,6 +239,12 @@
     (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 @@
 		 (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)