# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1203487241 0
# Node ID d6585ca214bf722bec6daa375013a86e33321729
# Parent  3ca9638d23065c091d3aba0fd2b863d54a953803
(rmail-autodetect): Add .exe extension to movemail on Windows.

diff -r 3ca9638d2306 -r d6585ca214bf lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Tue Feb 19 22:14:40 2008 +0000
+++ b/lisp/mail/rmail.el	Wed Feb 20 06:00:41 2008 +0000
@@ -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 @@
       (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)))