(rmail-autodetect): Add .exe extension to movemail on Windows.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ddf4553c13c7894f1dcf135b1be4d3523e59a119..3f0efc0aa66267643f2ab0a403b07bed657125cc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-20  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmail.el (rmail-autodetect): Add .exe extension to movemail
+       on Windows.
+
 2008-02-20  Kenichi Handa  <handa@ni.aist.go.jp>
 
        * international/latin1-disp.el (latin1-display): Don't use

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 5f8815bc787d62365fdf9c1cc00deec0240ccb62..e36b98858413de108ced69dce72166d214148339 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -219,7 +219,15 @@ Otherwise, look for `movemail' in the directories in
       (dolist (dir (append rmail-movemail-search-path exec-path
                           (list exec-directory)))
        (when (and dir (file-accessible-directory-p dir))
-         (let ((progname (expand-file-name "movemail" dir)))
+         ;; Previously, this didn't have to work on Windows, because
+         ;; rmail-insert-inbox-text before r1.439 fell back to using
+         ;; (expand-file-name "movemail" exec-directory) and just
+         ;; assuming it would work.
+         ;; http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-02/msg00087.html
+         (let ((progname (expand-file-name
+                          (concat "movemail"
+                                  (if (memq system-type '(ms-dos windows-nt))
+                                      ".exe")) dir)))
            (when (and (not (file-directory-p progname))
                       (file-executable-p progname))
              (let ((x (rmail-probe progname)))