From: Lars Ljung <lars@matholka.se>
Date: Sat, 4 Feb 2012 09:57:09 +0000 (+0200)
Subject: Fix bug #10523 with bad value of eshell-windows-shell-file.
X-Git-Tag: emacs-pretest-24.0.94~332
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6283a7d3f4c9c122a5ae93507ca4341b8f33fd36;p=emacs.git

Fix bug #10523 with bad value of eshell-windows-shell-file.

 lisp/eshell/esh-ext.el (eshell-windows-shell-file): Match "cmdproxy"
 anywhere in shell-file-name, not just at the beginning.  (Bug#10523)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f7863b2870..888b7e20307 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-04  Lars Ljung  <lars@matholka.se>  (tiny change)
+
+	* eshell/esh-ext.el (eshell-windows-shell-file): Match "cmdproxy"
+	anywhere in shell-file-name, not just at the beginning.  (Bug#10523)
+
 2012-02-04  Leo Liu  <sdl.web@gmail.com>
 
 	* emacs-lisp/smie.el: Fix dead link (Bug#10711).
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index cf57a1dce79..f025c66df32 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -91,7 +91,7 @@ since nothing else but Eshell will be able to understand
 
 (defcustom eshell-windows-shell-file
   (if (eshell-under-windows-p)
-      (if (string-match "\\(\\`cmdproxy\\|sh\\)\\.\\(com\\|exe\\)"
+      (if (string-match "\\(cmdproxy\\|sh\\)\\.\\(com\\|exe\\)"
 			shell-file-name)
 	  (or (eshell-search-path "cmd.exe")
 	      (eshell-search-path "command.com"))