[Emacs-diffs] /srv/bzr/emacs/trunk r107089: Fix bug #10523 with bad value of eshell-windows-shell-file.

[Eli Zaretskii]

------------------------------------------------------------
revno: 107089
fixes bug(s): http://debbugs.gnu.org/10523
author: Lars Ljung <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-02-04 11:57:09 +0200
message:
  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)
modified:
  lisp/ChangeLog
  lisp/eshell/esh-ext.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-04 08:43:26 +0000
+++ b/lisp/ChangeLog    2012-02-04 09:57:09 +0000
@@ -1,3 +1,8 @@
+2012-02-04  Lars Ljung  <address@hidden>  (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  <address@hidden>
 
        * emacs-lisp/smie.el: Fix dead link (Bug#10711).

=== modified file 'lisp/eshell/esh-ext.el'
--- a/lisp/eshell/esh-ext.el    2012-01-28 13:58:46 +0000
+++ b/lisp/eshell/esh-ext.el    2012-02-04 09:57:09 +0000
@@ -91,7 +91,7 @@
 
 (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"))