From d166533684bacca692c11c3d8f26eb8274779679 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 16 Feb 2002 06:43:43 +0000 Subject: [PATCH] (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. --- lisp/eshell/esh-ext.el | 6 ++++-- 1 file 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) -- 2.39.2