11 files changed, 87 insertions, 67 deletions

diff --git a/lisp/eshell/.arch-inventory b/lisp/eshell/.arch-inventory
new file mode 100644
index 00000000000..b5d82cdd6fc
--- /dev/null
+++ b/lisp/eshell/.arch-inventory
@@ -0,0 +1,4 @@
+# Generated files
+precious ^(esh-groups)\.el$
+
+# arch-tag: 8dc7bfaa-6ca6-4be0-915a-1e539c3dabfb
diff --git a/lisp/eshell/.gitignore b/lisp/eshell/.gitignore
index 16ccfcc8c0c..e1d7683a723 100644
--- a/lisp/eshell/.gitignore
+++ b/lisp/eshell/.gitignore
@@ -1 +1,14 @@
+COPYING
+FEATURES
+INSTALL
+Makefile
+NEWS
+README
+_darcs
+_pkg.el
+auto-autoloads.el
 esh-groups.el
+esh-toggle.el
+eshell-auto.el
+eshell.info
+eshell.texi
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 0312f9d7ada..02af7531b3f 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -1,6 +1,6 @@
 ;;; em-alias.el --- creation and management of command aliases
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2004 Free Software Foundation
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -24,6 +24,7 @@
 (provide 'em-alias)
 
 (eval-when-compile (require 'esh-maint))
+(require 'eshell)
 
 (defgroup eshell-alias nil
   "Command aliases allow for easy definition of alternate commands."
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 73837c324a5..7b74069454b 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -1,6 +1,6 @@
 ;;; em-dirs.el --- directory navigation commands
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2004 Free Software Foundation
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -24,6 +24,7 @@
 (provide 'em-dirs)
 
 (eval-when-compile (require 'esh-maint))
+(require 'eshell)
 
 (defgroup eshell-dirs nil
   "Directory navigation involves changing directories, examining the
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 24447c3e66d..c84962e66b0 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -122,10 +122,6 @@ This option slows down recursive glob processing by quite a bit."
   :type '(repeat (cons character (choice regexp function)))
   :group 'eshell-glob)
 
-;;; Internal Variables:
-
-(defvar eshell-glob-chars-regexp nil)
-
 ;;; Functions:
 
 (defun eshell-glob-initialize ()
@@ -134,8 +130,6 @@ This option slows down recursive glob processing by quite a bit."
   (when (boundp 'eshell-special-chars-outside-quoting)
     (set (make-local-variable 'eshell-special-chars-outside-quoting)
          (append eshell-glob-chars-list eshell-special-chars-outside-quoting)))
-  (set (make-local-variable 'eshell-glob-chars-regexp)
-       (format "[%s]+" (apply 'string eshell-glob-chars-list)))
   (add-hook 'eshell-parse-argument-hook 'eshell-parse-glob-chars t t)
   (add-hook 'eshell-pre-rewrite-command-hook
             'eshell-no-command-globbing nil t))
@@ -184,6 +178,8 @@ interpretation."
                   (buffer-substring-no-properties (1- (point)) (1+ end))
                 (goto-char (1+ end))))))))))
 
+(defvar eshell-glob-chars-regexp nil)
+
 (defun eshell-glob-regexp (pattern)
   "Convert glob-pattern PATTERN to a regular expression.
 The basic syntax is:
@@ -204,8 +200,11 @@ set to true, then these characters will match themselves in the
 resulting regular expression."
   (let ((matched-in-pattern 0)          ; How much of PATTERN handled
         regexp)
-    (while (string-match eshell-glob-chars-regexp
-                         pattern matched-in-pattern)
+    (while (string-match
+            (or eshell-glob-chars-regexp
+                (set (make-local-variable 'eshell-glob-chars-regexp)
+                     (format "[%s]+" (apply 'string eshell-glob-chars-list))))
+            pattern matched-in-pattern)
       (let* ((op-begin (match-beginning 0))
              (op-char (aref pattern op-begin)))
         (setq regexp
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index b38c7a519ec..f4bfea798e0 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -24,6 +24,7 @@
 (provide 'em-hist)
 
 (eval-when-compile (require 'esh-maint))
+(require 'eshell)
 
 (defgroup eshell-hist nil
   "This module provides command history management."
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 8446eb1aa9d..43d3c9c4e5e 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -1,6 +1,6 @@
 ;;; em-unix.el --- UNIX command aliases
 
-;; Copyright (C) 1999, 2000, 2001 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -24,6 +24,7 @@
 (provide 'em-unix)
 
 (eval-when-compile (require 'esh-maint))
+(require 'eshell)
 
 (defgroup eshell-unix nil
   "This module defines many of the more common UNIX utilities as
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 9b4f54ce8bf..477d8b410ec 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1246,9 +1246,8 @@ be finished later after the completion of an asynchronous subprocess."
         (setq program (eshell-search-path name))
         (let* ((esym (eshell-find-alias-function name))
                (sym (or esym (intern-soft name))))
-          (if (and sym (fboundp sym)
-                   (or esym eshell-prefer-lisp-functions
-                       (not program)))
+          (if (and (or esym (and sym (fboundp sym)))
+                   (or eshell-prefer-lisp-functions (not direct)))
               (let ((desc (let ((inhibit-redisplay t))
                             (save-window-excursion
                               (prog1
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 8d1036b736e..d832fa9cd03 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -333,22 +333,23 @@ it defaults to `insert'."
   (cond
    ((stringp target)
     (let ((redir (assoc target eshell-virtual-targets)))
-     (if redir
-         (if (nth 2 redir)
-             (funcall (nth 1 redir) mode)
-           (nth 1 redir))
-       (let* ((exists (get-file-buffer target))
-              (buf (find-file-noselect target t)))
-         (with-current-buffer buf
-           (if buffer-read-only
-               (error "Cannot write to read-only file `%s'" target))
-           (set (make-local-variable 'eshell-output-file-buffer)
-                (if (eq exists buf) 0 t))
-           (cond ((eq mode 'overwrite)
-                  (erase-buffer))
-                 ((eq mode 'append)
-                  (goto-char (point-max))))
-           (point-marker))))))
+      (if redir
+          (if (nth 2 redir)
+              (funcall (nth 1 redir) mode)
+            (nth 1 redir))
+        (let* ((exists (get-file-buffer target))
+               (buf (find-file-noselect target t)))
+          (with-current-buffer buf
+            (if buffer-read-only
+                (error "Cannot write to read-only file `%s'" target))
+            (set (make-local-variable 'eshell-output-file-buffer)
+                 (if (eq exists buf) 0 t))
+            (cond ((eq mode 'overwrite)
+                   (erase-buffer))
+                  ((eq mode 'append)
+                   (goto-char (point-max))))
+            (point-marker))))))
+
    ((or (bufferp target)
         (and (boundp 'eshell-buffer-shorthand)
              (symbol-value 'eshell-buffer-shorthand)
@@ -363,15 +364,18 @@ it defaults to `insert'."
               ((eq mode 'append)
                (goto-char (point-max))))
         (point-marker))))
-   ((functionp target)
-    nil)
+
+   ((functionp target) nil)
+
    ((symbolp target)
     (if (eq mode 'overwrite)
         (set target nil))
     target)
+
    ((or (eshell-processp target)
         (markerp target))
     target)
+
    (t
     (error "Illegal redirection target: %s"
            (eshell-stringify target)))))
@@ -481,7 +485,8 @@ Returns what was actually sent, or nil if nothing was sent."
           (let ((moving (= (point) target)))
             (save-excursion
               (goto-char target)
-              (setq object (eshell-stringify object))
+              (unless (stringp object)
+                (setq object (eshell-stringify object)))
               (insert-and-inherit object)
               (set-marker target (point-marker)))
             (if moving
@@ -489,7 +494,8 @@ Returns what was actually sent, or nil if nothing was sent."
 
    ((eshell-processp target)
     (when (eq (process-status target) 'run)
-      (setq object (eshell-stringify object))
+      (unless (stringp object)
+        (setq object (eshell-stringify object)))
       (process-send-string target object)))
 
    ((consp target)
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index 4c8ffceef78..dcbf77364f4 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -1,6 +1,6 @@
 ;;; esh-module.el --- Eshell modules
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2004 Free Software Foundation
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes
@@ -41,32 +41,33 @@ customizing the variable `eshell-modules-list'."
 
 (defun eshell-load-defgroups (&optional directory)
   "Load `defgroup' statements from Eshell's module files."
-  (with-current-buffer
-      (find-file-noselect (expand-file-name "esh-groups.el" directory))
-    (erase-buffer)
-    (insert ";;; do not modify this file; it is auto-generated -*- no-byte-compile: t -*-\n\n")
-    (let ((files (directory-files (or directory
-                                      (car command-line-args-left))
-                                  nil "\\`em-.*\\.el\\'")))
-      (while files
-        (message "Loading defgroup from `%s'" (car files))
-        (let (defgroup)
-          (catch 'handled
-            (with-current-buffer (find-file-noselect (car files))
-              (goto-char (point-min))
-              (while t
-                (forward-sexp)
-                (if (eobp) (throw 'handled t))
-                (backward-sexp)
-                (let ((begin (point))
-                      (defg (looking-at "(defgroup")))
+  (let ((vc-handled-backends nil)) ; avoid VC fucking things up
+    (with-current-buffer
+        (find-file-noselect (expand-file-name "esh-groups.el" directory))
+      (erase-buffer)
+      (insert ";;; do not modify this file; it is auto-generated -*- no-byte-compile: t -*-\n\n")
+      (let ((files (directory-files (or directory
+                                        (car command-line-args-left))
+                                    nil "\\`em-.*\\.el\\'")))
+        (while files
+          (message "Loading defgroup from `%s'" (car files))
+          (let (defgroup)
+            (catch 'handled
+              (with-current-buffer (find-file-noselect (car files))
+                (goto-char (point-min))
+                (while t
                   (forward-sexp)
-                  (if defg
-                      (setq defgroup (buffer-substring begin (point))))))))
-          (if defgroup
-              (insert defgroup "\n\n")))
-        (setq files (cdr files))))
-    (save-buffer)))
+                  (if (eobp) (throw 'handled t))
+                  (backward-sexp)
+                  (let ((begin (point))
+                        (defg (looking-at "(defgroup")))
+                    (forward-sexp)
+                    (if defg
+                        (setq defgroup (buffer-substring begin (point))))))))
+            (if defgroup
+                (insert defgroup "\n\n")))
+          (setq files (cdr files))))
+      (save-buffer))))
 
 ;; load the defgroup's for the standard extension modules, so that
 ;; documentation can be provided when the user customize's
diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el
index 54edf5e35ab..076505da14e 100644
--- a/lisp/eshell/esh-test.el
+++ b/lisp/eshell/esh-test.el
@@ -167,13 +167,7 @@
       (local-set-key [(control ?m)] 'eshell-test-goto-func)
       (local-set-key [return] 'eshell-test-goto-func)
 
-      (insert "Testing Eshell under "
-              (format "GNU Emacs %s (%s%s)"
-                      emacs-version
-                      system-configuration
-                      (cond ((featurep 'motif) ", Motif")
-                            ((featurep 'x-toolkit) ", X toolkit")
-                            (t ""))))
+      (insert "Testing Eshell under " (emacs-version))
       (switch-to-buffer test-buffer)
       (delete-other-windows))
     (eshell-for funcname (sort (all-completions "eshell-test--"