merge from upstream. currently seems to have bitroted and i get segfaults

29 files changed, 173 insertions, 255 deletions

diff --git a/lisp/eshell/.gitignore b/lisp/eshell/.gitignore
index 8f16f9600f5..2abf84ba3ee 100644
--- a/lisp/eshell/.gitignore
+++ b/lisp/eshell/.gitignore
@@ -1,3 +1,2 @@
 esh-groups.el
 
-# arch-tag: 270e983f-fee5-4b6d-a00b-c1bafdee8690
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 6b24c269b30..aa138cb4dcb 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -1,7 +1,6 @@
 ;;; em-alias.el --- creation and management of command aliases
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -279,5 +278,4 @@ These are all the command aliases which begin with NAME."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 8b018fc1-4e07-4ccc-aa73-c0a1ba361f82
 ;;; em-alias.el ends here
diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index 9087cae369c..b2ebde98cee 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -1,7 +1,6 @@
 ;;; em-banner.el --- sample module that displays a login banner
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -96,5 +95,4 @@ This can be any sexp, and should end with at least two newlines."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: e738b4ef-8671-42ae-a757-291779b92491
 ;;; em-banner.el ends here
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index ce72f752d42..df1987e13ee 100644
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -1,7 +1,6 @@
 ;;; em-basic.el --- basic shell builtin commands
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -184,5 +183,4 @@ or `eshell-printn' for display."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 385a31b1-cb95-46f0-9829-9d352ee77db8
 ;;; em-basic.el ends here
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 554e010a1b3..f3f104c1ede 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -1,7 +1,6 @@
 ;;; em-cmpl.el --- completion using the TAB key
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -455,5 +454,4 @@ to writing a completion function."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 0e914699-673a-45f8-8cbf-82e1dbc571bc
 ;;; em-cmpl.el ends here
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index f4b2575def2..64555ab15ef 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -1,7 +1,6 @@
 ;;; em-dirs.el --- directory navigation commands
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -573,5 +572,4 @@ in the minibuffer:
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 1e9c5a95-f1bd-45f8-ad36-55aac706e787
 ;;; em-dirs.el ends here
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 2f29f3d0aee..2a565c5c827 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -1,7 +1,6 @@
 ;;; em-glob.el --- extended file name globbing
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -246,7 +245,7 @@ the form:
 
    (INCLUDE-REGEXP EXCLUDE-REGEXP (PRED-FUNC-LIST) (MOD-FUNC-LIST))"
   (let ((paths (eshell-split-path glob))
-        matches message-shown ange-cache)
+        eshell-glob-matches message-shown ange-cache)
     (unwind-protect
         (if (and (cdr paths)
                  (file-name-absolute-p (car paths)))
@@ -255,15 +254,15 @@ the form:
           (eshell-glob-entries (file-name-as-directory ".") paths))
       (if message-shown
           (message nil)))
-    (or (and matches (sort matches #'string<))
+    (or (and eshell-glob-matches (sort eshell-glob-matches #'string<))
         (if eshell-error-if-no-glob
             (error "No matches found: %s" glob)
           glob))))
 
-(defvar matches)
+(defvar eshell-glob-matches)
 (defvar message-shown)
 
-;; FIXME does this really need to abuse matches, message-shown?
+;; FIXME does this really need to abuse eshell-glob-matches, message-shown?
 (defun eshell-glob-entries (path globs &optional recurse-p)
   "Glob the entries in PATHS, possibly recursing if RECURSE-P is non-nil."
   (let* ((entries (ignore-errors
@@ -319,7 +318,7 @@ the form:
                    "\\`\\.")))
     (when (and recurse-p eshell-glob-show-progress)
       (message "Building file list...%d so far: %s"
-               (length matches) path)
+               (length eshell-glob-matches) path)
       (setq message-shown t))
     (if (equal path "./") (setq path ""))
     (while entries
@@ -332,7 +331,8 @@ the form:
           (if (cdr globs)
               (if isdir
                   (setq dirs (cons (concat path name) dirs)))
-            (setq matches (cons (concat path name) matches))))
+            (setq eshell-glob-matches
+                  (cons (concat path name) eshell-glob-matches))))
       (if (and recurse-p isdir
                (or (> len 3)
                    (not (or (and (= len 2) (equal name "./"))
@@ -358,5 +358,4 @@ the form:
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: d0548f54-fb7c-4978-a88e-f7c26f7f68ca
 ;;; em-glob.el ends here
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 1f644261337..5ec529f4b8f 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -1,7 +1,6 @@
 ;;; em-hist.el --- history list management
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -837,6 +836,8 @@ With prefix argument N, search for Nth previous match.
 If N is negative, find the next or Nth next match."
   (interactive (eshell-regexp-arg "Previous input matching (regexp): "))
   (setq arg (eshell-search-arg arg))
+  (if (> eshell-last-output-end (point))
+      (error "Point not located after prompt"))
   (let ((pos (eshell-previous-matching-input-string-position regexp arg)))
     ;; Has a match been found?
     (if (null pos)
@@ -844,7 +845,7 @@ If N is negative, find the next or Nth next match."
       (setq eshell-history-index pos)
       (unless (minibuffer-window-active-p (selected-window))
         (message "History item: %d" (- (ring-length eshell-history-ring) pos)))
-       ;; Can't use kill-region as it sets this-command
+      ;; Can't use kill-region as it sets this-command
       (delete-region eshell-last-output-end (point))
       (insert-and-inherit (eshell-get-history pos)))))
 
@@ -996,5 +997,4 @@ If N is negative, search backwards for the -Nth previous match."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 1a847333-f864-4b96-9acd-b549d620b6c6
 ;;; em-hist.el ends here
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index db2a21cd319..7714629f2fa 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -1,7 +1,6 @@
 ;;; em-ls.el --- implementation of ls in Lisp
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -612,11 +611,11 @@ In Eshell's implementation of ls, ENTRIES is always reversed."
              (let ((result
                     (cond
                      ((eq sort-method 'by-atime)
-                      (eshell-ls-compare-entries l r 4 'eshell-time-less-p))
+                      (eshell-ls-compare-entries l r 4 'time-less-p))
                      ((eq sort-method 'by-mtime)
-                      (eshell-ls-compare-entries l r 5 'eshell-time-less-p))
+                      (eshell-ls-compare-entries l r 5 'time-less-p))
                      ((eq sort-method 'by-ctime)
-                      (eshell-ls-compare-entries l r 6 'eshell-time-less-p))
+                      (eshell-ls-compare-entries l r 6 'time-less-p))
                      ((eq sort-method 'by-size)
                       (eshell-ls-compare-entries l r 7 '<))
                      ((eq sort-method 'by-extension)
@@ -941,5 +940,4 @@ to use, and each member of which is the width of that column
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 9295181c-0cb2-499c-999b-89f5359842cb
 ;;; em-ls.el ends here
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index 15a3deea30c..33085c067fd 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -1,7 +1,6 @@
 ;;; em-pred.el --- argument predicates and modifiers (ala zsh)
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -427,7 +426,7 @@ returning the resultant string."
       (forward-char))
     (if (looking-at "[0-9]+")
         (progn
-          (setq when (- (eshell-time-to-seconds (current-time))
+          (setq when (- (float-time)
                         (* (string-to-number (match-string 0))
                            quantum)))
           (goto-char (match-end 0)))
@@ -444,7 +443,7 @@ returning the resultant string."
              (attrs (file-attributes file)))
         (unless attrs
           (error "Cannot stat file `%s'" file))
-        (setq when (eshell-time-to-seconds (nth attr-index attrs))))
+        (setq when (float-time (nth attr-index attrs))))
       (goto-char (1+ end)))
     `(lambda (file)
        (let ((attrs (file-attributes file)))
@@ -453,7 +452,7 @@ returning the resultant string."
                    '<
                  (if (eq qual ?+)
                      '>
-                   '=)) ,when (eshell-time-to-seconds
+                   '=)) ,when (float-time
                                (nth ,attr-index attrs))))))))
 
 (defun eshell-pred-file-type (type)
@@ -605,5 +604,4 @@ that 'ls -l' will show in the first column of its display. "
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 8b5ce022-17f3-4c40-93c7-5faafaa63f31
 ;;; em-pred.el ends here
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 29e1ace26b1..448d2cdf303 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -1,7 +1,6 @@
 ;;; em-prompt.el --- command prompts
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -177,5 +176,4 @@ If this takes us past the end of the current line, don't skip at all."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 01c1574b-ce70-4e89-bc38-e6619f61e208
 ;;; em-prompt.el ends here
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index 9b208d64803..6def23e1b71 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -1,7 +1,6 @@
 ;;; em-rebind.el --- rebind keys when point is at current input
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -91,7 +90,6 @@ This is default behavior of shells like bash."
   '(beginning-of-line-text
     beginning-of-line
     move-to-column
-    move-to-column-force
     move-to-left-margin
     move-to-tab-stop
     forward-char
@@ -247,5 +245,4 @@ input."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 76d84f12-cc56-4d67-9b7d-c6b44ad20530
 ;;; em-rebind.el ends here
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index 183faa1dd77..ed4ad1c0712 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -1,7 +1,6 @@
 ;;; em-script.el --- Eshell script files
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -90,23 +89,25 @@ Comments begin with '#'."
   (interactive "f")
   (let ((orig (point))
         (here (point-max))
-        (inhibit-point-motion-hooks t)
-        after-change-functions)
+        (inhibit-point-motion-hooks t))
     (goto-char (point-max))
-    (insert-file-contents file)
-    (goto-char (point-max))
-    (throw 'eshell-replace-command
-           (prog1
-               (list 'let
-                     (list (list 'eshell-command-name (list 'quote file))
-                           (list 'eshell-command-arguments
-                                 (list 'quote args)))
-                     (let ((cmd (eshell-parse-command (cons here (point)))))
-                       (if subcommand-p
-                           (setq cmd (list 'eshell-as-subcommand cmd)))
-                       cmd))
-             (delete-region here (point))
-             (goto-char orig)))))
+    (with-silent-modifications
+      ;; FIXME: Why not use a temporary buffer and avoid this
+      ;; "insert&delete" business?  --Stef
+      (insert-file-contents file)
+      (goto-char (point-max))
+      (throw 'eshell-replace-command
+             (prog1
+                 (list 'let
+                       (list (list 'eshell-command-name (list 'quote file))
+                             (list 'eshell-command-arguments
+                                   (list 'quote args)))
+                       (let ((cmd (eshell-parse-command (cons here (point)))))
+                         (if subcommand-p
+                             (setq cmd (list 'eshell-as-subcommand cmd)))
+                         cmd))
+               (delete-region here (point))
+               (goto-char orig))))))
 
 (defun eshell/source (&rest args)
   "Source a file in a subshell environment."
@@ -140,5 +141,4 @@ environment, binding ARGS to $1, $2, etc.")
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: a346439d-5ba8-4faf-ac2b-3aacfeaa4647
 ;;; em-script.el ends here
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index afe3cf826b1..2c54930e439 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -1,7 +1,6 @@
 ;;; em-smart.el --- smart display of output
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -327,5 +326,4 @@ and the end of the buffer are still visible."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 8c0112c7-379c-4d54-9a1c-204d68786a4b
 ;;; em-smart.el ends here
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index bd27d9f262e..be394ba5b22 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -1,7 +1,6 @@
 ;;; em-term.el --- running visual commands
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -267,5 +266,4 @@ allowed."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: ab7c8fe4-3101-4257-925b-1354c6b2fe9d
 ;;; em-term.el ends here
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 7d0ff22ceb6..dc5650d240e 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -1,7 +1,6 @@
 ;;; em-unix.el --- UNIX command aliases
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -154,10 +153,10 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine."
 (defalias 'eshell/basename 'file-name-nondirectory)
 (defalias 'eshell/dirname  'file-name-directory)
 
-(defvar interactive)
-(defvar preview)
-(defvar recursive)
-(defvar verbose)
+(defvar em-interactive)
+(defvar em-preview)
+(defvar em-recursive)
+(defvar em-verbose)
 
 (defun eshell/man (&rest args)
   "Invoke man, flattening the arguments appropriately."
@@ -203,32 +202,26 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine."
             (eshell-error "rm: cannot remove `.' or `..'\n"))
       (if (and (file-directory-p (car files))
                (not (file-symlink-p (car files))))
-          (let ((dir (file-name-as-directory (car files))))
-            (eshell-remove-entries dir
-                                   (mapcar
-                                    (function
-                                     (lambda (file)
-                                       (concat dir file)))
-                                    (directory-files dir)))
-            (if verbose
+          (progn
+            (if em-verbose
                 (eshell-printn (format "rm: removing directory `%s'"
                                        (car files))))
             (unless
-                (or preview
-                    (and interactive
+                (or em-preview
+                    (and em-interactive
                          (not (y-or-n-p
                                (format "rm: remove directory `%s'? "
                                        (car files))))))
-              (eshell-funcalln 'delete-directory (car files))))
-        (if verbose
+              (eshell-funcalln 'delete-directory (car files) t t)))
+        (if em-verbose
             (eshell-printn (format "rm: removing file `%s'"
                                    (car files))))
-        (unless (or preview
-                    (and interactive
+        (unless (or em-preview
+                    (and em-interactive
                          (not (y-or-n-p
                                (format "rm: remove `%s'? "
                                        (car files))))))
-          (eshell-funcalln 'delete-file (car files)))))
+          (eshell-funcalln 'delete-file (car files) t))))
     (setq files (cdr files))))
 
 (defun eshell/rm (&rest args)
@@ -241,21 +234,21 @@ argument."
    "rm" args
    '((?h "help" nil nil "show this usage screen")
      (?f "force" nil force-removal "force removal")
-     (?i "interactive" nil interactive "prompt before any removal")
-     (?n "preview" nil preview "don't change anything on disk")
-     (?r "recursive" nil recursive
+     (?i "interactive" nil em-interactive "prompt before any removal")
+     (?n "preview" nil em-preview "don't change anything on disk")
+     (?r "recursive" nil em-recursive
          "remove the contents of directories recursively")
-     (?R nil nil recursive "(same)")
-     (?v "verbose" nil verbose "explain what is being done")
+     (?R nil nil em-recursive "(same)")
+     (?v "verbose" nil em-verbose "explain what is being done")
      :preserve-args
      :external "rm"
      :show-usage
      :usage "[OPTION]... FILE...
 Remove (unlink) the FILE(s).")
-   (unless interactive
-     (setq interactive eshell-rm-interactive-query))
-   (if (and force-removal interactive)
-       (setq interactive nil))
+   (unless em-interactive
+     (setq em-interactive eshell-rm-interactive-query))
+   (if (and force-removal em-interactive)
+       (setq em-interactive nil))
    (while args
      (let ((entry (if (stringp (car args))
                       (directory-file-name (car args))
@@ -264,37 +257,37 @@ Remove (unlink) the FILE(s).")
                       (car args)))))
        (cond
         ((bufferp entry)
-         (if verbose
+         (if em-verbose
              (eshell-printn (format "rm: removing buffer `%s'" entry)))
-         (unless (or preview
-                     (and interactive
+         (unless (or em-preview
+                     (and em-interactive
                           (not (y-or-n-p (format "rm: delete buffer `%s'? "
                                                  entry)))))
            (eshell-funcalln 'kill-buffer entry)))
         ((eshell-processp entry)
-         (if verbose
+         (if em-verbose
              (eshell-printn (format "rm: killing process `%s'" entry)))
-         (unless (or preview
-                     (and interactive
+         (unless (or em-preview
+                     (and em-interactive
                           (not (y-or-n-p (format "rm: kill process `%s'? "
                                                  entry)))))
            (eshell-funcalln 'kill-process entry)))
         ((symbolp entry)
-         (if verbose
+         (if em-verbose
              (eshell-printn (format "rm: uninterning symbol `%s'" entry)))
          (unless
-             (or preview
-                 (and interactive
+             (or em-preview
+                 (and em-interactive
                       (not (y-or-n-p (format "rm: unintern symbol `%s'? "
                                              entry)))))
            (eshell-funcalln 'unintern entry)))
         ((stringp entry)
          (if (and (file-directory-p entry)
                   (not (file-symlink-p entry)))
-             (if (or recursive
+             (if (or em-recursive
                      eshell-rm-removes-directories)
-                 (if (or preview
-                         (not interactive)
+                 (if (or em-preview
+                         (not em-interactive)
                          (y-or-n-p
                           (format "rm: descend into directory `%s'? "
                                   entry)))
@@ -339,8 +332,6 @@ Remove the DIRECTORY(ies), if they are empty.")
 (put 'eshell/rmdir 'eshell-no-numeric-conversions t)
 
 (defvar no-dereference)
-(defvar preview)
-(defvar verbose)
 
 (defvar eshell-warn-dot-directories t)
 
@@ -348,9 +339,9 @@ Remove the DIRECTORY(ies), if they are empty.")
   "Shuffle around some filesystem entries, using FUNC to do the work."
   (let ((attr-target (eshell-file-attributes target))
         (is-dir (or (file-directory-p target)
-                    (and preview (not eshell-warn-dot-directories))))
+                    (and em-preview (not eshell-warn-dot-directories))))
         attr)
-    (if (and (not preview) (not is-dir)
+    (if (and (not em-preview) (not is-dir)
              (> (length files) 1))
         (error "%s: when %s multiple files, last argument must be a directory"
                command action))
@@ -387,7 +378,7 @@ Remove the DIRECTORY(ies), if they are empty.")
                    (not (memq func '(make-symbolic-link
                                      add-name-to-file))))
               (if (and (eq func 'copy-file)
-                       (not recursive))
+                       (not em-recursive))
                   (eshell-error (format "%s: %s: omitting directory\n"
                                         command (car files)))
                 (let (eshell-warn-dot-directories)
@@ -405,11 +396,11 @@ Remove the DIRECTORY(ies), if they are empty.")
                                              (expand-file-name target)))))))
                       (apply 'eshell-funcalln func source target args)
                   (unless (file-directory-p target)
-                    (if verbose
+                    (if em-verbose
                         (eshell-printn
                          (format "%s: making directory %s"
                                  command target)))
-                    (unless preview
+                    (unless em-preview
                       (eshell-funcalln 'make-directory target)))
                   (apply 'eshell-shuffle-files
                          command action
@@ -420,16 +411,16 @@ Remove the DIRECTORY(ies), if they are empty.")
                           (directory-files source))
                          target func t args)
                   (when (eq func 'rename-file)
-                    (if verbose
+                    (if em-verbose
                         (eshell-printn
                          (format "%s: deleting directory %s"
                                  command source)))
-                    (unless preview
+                    (unless em-preview
                       (eshell-funcalln 'delete-directory source))))))
-            (if verbose
+            (if em-verbose
                 (eshell-printn (format "%s: %s -> %s" command
                                        source target)))
-            (unless preview
+            (unless em-preview
               (if (and no-dereference
                        (setq link (file-symlink-p source)))
                   (progn
@@ -454,7 +445,7 @@ Remove the DIRECTORY(ies), if they are empty.")
     (if (file-exists-p archive)
         (setq tar-args (concat "u" tar-args))
       (setq tar-args (concat "c" tar-args)))
-    (if verbose
+    (if em-verbose
         (setq tar-args (concat "v" tar-args)))
     (if (equal command "mv")
         (setq tar-args (concat "--remove-files -" tar-args)))
@@ -487,7 +478,7 @@ Remove the DIRECTORY(ies), if they are empty.")
          (eshell-shuffle-files
           ,command ,action args target ,func nil
           ,@(append
-             `((if (and (or interactive
+             `((if (and (or em-interactive
                             ,query-var)
                         (not force))
                    1 (or force ,force-var)))
@@ -501,11 +492,11 @@ Remove the DIRECTORY(ies), if they are empty.")
    "mv" args
    '((?f "force" nil force
          "remove existing destinations, never prompt")
-     (?i "interactive" nil interactive
+     (?i "interactive" nil em-interactive
          "request confirmation if target already exists")
-     (?n "preview" nil preview
+     (?n "preview" nil em-preview
          "don't change anything on disk")
-     (?v "verbose" nil verbose
+     (?v "verbose" nil em-verbose
          "explain what is being done")
      (nil "help" nil nil "show this usage screen")
      :preserve-args
@@ -532,15 +523,15 @@ Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.
          "preserve links")
      (?f "force" nil force
          "remove existing destinations, never prompt")
-     (?i "interactive" nil interactive
+     (?i "interactive" nil em-interactive
          "request confirmation if target already exists")
-     (?n "preview" nil preview
+     (?n "preview" nil em-preview
          "don't change anything on disk")
      (?p "preserve" nil preserve
          "preserve file attributes if possible")
-     (?R "recursive" nil recursive
+     (?R "recursive" nil em-recursive
          "copy directories recursively")
-     (?v "verbose" nil verbose
+     (?v "verbose" nil em-verbose
          "explain what is being done")
      (nil "help" nil nil "show this usage screen")
      :preserve-args
@@ -550,7 +541,7 @@ Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.
    or:  cp [OPTION]... SOURCE... DIRECTORY
 Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.")
    (if archive
-       (setq preserve t no-dereference t recursive t))
+       (setq preserve t no-dereference t em-recursive t))
    (eshell-mvcpln-template "cp" "copying" 'copy-file
                            eshell-cp-interactive-query
                            eshell-cp-overwrite-files preserve)))
@@ -564,12 +555,12 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.")
    '((?h "help" nil nil "show this usage screen")
      (?s "symbolic" nil symbolic
          "make symbolic links instead of hard links")
-     (?i "interactive" nil interactive
+     (?i "interactive" nil em-interactive
          "request confirmation if target already exists")
      (?f "force" nil force "remove existing destinations, never prompt")
-     (?n "preview" nil preview
+     (?n "preview" nil em-preview
          "don't change anything on disk")
-     (?v "verbose" nil verbose "explain what is being done")
+     (?v "verbose" nil em-verbose "explain what is being done")
      :preserve-args
      :external "ln"
      :show-usage
@@ -920,9 +911,7 @@ Summarize disk usage of each FILE, recursively for directories.")
 (defvar eshell-time-start nil)
 
 (defun eshell-show-elapsed-time ()
-  (let ((elapsed (format "%.3f secs\n"
-                         (- (eshell-time-to-seconds (current-time))
-                            eshell-time-start))))
+  (let ((elapsed (format "%.3f secs\n" (- (float-time) eshell-time-start))))
     (set-text-properties 0 (length elapsed) '(face bold) elapsed)
     (eshell-interactive-print elapsed))
   (remove-hook 'eshell-post-command-hook 'eshell-show-elapsed-time t))
@@ -948,7 +937,7 @@ Summarize disk usage of each FILE, recursively for directories.")
        :show-usage
        :usage "COMMAND...
 Show wall-clock time elapsed during execution of COMMAND.")
-     (setq eshell-time-start (eshell-time-to-seconds (current-time)))
+     (setq eshell-time-start (float-time))
      (add-hook 'eshell-post-command-hook 'eshell-show-elapsed-time nil t)
      ;; after setting
      (throw 'eshell-replace-command
@@ -1127,5 +1116,4 @@ Execute a COMMAND as the superuser or another USER.")
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 2462edd2-a76a-4cf2-897d-92e9a82ac1c9
 ;;; em-unix.el ends here
diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index 6f49bf4e0f6..50bda108e95 100644
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -1,7 +1,6 @@
 ;;; em-xtra.el --- extra alias functions
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -123,5 +122,4 @@ naturally accessible within Emacs."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: f944cfda-a118-470c-a0d6-b41a3a5c99c7
 ;;; em-xtra.el ends here
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 6395fe22d87..f42440ae4ec 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -1,7 +1,6 @@
 ;;; esh-arg.el --- argument processing
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -123,7 +122,7 @@ treated as a literal character."
   :type 'hook
   :group 'eshell-arg)
 
-(defcustom eshell-delimiter-argument-list '(?\; ?& ?\| ?\> ?  ?\t ?\n)
+(defcustom eshell-delimiter-argument-list '(?\; ?& ?\| ?\> ?\s ?\t ?\n)
   "List of characters to recognize as argument separators."
   :type '(repeat character)
   :group 'eshell-arg)
@@ -214,25 +213,24 @@ Point is left at the end of the arguments."
       (narrow-to-region beg end)
       (let ((inhibit-point-motion-hooks t)
             (args (list t))
-            after-change-functions
             delim)
-        (remove-text-properties (point-min) (point-max)
-                                '(arg-begin nil arg-end nil))
-        (if (setq
-             delim
-             (catch 'eshell-incomplete
-               (while (not (eobp))
-                 (let* ((here (point))
-                        (arg (eshell-parse-argument)))
-                   (if (= (point) here)
-                       (error "Failed to parse argument '%s'"
-                              (buffer-substring here (point-max))))
-                   (and arg (nconc args (list arg)))))))
-            (if (listp delim)
-                (throw 'eshell-incomplete delim)
-              (throw 'eshell-incomplete
-                     (list delim (point) (cdr args)))))
-        (cdr args)))))
+        (with-silent-modifications
+          (remove-text-properties (point-min) (point-max)
+                                  '(arg-begin nil arg-end nil))
+          (if (setq
+               delim
+               (catch 'eshell-incomplete
+                 (while (not (eobp))
+                   (let* ((here (point))
+                          (arg (eshell-parse-argument)))
+                     (if (= (point) here)
+                         (error "Failed to parse argument '%s'"
+                                (buffer-substring here (point-max))))
+                     (and arg (nconc args (list arg)))))))
+              (throw 'eshell-incomplete (if (listp delim)
+                                            delim
+                                          (list delim (point) (cdr args)))))
+          (cdr args))))))
 
 (defun eshell-parse-argument ()
   "Get the next argument.  Leave point after it."
@@ -392,5 +390,4 @@ special character that is not itself a backslash."
                    (char-to-string (char-after)))))
          (goto-char end)))))))
 
-;; arch-tag: 7f593a2b-8fc1-4def-8f84-8f51ed0198d6
 ;;; esh-arg.el ends here
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 0dc1cb26fa9..0567beb9a53 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1,7 +1,6 @@
 ;;; esh-cmd.el --- command invocation
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -355,12 +354,14 @@ hooks should be run before and after the command."
            (if (consp command)
                (eshell-parse-arguments (car command) (cdr command))
              (let ((here (point))
-                   (inhibit-point-motion-hooks t)
-                   after-change-functions)
-               (insert command)
-               (prog1
-                   (eshell-parse-arguments here (point))
-                 (delete-region here (point)))))
+                   (inhibit-point-motion-hooks t))
+               (with-silent-modifications
+                 ;; FIXME: Why not use a temporary buffer and avoid this
+                 ;; "insert&delete" business?  --Stef
+                 (insert command)
+                 (prog1
+                     (eshell-parse-arguments here (point))
+                   (delete-region here (point))))))
            args))
          (commands
           (mapcar
@@ -1432,5 +1433,4 @@ messages, and errors."
 
 (provide 'esh-cmd)
 
-;; arch-tag: 8e4f3867-a0c5-441f-96ba-ddd142d94366
 ;;; esh-cmd.el ends here
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 8a3f86a3997..f0b9a5eb083 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -1,7 +1,6 @@
 ;;; esh-ext.el --- commands external to Eshell
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -306,5 +305,4 @@ line of the form #!<interp>."
                             (cdr interp)))))
           (or interp (list fullname)))))))
 
-;; arch-tag: 178d4064-7e60-4745-b81f-bab5d8d7c40f
 ;;; esh-ext.el ends here
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 53b6fd2163e..ef8966f1d7d 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -1,7 +1,6 @@
 ;;; esh-io.el --- I/O management
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -516,5 +515,4 @@ Returns what was actually sent, or nil if nothing was sent."
         (eshell-output-object-to-target object (car target))
         (setq target (cdr target))))))
 
-;; arch-tag: 9ca2080f-d5e0-4b26-aa0b-d59194a905a2
 ;;; esh-io.el ends here
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 4477f138478..3735ee35fd5 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -1,7 +1,6 @@
 ;;; esh-mode.el --- user interface
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -1083,5 +1082,4 @@ This function could be in the list `eshell-output-filter-functions'."
 (custom-add-option 'eshell-output-filter-functions
                    'eshell-handle-ansi-color)
 
-;; arch-tag: ec65bc2b-da14-4547-81d3-a32af3a4dc57
 ;;; esh-mode.el ends here
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index cf66f626485..5a62c71355c 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -1,7 +1,6 @@
 ;;; esh-module.el --- Eshell modules
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes
@@ -100,5 +99,4 @@ customization group.  Example: `eshell-cmpl' for that module."
           (unload-feature module)
           (message "Unloading %s...done" (symbol-name module))))))
 
-;; arch-tag: 97a3fa16-9d08-40e6-bc2c-36bd70986507
 ;;; esh-module.el ends here
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 91ba13be896..d7162406879 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -1,7 +1,6 @@
 ;;; esh-opt.el --- command options processing
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -64,10 +63,9 @@ interned variable `args' (created using a `let' form)."
                macro-args
              (list 'eshell-stringify-list
                    (list 'eshell-flatten-list macro-args)))))
-     (let ,(append (mapcar (function
-                            (lambda (opt)
-                              (or (and (listp opt) (nth 3 opt))
-                                  'eshell-option-stub)))
+     (let ,(append (mapcar (lambda (opt)
+                             (or (and (listp opt) (nth 3 opt))
+                                 'eshell-option-stub))
                            (cadr options))
                    '(usage-msg last-value ext-command args))
        (eshell-do-opt ,name ,options (quote ,body-forms)))))
@@ -78,6 +76,7 @@ interned variable `args' (created using a `let' form)."
 (defvar last-value)
 (defvar usage-msg)
 (defvar ext-command)
+;; Documented part of the interface; see eshell-eval-using-options.
 (defvar args)
 
 (defun eshell-do-opt (name options body-forms)
@@ -224,5 +223,4 @@ This assumes that symbols have been intern'd by `eshell-with-options'."
                 (setq index (1+ index)))))))))
   args)
 
-;; arch-tag: 45c6c2d0-8091-46a1-a205-2f4bafd8230c
 ;;; esh-opt.el ends here
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index ccc36ed9949..f697a400556 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -1,7 +1,6 @@
 ;;; esh-proc.el --- process management
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -527,5 +526,4 @@ See the variable `eshell-kill-processes-on-exit'."
   (eshell-send-input nil nil t)
   (eshell-process-interact 'process-send-eof))
 
-;; arch-tag: ac477a3e-ee4d-4b44-8ec6-212010e607bb
 ;;; esh-proc.el ends here
diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el
index 971d0cd63e6..f5c55dd8ae7 100644
--- a/lisp/eshell/esh-test.el
+++ b/lisp/eshell/esh-test.el
@@ -1,7 +1,6 @@
 ;;; esh-test.el --- Eshell test suite
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -150,7 +149,7 @@
 (defun eshell-test (&optional arg)
   "Test Eshell to verify that it works as expected."
   (interactive "P")
-  (let* ((begin (eshell-time-to-seconds (current-time)))
+  (let* ((begin (float-time))
          (test-buffer (get-buffer-create "*eshell test*")))
     (set-buffer (let ((inhibit-redisplay t))
                   (save-window-excursion (eshell t))))
@@ -176,8 +175,7 @@
     (with-current-buffer test-buffer
       (insert (format "\n\n--- %s --- (completed in %d seconds)\n"
                       (current-time-string)
-                      (- (eshell-time-to-seconds (current-time))
-                         begin)))
+                      (- (float-time) begin)))
       (message "Eshell test suite completed: %s failure%s"
                (if (> eshell-test-failures 0)
                    (number-to-string eshell-test-failures)
@@ -223,14 +221,13 @@
                   (if (eq eshell-show-usage-metrics t)
                       (- eshell-metric-after-command
                          eshell-metric-before-command 7)
-                    (- (eshell-time-to-seconds
+                    (- (float-time
                         eshell-metric-after-command)
-                       (eshell-time-to-seconds
+                       (float-time
                         eshell-metric-before-command))))
                  "\n"))))
             nil t))
 
 (provide 'esh-test)
 
-;; arch-tag: 6e32275a-8285-4a4e-b7cf-819aa7c86b8e
 ;;; esh-test.el ends here
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 377fd6b08e4..2de147acb00 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -1,7 +1,6 @@
 ;;; esh-util.el --- general utilities
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -341,20 +340,6 @@ Prepend remote identification of `default-directory', if any."
   "Flatten and stringify all of the ARGS into a single string."
   (mapconcat 'eshell-stringify (eshell-flatten-list args) " "))
 
-;; the next two are from GNUS, and really should be made part of Emacs
-;; some day
-(defsubst eshell-time-less-p (t1 t2)
-  "Say whether time T1 is less than time T2."
-  (or (< (car t1) (car t2))
-      (and (= (car t1) (car t2))
-           (< (nth 1 t1) (nth 1 t2)))))
-
-(defsubst eshell-time-to-seconds (time)
-  "Convert TIME to a floating point number."
-  (+ (* (car time) 65536.0)
-     (cadr time)
-     (/ (or (car (cdr (cdr time))) 0) 1000000.0)))
-
 (defsubst eshell-directory-files (regexp &optional directory)
   "Return a list of files in the given DIRECTORY matching REGEXP."
   (directory-files (or directory default-directory)
@@ -468,7 +453,7 @@ list."
   "Read the contents of /etc/passwd for user names."
   (if (or (not (symbol-value result-var))
           (not (symbol-value timestamp-var))
-          (eshell-time-less-p
+          (time-less-p
            (symbol-value timestamp-var)
            (nth 5 (file-attributes file))))
       (progn
@@ -522,7 +507,7 @@ list."
   "Read the contents of /etc/passwd for user names."
   (if (or (not (symbol-value result-var))
           (not (symbol-value timestamp-var))
-          (eshell-time-less-p
+          (time-less-p
            (symbol-value timestamp-var)
            (nth 5 (file-attributes file))))
       (progn
@@ -536,25 +521,18 @@ list."
       (eshell-read-hosts eshell-hosts-file 'eshell-host-names
                          'eshell-host-timestamp)))
 
-(unless (fboundp 'line-end-position)
-  (defsubst line-end-position (&optional N)
-    (save-excursion (end-of-line N) (point))))
-
-(unless (fboundp 'line-beginning-position)
-  (defsubst line-beginning-position (&optional N)
-    (save-excursion (beginning-of-line N) (point))))
-
-(unless (fboundp 'subst-char-in-string)
-  (defun subst-char-in-string (fromchar tochar string &optional inplace)
-    "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
+(and (featurep 'xemacs)
+     (not (fboundp 'subst-char-in-string))
+     (defun subst-char-in-string (fromchar tochar string &optional inplace)
+       "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
 Unless optional argument INPLACE is non-nil, return a new string."
-    (let ((i (length string))
-          (newstr (if inplace string (copy-sequence string))))
-      (while (> i 0)
-        (setq i (1- i))
-        (if (eq (aref newstr i) fromchar)
-            (aset newstr i tochar)))
-      newstr)))
+       (let ((i (length string))
+             (newstr (if inplace string (copy-sequence string))))
+         (while (> i 0)
+           (setq i (1- i))
+           (if (eq (aref newstr i) fromchar)
+               (aset newstr i tochar)))
+         newstr)))
 
 (defsubst eshell-copy-environment ()
   "Return an unrelated copy of `process-environment'."
@@ -594,8 +572,9 @@ Unless optional argument INPLACE is non-nil, return a new string."
           (substring string 0 sublen)
         string)))
 
-(unless (fboundp 'directory-files-and-attributes)
-  (defun directory-files-and-attributes (directory &optional full match nosort id-format)
+(and (featurep 'xemacs)
+     (not (fboundp 'directory-files-and-attributes))
+     (defun directory-files-and-attributes (directory &optional full match nosort id-format)
     "Return a list of names of files and their attributes in DIRECTORY.
 There are three optional arguments:
 If FULL is non-nil, return absolute file names.  Otherwise return names
@@ -607,7 +586,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
       (mapcar
        (function
         (lambda (file)
-         (cons file (eshell-file-attributes (expand-file-name file directory)))))
+          (cons file (eshell-file-attributes (expand-file-name file directory)))))
        (directory-files directory full match nosort)))))
 
 (defvar ange-cache)
@@ -802,5 +781,4 @@ gid format.  Valid values are 'string and 'integer, defaulting to
 
 (provide 'esh-util)
 
-;; arch-tag: 70159778-5c7a-480a-bae4-3ad332fca19d
 ;;; esh-util.el ends here
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index f76d1de3c8d..4c42b305ec2 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -1,7 +1,6 @@
 ;;; esh-var.el --- handling of variables
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -653,5 +652,4 @@ For example, to retrieve the second element of a user's record in
       (setq pcomplete-stub (substring arg pos))
       (throw 'pcomplete-completions (pcomplete-entries)))))
 
-;; arch-tag: 393654fe-bdad-4f27-9a10-b1472ded14cf
 ;;; esh-var.el ends here
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 89ec3ab9c60..7690a102a9b 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -1,7 +1,6 @@
 ;;; eshell.el --- the Emacs command shell
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Version: 2.4.2
@@ -285,7 +284,8 @@ shells such as bash, zsh, rc, 4dos."
   "`eshell-buffer-name' is a member of `same-window-buffer-names'"
   (member eshell-buffer-name same-window-buffer-names))
 
-(defcustom eshell-directory-name (convert-standard-filename "~/.eshell/")
+(defcustom eshell-directory-name
+  (locate-user-emacs-file "eshell/" ".eshell/")
   "The directory where Eshell control files should be kept."
   :type 'directory
   :group 'eshell)
@@ -490,5 +490,4 @@ Emacs."
 
 (provide 'eshell)
 
-;; arch-tag: 9d4d5214-0e4e-4e02-b349-39add640d63f
 ;;; eshell.el ends here