diff options
| author | John Wiegley <johnw@newartisans.com> | 2002-02-16 06:43:43 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2002-02-16 06:43:43 +0000 |
| commit | d166533684bacca692c11c3d8f26eb8274779679 (patch) | |
| tree | 0b9e271bbbd994fd8271f1ac4adf6c67ccfb6102 /lisp/eshell/esh-ext.el | |
| parent | c0c16d4501c5cba072e896a909eac33bf0937f84 (diff) | |
| download | emacs-d166533684bacca692c11c3d8f26eb8274779679.tar.gz | |
(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.
Diffstat (limited to 'lisp/eshell/esh-ext.el')
| -rw-r--r-- | lisp/eshell/esh-ext.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index 691bbe6334d..6f8c5e0c7c8 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -212,7 +212,9 @@ causing the user to wonder if anything's really going on..." 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 @@ Return nil, or a list of the form: (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) |