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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 739f6f919cc071b35fe0cab35de4e5773c99a2d0..20a51a2ecc6afa34342a999d756854d3ad8b913c 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-19  Alan Mackenzie  <acm@muc.de>
 
        Set of changes so that "obtrusive" syntactic elements in a

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index b3a234a6210d010953f8eb70a64073170ecd04e3..4869f95689ec8d728366b93931715be79644ce5b 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1,7 +1,8 @@
 ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
@@ -214,7 +215,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)))