Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294

1 files changed, 13 insertions, 12 deletions

diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 11090f97b83..b3fc5c30bbe 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -22,17 +22,6 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
-(provide 'esh-ext)
-
-(eval-when-compile (require 'esh-maint))
-(require 'esh-util)
-
-(defgroup eshell-ext nil
-  "External commands are invoked when operating system executables are
-loaded into memory, thus beginning a new process."
-  :tag "External commands"
-  :group 'eshell)
-
 ;;; Commentary:
 
 ;; To force a command to invoked external, either provide an explicit
@@ -43,6 +32,18 @@ loaded into memory, thus beginning a new process."
 ;;   /bin/grep   ; will definitely invoke /bin/grep
 ;;   *grep        ; will also invoke /bin/grep
 
+(provide 'esh-ext)
+
+(eval-when-compile
+  (require 'esh-cmd))
+(require 'esh-util)
+
+(defgroup eshell-ext nil
+  "External commands are invoked when operating system executables are
+loaded into memory, thus beginning a new process."
+  :tag "External commands"
+  :group 'eshell)
+
 ;;; User Variables:
 
 (defcustom eshell-ext-load-hook '(eshell-ext-initialize)
@@ -211,7 +212,7 @@ causing the user to wonder if anything's really going on..."
 	   (find-file-name-handler default-directory
 				   'shell-command))))
     (if (and handler
-	     (not (and (eshell-under-xemacs-p)
+	     (not (and (featurep 'xemacs)
 		       (eq handler 'dired-handler-fn))))
 	(eshell-remote-command handler command args))
     (let ((interp (eshell-find-interpreter command)))