Mercurial > emacs
changeset 43319:539d3657c52c
(eshell-external-command): Added a fix for XEmacs' new dired.el, which
adds a global entry in the `file-name-handler-alist'.
(eshell-script-interpreter): Allow whitespace after the #! of a shell
interpretor specification.
| author | John Wiegley <johnw@newartisans.com> |
|---|---|
| date | Sat, 16 Feb 2002 06:43:43 +0000 |
| parents | 4d3d5610eea8 |
| children | a5dd8224b9a5 |
| files | lisp/eshell/esh-ext.el |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/eshell/esh-ext.el Sat Feb 16 06:43:19 2002 +0000 +++ b/lisp/eshell/esh-ext.el Sat Feb 16 06:43:43 2002 +0000 @@ -212,7 +212,9 @@ default-directory))) (find-file-name-handler default-directory 'shell-command)))) - (if handler + (if (and handler + (not (and (eshell-under-xemacs-p) + (eq handler 'dired-handler-fn)))) (eshell-remote-command handler command args)) (let ((interp (eshell-find-interpreter command))) (assert interp) @@ -258,7 +260,7 @@ (file-regular-p file)) (with-temp-buffer (insert-file-contents-literally file nil 0 maxlen) - (if (looking-at "#!\\([^ \t\n]+\\)\\([ \t]+\\(.+\\)\\)?") + (if (looking-at "#![ \t]*\\([^ \t\n]+\\)\\([ \t]+\\(.+\\)\\)?") (if (match-string 3) (list (match-string 1) (match-string 3)