From 6283a7d3f4c9c122a5ae93507ca4341b8f33fd36 Mon Sep 17 00:00:00 2001 From: Lars Ljung Date: Sat, 4 Feb 2012 11:57:09 +0200 Subject: [PATCH] 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) --- lisp/ChangeLog | 5 +++++ lisp/eshell/esh-ext.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 (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 * 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")) -- 2.11.4.GIT