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 4f7863b28702b77457d2dbd0a1ee3b31a066d3c7..888b7e203070b34edf7a81ef3fee0a77884a4479 100644 (file)
--- 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 cf57a1dce7931ee3fd31ab5bbac0b403b2a27c78..f025c66df32a5b37ceb301fb11e950d64782218b 100644 (file)
--- 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"))