Merge from trunk.

27 files changed, 266 insertions, 228 deletions

diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 04ba19d407d..940056b6438 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-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -95,11 +95,12 @@
 (require 'eshell)
 
 ;;;###autoload
-(eshell-defgroup eshell-alias nil
+(progn
+(defgroup eshell-alias nil
   "Command aliases allow for easy definition of alternate commands."
   :tag "Command aliases"
   ;; :link '(info-link "(eshell)Command aliases")
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 (defcustom eshell-aliases-file (expand-file-name "alias" eshell-directory-name)
   "The file in which aliases are kept.
@@ -132,10 +133,10 @@ Each element of this alias is a list of the form:
 Where NAME is the textual name of the alias, and DEFINITION is the
 command string to replace that command with.
 
-Note: this list should not be modified in your '.emacs' file.  Rather,
-any desired alias definitions should be declared using the `alias'
-command, which will automatically write them to the file named by
-`eshell-aliases-file'.")
+Note: this list should not be modified in your init file.
+Rather, any desired alias definitions should be declared using
+the `alias' command, which will automatically write them to the
+file named by `eshell-aliases-file'.")
 
 (put 'eshell-command-aliases-list 'risky-local-variable t)
 
diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index ce987f132e3..8fdad66f3f0 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -1,6 +1,6 @@
 ;;; em-banner.el --- sample module that displays a login banner
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -39,20 +39,21 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)
+  (require 'cl-lib)
   (require 'esh-mode)
   (require 'eshell))
 
 (require 'esh-util)
 
 ;;;###autoload
-(eshell-defgroup eshell-banner nil
+(progn
+(defgroup eshell-banner nil
   "This sample module displays a welcome banner at login.
 It exists so that others wishing to create their own Eshell extension
 modules may have a simple template to begin with."
   :tag "Login banner"
   ;; :link '(info-link "(eshell)Login banner")
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
@@ -76,10 +77,10 @@ This can be any sexp, and should end with at least two newlines."
   ;; `insert', because `insert' doesn't know how to interact with the
   ;; I/O code used by Eshell
   (unless eshell-non-interactive-p
-    (assert eshell-mode)
-    (assert eshell-banner-message)
+    (cl-assert eshell-mode)
+    (cl-assert eshell-banner-message)
     (let ((msg (eval eshell-banner-message)))
-      (assert msg)
+      (cl-assert msg)
       (eshell-interactive-print msg))))
 
 (provide 'em-banner)
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index df1987e13ee..e07bc75f89a 100644
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -1,6 +1,6 @@
 ;;; em-basic.el --- basic shell builtin commands
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -66,14 +66,15 @@
 (require 'esh-opt)
 
 ;;;###autoload
-(eshell-defgroup eshell-basic nil
+(progn
+(defgroup eshell-basic nil
   "The \"basic\" code provides a set of convenience functions which
 are traditionally considered shell builtins.  Since all of the
 functionality provided by them is accessible through Lisp, they are
 not really builtins at all, but offer a command-oriented way to do the
 same thing."
   :tag "Basic shell commands"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 (defcustom eshell-plain-echo-behavior nil
   "If non-nil, `echo' tries to behave like an ordinary shell echo.
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index c551684210c..b4c86e39e86 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -1,6 +1,6 @@
 ;;; em-cmpl.el --- completion using the TAB key
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -70,17 +70,18 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)
+  (require 'cl-lib)
   (require 'eshell))
 (require 'esh-util)
 
 ;;;###autoload
-(eshell-defgroup eshell-cmpl nil
+(progn
+(defgroup eshell-cmpl nil
   "This module provides a programmable completion function bound to
 the TAB key, which allows for completing command names, file names,
 variable names, arguments, etc."
   :tag "Argument completion"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
@@ -294,13 +295,14 @@ to writing a completion function."
     'pcomplete-expand-and-complete)
   (define-key eshell-command-map [space] 'pcomplete-expand)
   (define-key eshell-command-map [? ] 'pcomplete-expand)
-  (define-key eshell-mode-map [tab] 'pcomplete)
-  (define-key eshell-mode-map [(control ?i)] 'pcomplete)
+  (define-key eshell-mode-map [tab] 'eshell-pcomplete)
+  (define-key eshell-mode-map [(control ?i)] 'eshell-pcomplete)
+  (add-hook 'completion-at-point-functions
+            #'pcomplete-completions-at-point nil t)
   ;; jww (1999-10-19): Will this work on anything but X?
   (if (featurep 'xemacs)
       (define-key eshell-mode-map [iso-left-tab] 'pcomplete-reverse)
-    (define-key eshell-mode-map [(shift iso-lefttab)] 'pcomplete-reverse)
-    (define-key eshell-mode-map [(shift control ?i)] 'pcomplete-reverse))
+    (define-key eshell-mode-map [backtab] 'pcomplete-reverse))
   (define-key eshell-mode-map [(meta ??)] 'pcomplete-list))
 
 (defun eshell-completion-command-name ()
@@ -358,7 +360,7 @@ to writing a completion function."
             (nconc posns (list pos)))
         (setq pos (1+ pos))))
     (setq posns (cdr posns))
-    (assert (= (length args) (length posns)))
+    (cl-assert (= (length args) (length posns)))
     (let ((a args)
           (i 0)
           l final)
@@ -370,7 +372,7 @@ to writing a completion function."
       (and l
            (setq args (nthcdr (1+ l) args)
                  posns (nthcdr (1+ l) posns))))
-    (assert (= (length args) (length posns)))
+    (cl-assert (= (length args) (length posns)))
     (when (and args (eq (char-syntax (char-before end)) ? )
                (not (eq (char-before (1- end)) ?\\)))
       (nconc args (list ""))
@@ -383,7 +385,7 @@ to writing a completion function."
                          (let ((result
                                 (eshell-do-eval
                                  (list 'eshell-commands arg) t)))
-                           (assert (eq (car result) 'quote))
+                           (cl-assert (eq (car result) 'quote))
                            (cadr result))
                        arg)))
                 (if (numberp val)
@@ -449,6 +451,13 @@ to writing a completion function."
                         (all-completions filename obarray 'functionp))
                    completions)))))))
 
+(defun eshell-pcomplete ()
+  "Eshell wrapper for `pcomplete'."
+  (interactive)
+  (condition-case nil
+      (pcomplete)
+    (text-read-only (completion-at-point)))) ; Workaround for bug#12838.
+
 (provide 'em-cmpl)
 
 ;; Local Variables:
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index cab84951143..4a3fa54626b 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-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -47,14 +47,15 @@
 (require 'esh-opt)
 
 ;;;###autoload
-(eshell-defgroup eshell-dirs nil
+(progn
+(defgroup eshell-dirs nil
   "Directory navigation involves changing directories, examining the
 current directory, maintaining a directory stack, and also keeping
 track of a history of the last directory locations the user was in.
 Emacs does provide standard Lisp definitions of `pwd' and `cd', but
 they lack somewhat in feel from the typical shell equivalents."
   :tag "Directory navigation"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index df1f7b67e29..288aa9b773b 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -1,6 +1,6 @@
 ;;; em-glob.el --- extended file name globbing
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -53,11 +53,12 @@
 (require 'esh-util)
 
 ;;;###autoload
-(eshell-defgroup eshell-glob nil
+(progn
+(defgroup eshell-glob nil
   "This module provides extended globbing syntax, similar what is used
 by zsh for filename generation."
   :tag "Extended filename globbing"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 5e44e541526..64a7ad94c53 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -1,6 +1,6 @@
 ;;; em-hist.el --- history list management
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -54,8 +54,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
+(eval-when-compile (require 'cl-lib))
 
 (require 'ring)
 (require 'esh-opt)
@@ -63,10 +62,11 @@
 (require 'eshell)
 
 ;;;###autoload
-(eshell-defgroup eshell-hist nil
+(progn
+(defgroup eshell-hist nil
   "This module provides command history management."
   :tag "History list management"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
@@ -559,8 +559,8 @@ See also `eshell-read-history'."
           (forward-char))
         (setq posb (cdr posb)
               pose (cdr pose))
-        (assert (= (length posb) (length args)))
-        (assert (<= (length posb) (length pose))))
+        (cl-assert (= (length posb) (length args)))
+        (cl-assert (<= (length posb) (length pose))))
       (setq hist (buffer-substring-no-properties begin end))
       (let ((b posb) (e pose))
         (while b
@@ -570,7 +570,7 @@ See also `eshell-read-history'."
           (setq b (cdr b)
                 e (cdr e))))
       (setq textargs (cdr textargs))
-      (assert (= (length textargs) (length args)))
+      (cl-assert (= (length textargs) (length args)))
       (list textargs posb pose))))
 
 (defun eshell-expand-history-references (beg end)
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 17dbe3fbaf2..2dd92ba3530 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -1,6 +1,6 @@
 ;;; em-ls.el --- implementation of ls in Lisp
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -27,20 +27,21 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)
+  (require 'cl-lib)
   (require 'eshell))
 (require 'esh-util)
 (require 'esh-opt)
 
 ;;;###autoload
-(eshell-defgroup eshell-ls nil
+(progn
+(defgroup eshell-ls nil
   "This module implements the \"ls\" utility fully in Lisp.  If it is
 passed any unrecognized command switches, it will revert to the
 operating system's version.  This version of \"ls\" uses text
 properties to colorize its output based on the setting of
 `eshell-ls-use-colors'."
   :tag "Implementation of `ls' in Lisp"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
@@ -61,6 +62,7 @@ properties to colorize its output based on the setting of
   "How to display time information in `eshell-ls-file'.
 This is passed to `format-time-string' as a format string.
 To display the date using the current locale, use \"%b \%e\"."
+  :version "24.1"
   :type 'string
   :group 'eshell-ls)
 
@@ -310,7 +312,7 @@ instead."
   (let ((insert-func 'eshell-buffered-print)
         (error-func 'eshell-error)
         (flush-func 'eshell-flush))
-    (eshell-do-ls args)))
+    (apply 'eshell-do-ls args)))
 
 (put 'eshell/ls 'eshell-no-numeric-conversions t)
 
@@ -461,7 +463,7 @@ name should be displayed as, etc.  Think of it as cooking a FILEINFO."
           (progn
             (setcdr fileinfo attr)
             (setcar fileinfo (eshell-ls-decorated-name fileinfo)))
-        (assert (eq listing-style 'long-listing))
+        (cl-assert (eq listing-style 'long-listing))
         (setcar fileinfo
                 (concat (eshell-ls-decorated-name fileinfo) " -> "
                         (eshell-ls-decorated-name
@@ -696,7 +698,7 @@ Each member of FILES is either a string or a cons cell of the form
       (let* ((col-vals
               (if (eq listing-style 'by-columns)
                   (eshell-ls-find-column-lengths display-files)
-                (assert (eq listing-style 'by-lines))
+                (cl-assert (eq listing-style 'by-lines))
                 (eshell-ls-find-column-widths display-files)))
              (col-widths (car col-vals))
              (display-files (cdr col-vals))
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index e45b36e3511..fc23c0099e8 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -1,6 +1,6 @@
 ;;; em-pred.el --- argument predicates and modifiers (ala zsh)
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -49,13 +49,14 @@
 (eval-when-compile (require 'eshell))
 
 ;;;###autoload
-(eshell-defgroup eshell-pred nil
+(progn
+(defgroup eshell-pred nil
   "This module allows for predicates to be applied to globbing
 patterns (similar to zsh), in addition to string modifiers which can
 be applied either to globbing results, variable references, or just
 ordinary strings."
   :tag "Value modifiers and predicates"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 3e87acc6d1e..f4701ec35ea 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -1,6 +1,6 @@
 ;;; em-prompt.el --- command prompts
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -29,11 +29,12 @@
 (eval-when-compile (require 'eshell))
 
 ;;;###autoload
-(eshell-defgroup eshell-prompt nil
+(progn
+(defgroup eshell-prompt nil
   "This module provides command prompts, and navigation between them,
 as is common with most shells."
   :tag "Command prompts"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
@@ -69,9 +70,9 @@ re-entered for it to take effect."
   :group 'eshell-prompt)
 
 (defface eshell-prompt
-  '((((class color) (background light)) (:foreground "Red" :bold t))
-    (((class color) (background dark)) (:foreground "Pink" :bold t))
-    (t (:bold t)))
+  '((default :weight bold)
+    (((class color) (background light)) :foreground "Red")
+    (((class color) (background dark))  :foreground "Pink"))
   "The face used to highlight prompt strings.
 For highlighting other kinds of strings -- similar to shell mode's
 behavior -- simply use an output filer which changes text properties."
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index b6f12e1ff2e..929b74d789d 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -1,6 +1,6 @@
 ;;; em-rebind.el --- rebind keys when point is at current input
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -26,7 +26,8 @@
 (eval-when-compile (require 'eshell))
 
 ;;;###autoload
-(eshell-defgroup eshell-rebind nil
+(progn
+(defgroup eshell-rebind nil
   "This module allows for special keybindings that only take effect
 while the point is in a region of input text.  By default, it binds
 C-a to move to the beginning of the input text (rather than just the
@@ -37,7 +38,7 @@ commands to cause the point to leave the input area, such as
 `backward-word', `previous-line', etc.  This module intends to mimic
 the behavior of normal shells while the user editing new input text."
   :tag "Rebind keys at input"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index d76e19cdd07..f219a4b6f12 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -1,6 +1,6 @@
 ;;; em-script.el --- Eshell script files
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -24,13 +24,15 @@
 ;;; Code:
 
 (require 'eshell)
+(require 'esh-opt)
 
 ;;;###autoload
-(eshell-defgroup eshell-script nil
+(progn
+(defgroup eshell-script nil
   "This module allows for the execution of files containing Eshell
 commands, as a script file."
   :tag "Running script files."
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 259072d9750..b427fe69ea4 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -1,6 +1,6 @@
 ;;; em-smart.el --- smart display of output
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -71,7 +71,8 @@
 (eval-when-compile (require 'eshell))
 
 ;;;###autoload
-(eshell-defgroup eshell-smart nil
+(progn
+(defgroup eshell-smart nil
   "This module combines the facility of normal, modern shells with
 some of the edit/review concepts inherent in the design of Plan 9's
 9term.  See the docs for more details.
@@ -80,7 +81,7 @@ Most likely you will have to turn this option on and play around with
 it to get a real sense of how it works."
   :tag "Smart display of output"
   ;; :link '(info-link "(eshell)Smart display of output")
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index bd575a0f809..ef59f6d1d35 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -1,6 +1,6 @@
 ;;; em-term.el --- running visual commands
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -35,14 +35,15 @@
 (require 'term)
 
 ;;;###autoload
-(eshell-defgroup eshell-term nil
+(progn
+(defgroup eshell-term nil
   "This module causes visual commands (e.g., 'vi') to be executed by
 the `term' package, which comes with Emacs.  This package handles most
 of the ANSI control codes, allowing curses-based applications to run
 within an Emacs window.  The variable `eshell-visual-commands' defines
 which commands are considered visual in nature."
   :tag "Running visual commands"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
@@ -62,10 +63,13 @@ which commands are considered visual in nature."
   :type '(repeat string)
   :group 'eshell-term)
 
-(defcustom eshell-term-name "eterm"
+;; If you change this from term-term-name, you need to ensure that the
+;; value you choose exists in the system's terminfo database.  (Bug#12485)
+(defcustom eshell-term-name term-term-name
   "Name to use for the TERM variable when running visual commands.
 See `term-term-name' in term.el for more information on how this is
 used."
+  :version "24.3"              ; eterm -> term-term-name = eterm-color
   :type 'string
   :group 'eshell-term)
 
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 707f2ebc2ce..32744c702a6 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-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -40,7 +40,8 @@
 (require 'pcomplete)
 
 ;;;###autoload
-(eshell-defgroup eshell-unix nil
+(progn
+(defgroup eshell-unix nil
   "This module defines many of the more common UNIX utilities as
 aliases implemented in Lisp.  These include mv, ln, cp, rm, etc.  If
 the user passes arguments which are too complex, or are unrecognized
@@ -51,7 +52,7 @@ with Eshell makes them more versatile than their traditional cousins
 \(such as being able to use `kill' to kill Eshell background processes
 by name)."
   :tag "UNIX commands in Lisp"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 (defcustom eshell-unix-load-hook nil
   "A list of functions to run when `eshell-unix' is loaded."
@@ -305,12 +306,13 @@ Remove (unlink) the FILE(s).")
   (eshell-eval-using-options
    "mkdir" args
    '((?h "help" nil nil "show this usage screen")
+     (?p "parents" nil em-parents "make parent directories as needed")
      :external "mkdir"
      :show-usage
      :usage "[OPTION] DIRECTORY...
 Create the DIRECTORY(ies), if they do not already exist.")
    (while args
-     (eshell-funcalln 'make-directory (car args))
+     (eshell-funcalln 'make-directory (car args) em-parents)
      (setq args (cdr args)))
    nil))
 
@@ -599,7 +601,7 @@ symlink, then revert to the system's definition of cat."
       (let ((ext-cat (eshell-search-path "cat")))
         (if ext-cat
             (throw 'eshell-replace-command
-                   (eshell-parse-command ext-cat args))
+                   (eshell-parse-command (eshell-quote-argument ext-cat) args))
           (if eshell-in-pipeline-p
               (error "Eshell's `cat' does not work in pipelines")
             (error "Eshell's `cat' cannot display one of the files given"))))
@@ -712,7 +714,7 @@ available..."
 
 (defun eshell-grep (command args &optional maybe-use-occur)
   "Generic service function for the various grep aliases.
-It calls Emacs' grep utility if the command is not redirecting output,
+It calls Emacs's grep utility if the command is not redirecting output,
 and if it's not part of a command pipeline.  Otherwise, it calls the
 external command."
   (if (and maybe-use-occur eshell-no-grep-available)
@@ -792,8 +794,6 @@ external command."
   (funcall (or (pcomplete-find-completion-function (pcomplete-arg 1))
                pcomplete-default-completion-function)))
 
-(defalias 'pcomplete/ssh 'pcomplete/rsh)
-
 (defvar block-size)
 (defvar by-bytes)
 (defvar dereference-links)
@@ -857,7 +857,7 @@ external command."
                            (file-remote-p (expand-file-name arg) 'method) "ftp")
                           (throw 'have-ange-path t))))))
         (throw 'eshell-replace-command
-               (eshell-parse-command ext-du args))
+               (eshell-parse-command (eshell-quote-argument ext-du) args))
       (eshell-eval-using-options
        "du" args
        '((?a "all" nil show-all
@@ -965,6 +965,8 @@ Show wall-clock time elapsed during execution of COMMAND.")
     ((string-match "[^[:blank:]]" string) string)
     (nil)))
 
+(autoload 'diff-no-select "diff")
+
 (defun eshell/diff (&rest args)
   "Alias \"diff\" to call Emacs `diff' function."
   (let ((orig-args (eshell-stringify-list (eshell-flatten-list args))))
@@ -986,8 +988,9 @@ Show wall-clock time elapsed during execution of COMMAND.")
           (setcdr (last args 3) nil))
         (with-current-buffer
             (condition-case err
-                (diff old new
-                      (nil-blank-string (eshell-flatten-and-stringify args)))
+                (diff-no-select
+                 old new
+                 (nil-blank-string (eshell-flatten-and-stringify args)))
               (error
                (throw 'eshell-replace-command
                       (eshell-parse-command "*diff" orig-args))))
@@ -1035,12 +1038,8 @@ Show wall-clock time elapsed during execution of COMMAND.")
 
 (put 'eshell/occur 'eshell-no-numeric-conversions t)
 
-;; Pacify the byte-compiler.
-(defvar tramp-default-proxies-alist)
-
 (defun eshell/su (&rest args)
   "Alias \"su\" to call Tramp."
-  (require 'tramp)
   (setq args (eshell-stringify-list (eshell-flatten-list args)))
   (let ((orig-args (copy-tree args)))
     (eshell-eval-using-options
@@ -1055,29 +1054,29 @@ Become another USER during a login session.")
                   (host (or (file-remote-p default-directory 'host)
                             "localhost"))
                   (dir (or (file-remote-p default-directory 'localname)
-                           (expand-file-name default-directory))))
+                           (expand-file-name default-directory)))
+                  (prefix (file-remote-p default-directory)))
               (dolist (arg args)
                 (if (string-equal arg "-") (setq login t) (setq user arg)))
               ;; `eshell-eval-using-options' does not handle "-".
               (if (member "-" orig-args) (setq login t))
               (if login (setq dir "~/"))
-              (if (and (file-remote-p default-directory)
+              (if (and prefix
                        (or
                         (not (string-equal
                               "su" (file-remote-p default-directory 'method)))
                         (not (string-equal
                               user (file-remote-p default-directory 'user)))))
-                  (add-to-list
-                   'tramp-default-proxies-alist
-                   (list host user (file-remote-p default-directory))))
-              (eshell-parse-command
-               "cd" (list (format "/su:%s@%s:%s" user host dir))))))))
+                  (eshell-parse-command
+                   "cd" (list (format "%s|su:%s@%s:%s"
+                                      (substring prefix 0 -1) user host dir)))
+                (eshell-parse-command
+                 "cd" (list (format "/su:%s@%s:%s" user host dir)))))))))
 
 (put 'eshell/su 'eshell-no-numeric-conversions t)
 
 (defun eshell/sudo (&rest args)
   "Alias \"sudo\" to call Tramp."
-  (require 'tramp)
   (setq args (eshell-stringify-list (eshell-flatten-list args)))
   (let ((orig-args (copy-tree args)))
     (eshell-eval-using-options
@@ -1092,21 +1091,28 @@ Execute a COMMAND as the superuser or another USER.")
                   (host (or (file-remote-p default-directory 'host)
                             "localhost"))
                   (dir (or (file-remote-p default-directory 'localname)
-                           (expand-file-name default-directory))))
+                           (expand-file-name default-directory)))
+                  (prefix (file-remote-p default-directory)))
               ;; `eshell-eval-using-options' reads options of COMMAND.
               (while (and (stringp (car orig-args))
                           (member (car orig-args) '("-u" "--user")))
                 (setq orig-args (cddr orig-args)))
-              (if (and (file-remote-p default-directory)
-                       (or
-                        (not (string-equal
-                              "sudo" (file-remote-p default-directory 'method)))
-                        (not (string-equal
-                              user (file-remote-p default-directory 'user)))))
-                  (add-to-list
-                   'tramp-default-proxies-alist
-                   (list host user (file-remote-p default-directory))))
-              (let ((default-directory (format "/sudo:%s@%s:%s" user host dir)))
+              (let ((default-directory
+                      (if (and prefix
+                               (or
+                                (not
+                                 (string-equal
+                                  "sudo"
+                                  (file-remote-p default-directory 'method)))
+                                (not
+                                 (string-equal
+                                  user
+                                  (file-remote-p default-directory 'user)))))
+                          (format "%s|sudo:%s@%s:%s"
+                                  (substring prefix 0 -1) user host dir)
+                        (format "/sudo:%s@%s:%s" user host dir))))
+                ;; Ensure, that Tramp has connected to that construct already.
+                (ignore (file-exists-p default-directory))
                 (eshell-named-command (car orig-args) (cdr orig-args))))))))
 
 (put 'eshell/sudo 'eshell-no-numeric-conversions t)
diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index 50bda108e95..2e7a813cb75 100644
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -1,6 +1,6 @@
 ;;; em-xtra.el --- extra alias functions
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -29,13 +29,14 @@
 (require 'compile)
 
 ;;;###autoload
-(eshell-defgroup eshell-xtra nil
+(progn
+(defgroup eshell-xtra nil
   "This module defines some extra alias functions which are entirely
 optional.  They can be viewed as samples for how to write Eshell alias
-functions, or as aliases which make some of Emacs' behavior more
+functions, or as aliases which make some of Emacs's behavior more
 naturally accessible within Emacs."
   :tag "Extra alias functions"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; Functions:
 
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index dcb23967645..ad52a5d4a71 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -1,6 +1,6 @@
 ;;; esh-arg.el --- argument processing
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -202,6 +202,18 @@ If POS is nil, the location of point is checked."
     (or (= pos (point-max))
         (memq (char-after pos) eshell-delimiter-argument-list))))
 
+(defun eshell-quote-argument (string)
+  "Return STRING with magic characters quoted.
+Magic characters are those in `eshell-special-chars-outside-quoting'."
+  (let ((index 0))
+    (mapconcat (lambda (c)
+                 (prog1
+                     (or (eshell-quote-backslash string index)
+                         (char-to-string c))
+                   (setq index (1+ index))))
+               string
+               "")))
+
 ;; Argument parsing
 
 (defun eshell-parse-arguments (beg end)
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 7b90797eb43..e6e89d83b7c 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1,6 +1,6 @@
 ;;; esh-cmd.el --- command invocation
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -108,7 +108,7 @@
 (require 'esh-ext)
 
 (eval-when-compile
-  (require 'cl)
+  (require 'cl-lib)
   (require 'pcomplete))
 
 
@@ -236,10 +236,14 @@ return non-nil if the command is complex."
   :group 'eshell-cmd)
 
 (defcustom eshell-debug-command nil
-  "If non-nil, enable debugging code.  SSLLOOWW.
-This option is only useful for reporting bugs.  If you enable it, you
-will have to visit the file 'eshell-cmd.el' and run the command
-\\[eval-buffer]."
+  "If non-nil, enable Eshell debugging code.
+This is slow, and only useful for debugging problems with Eshell.
+If you change this without using customize after Eshell has loaded,
+you must re-load 'esh-cmd.el'."
+  :initialize 'custom-initialize-default
+  :set (lambda (symbol value)
+         (set symbol value)
+         (load-library "esh-cmd"))
   :type 'boolean
   :group 'eshell-cmd)
 
@@ -480,20 +484,22 @@ implemented via rewriting, rather than as a function."
       (let ((body (car (last terms))))
         (setcdr (last terms 2) nil)
         `(let ((for-items
-                (append
-                 ,@(mapcar
-                    (lambda (elem)
-                      (if (listp elem)
-                          elem
-                        `(list ,elem)))
-                    (cdr (cddr terms)))))
-               (eshell-command-body '(nil))
+                (copy-tree
+                 (append
+                  ,@(mapcar
+                     (lambda (elem)
+                       (if (listp elem)
+                           elem
+                         `(list ,elem)))
+                     (cdr (cddr terms))))))
+               (eshell-command-body '(nil))
                (eshell-test-body '(nil)))
-           (while (consp for-items)
-             (let ((,(intern (cadr terms)) (car for-items)))
-               (eshell-protect
-                ,(eshell-invokify-arg body t)))
-             (setq for-items (cdr for-items)))
+           (while (car for-items)
+             (let ((,(intern (cadr terms)) (car for-items)))
+               (eshell-protect
+                ,(eshell-invokify-arg body t)))
+             (setcar for-items (cadr for-items))
+             (setcdr for-items (cddr for-items)))
            (eshell-close-handles
             eshell-last-command-status
             (list 'quote eshell-last-command-result))))))
@@ -600,7 +606,7 @@ For an external command, it means an exit code of 0."
                  (list
                   (if (<= (length pieces) 1)
                       (car pieces)
-                    (assert (not eshell-in-pipeline-p))
+                    (cl-assert (not eshell-in-pipeline-p))
                     `(eshell-execute-pipeline (quote ,pieces))))))
         (setq bp (cdr bp))))
     ;; `results' might be empty; this happens in the case of
@@ -611,7 +617,7 @@ For an external command, it means an exit code of 0."
           results (cdr results)
           sep-terms (nreverse sep-terms))
     (while results
-      (assert (car sep-terms))
+      (cl-assert (car sep-terms))
       (setq final (eshell-structure-basic-command
                    'if (string= (car sep-terms) "&&") "if"
                    `(eshell-protect ,(car results))
@@ -1022,7 +1028,7 @@ be finished later after the completion of an asynchronous subprocess."
         ;; `eshell-copy-tree' is needed here so that the test argument
         ;; doesn't get modified and thus always yield the same result.
         (when (car eshell-command-body)
-          (assert (not synchronous-p))
+          (cl-assert (not synchronous-p))
           (eshell-do-eval (car eshell-command-body))
           (setcar eshell-command-body nil)
           (setcar eshell-test-body nil))
@@ -1042,7 +1048,7 @@ be finished later after the completion of an asynchronous subprocess."
         ;; doesn't get modified and thus always yield the same result.
         (if (car eshell-command-body)
             (progn
-              (assert (not synchronous-p))
+              (cl-assert (not synchronous-p))
               (eshell-do-eval (car eshell-command-body)))
           (unless (car eshell-test-body)
             (setcar eshell-test-body (eshell-copy-tree (car args))))
@@ -1197,7 +1203,7 @@ COMMAND may result in an alias being executed, or a plain command."
   (setq eshell-last-arguments args
         eshell-last-command-name (eshell-stringify command))
   (run-hook-with-args 'eshell-prepare-command-hook)
-  (assert (stringp eshell-last-command-name))
+  (cl-assert (stringp eshell-last-command-name))
   (if eshell-last-command-name
       (or (run-hook-with-args-until-success
            'eshell-named-command-hook eshell-last-command-name
@@ -1212,13 +1218,12 @@ COMMAND may result in an alias being executed, or a plain command."
   (let* ((sym (intern-soft (concat "eshell/" name)))
          (file (symbol-file sym 'defun)))
     ;; If the function exists, but is defined in an eshell module
-    ;; that's not currently enabled, don't report it as found
+    ;; that's not currently enabled, don't report it as found.
     (if (and file
-             (string-match "\\(em\\|esh\\)-\\(.*\\)\\(\\.el\\)?\\'" file))
+             (setq file (file-name-base file))
+             (string-match "\\`\\(em\\|esh\\)-\\([[:alnum:]]+\\)\\'" file))
         (let ((module-sym
-               (intern (file-name-sans-extension
-                        (file-name-nondirectory
-                         (concat "eshell-" (match-string 2 file)))))))
+               (intern (concat "eshell-" (match-string 2 file)))))
           (if (and (functionp sym)
                    (or (null module-sym)
                        (eshell-using-module module-sym)
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 3acbeac0b89..e48213c54d6 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -1,6 +1,6 @@
 ;;; esh-ext.el --- commands external to Eshell
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -34,9 +34,10 @@
 (provide 'esh-ext)
 
 (eval-when-compile
-  (require 'cl)
+  (require 'cl-lib)
   (require 'esh-cmd))
 (require 'esh-util)
+(require 'esh-opt)
 
 (defgroup eshell-ext nil
   "External commands are invoked when operating system executables are
@@ -91,7 +92,7 @@ since nothing else but Eshell will be able to understand
 
 (defcustom eshell-windows-shell-file
   (if (eshell-under-windows-p)
-      (if (string-match "\\(\\`cmdproxy\\|sh\\)\\.\\(com\\|exe\\)"
+      (if (string-match "\\(cmdproxy\\|sh\\)\\.\\(com\\|exe\\)"
                         shell-file-name)
           (or (eshell-search-path "cmd.exe")
               (eshell-search-path "command.com"))
@@ -108,7 +109,9 @@ wholly ignored."
   ;; argument...
   (setcar args (subst-char-in-string ?/ ?\\ (car args)))
   (throw 'eshell-replace-command
-         (eshell-parse-command eshell-windows-shell-file (cons "/c" args))))
+         (eshell-parse-command
+          (eshell-quote-argument eshell-windows-shell-file)
+          (cons "/c" args))))
 
 (defcustom eshell-interpreter-alist
   (if (eshell-under-windows-p)
@@ -186,6 +189,7 @@ all the output from the remote command, and sends it all at once,
 causing the user to wonder if anything's really going on..."
   (let ((outbuf (generate-new-buffer " *eshell remote output*"))
         (errbuf (generate-new-buffer " *eshell remote error*"))
+        (command (or (file-remote-p command 'localname) command))
         (exitcode 1))
     (unwind-protect
         (progn
@@ -203,10 +207,15 @@ causing the user to wonder if anything's really going on..."
 (defun eshell-external-command (command args)
   "Insert output from an external COMMAND, using ARGS."
   (setq args (eshell-stringify-list (eshell-flatten-list args)))
-  (if (file-remote-p default-directory)
-      (eshell-remote-command command args))
-  (let ((interp (eshell-find-interpreter command)))
-    (assert interp)
+  (let ((interp (eshell-find-interpreter
+                 command
+                 ;; `eshell-find-interpreter' does not work correctly
+                 ;; for Tramp file name syntax.  But we don't need to
+                 ;; know the interpreter in that case, therefore the
+                 ;; check is suppressed.
+                 (or (and (stringp command) (file-remote-p command))
+                     (file-remote-p default-directory)))))
+    (cl-assert interp)
     (if (functionp (car interp))
         (apply (car interp) (append (cdr interp) args))
       (eshell-gather-process-output
@@ -222,20 +231,15 @@ causing the user to wonder if anything's really going on..."
 Adds the given PATH to $PATH.")
    (if args
        (progn
-         (if prepend
-             (setq args (nreverse args)))
-         (while args
-           (setenv "PATH"
-                   (if prepend
-                       (concat (car args) path-separator
-                               (getenv "PATH"))
-                     (concat (getenv "PATH") path-separator
-                             (car args))))
-           (setq args (cdr args))))
-     (let ((paths (parse-colon-path (getenv "PATH"))))
-       (while paths
-         (eshell-printn (car paths))
-         (setq paths (cdr paths)))))))
+         (setq eshell-path-env (getenv "PATH")
+               args (mapconcat 'identity args path-separator)
+               eshell-path-env
+               (if prepend
+                   (concat args path-separator eshell-path-env)
+                 (concat eshell-path-env path-separator args)))
+         (setenv "PATH" eshell-path-env))
+     (dolist (dir (parse-colon-path (getenv "PATH")))
+       (eshell-printn dir)))))
 
 (put 'eshell/addpath 'eshell-no-numeric-conversions t)
 
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 71fae34b360..9f3cfe0f6d0 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -1,6 +1,6 @@
 ;;; esh-io.el --- I/O management
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -59,7 +59,7 @@
 (provide 'esh-io)
 
 (eval-when-compile
-  (require 'cl)
+  (require 'cl-lib)
   (require 'eshell))
 
 (defgroup eshell-io nil
@@ -298,7 +298,7 @@ completed successfully.  RESULT is the quoted value of the last
 command.  If nil, then the meta variables for keeping track of the
 last execution result should not be changed."
   (let ((idx 0))
-    (assert (or (not result) (eq (car result) 'quote)))
+    (cl-assert (or (not result) (eq (car result) 'quote)))
     (setq eshell-last-command-status exit-code
           eshell-last-command-result (cadr result))
     (while (< idx eshell-number-of-handles)
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 43d56a5b89f..673632400f2 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -1,6 +1,6 @@
 ;;; esh-mode.el --- user interface
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -193,8 +193,11 @@ This is used by `eshell-watch-for-password-prompt'."
   :type '(choice (const nil) function)
   :group 'eshell-mode)
 
-(defcustom eshell-status-in-modeline t
-  "If non-nil, let the user know a command is running in the modeline."
+(define-obsolete-variable-alias 'eshell-status-in-modeline
+  'eshell-status-in-mode-line "24.3")
+
+(defcustom eshell-status-in-mode-line t
+  "If non-nil, let the user know a command is running in the mode line."
   :type 'boolean
   :group 'eshell-mode)
 
@@ -314,14 +317,14 @@ and the hook `eshell-exit-hook'."
   (setq eshell-mode-map (make-sparse-keymap))
   (use-local-map eshell-mode-map)
 
-  (when eshell-status-in-modeline
+  (when eshell-status-in-mode-line
     (make-local-variable 'eshell-command-running-string)
     (let ((fmt (copy-sequence mode-line-format)))
       (make-local-variable 'mode-line-format)
       (setq mode-line-format fmt))
-    (let ((modeline (memq 'mode-line-modified mode-line-format)))
-      (if modeline
-          (setcar modeline 'eshell-command-running-string))))
+    (let ((mode-line-elt (memq 'mode-line-modified mode-line-format)))
+      (if mode-line-elt
+          (setcar mode-line-elt 'eshell-command-running-string))))
 
   (define-key eshell-mode-map [return] 'eshell-send-input)
   (define-key eshell-mode-map [(control ?m)] 'eshell-send-input)
@@ -434,7 +437,7 @@ and the hook `eshell-exit-hook'."
   (when eshell-scroll-show-maximum-output
     (set (make-local-variable 'scroll-conservatively) 1000))
 
-  (when eshell-status-in-modeline
+  (when eshell-status-in-mode-line
     (add-hook 'eshell-pre-command-hook 'eshell-command-started nil t)
     (add-hook 'eshell-post-command-hook 'eshell-command-finished nil t))
 
@@ -448,12 +451,12 @@ and the hook `eshell-exit-hook'."
 (put 'eshell-mode 'mode-class 'special)
 
 (defun eshell-command-started ()
-  "Indicate in the modeline that a command has started."
+  "Indicate in the mode line that a command has started."
   (setq eshell-command-running-string "**")
   (force-mode-line-update))
 
 (defun eshell-command-finished ()
-  "Indicate in the modeline that a command has finished."
+  "Indicate in the mode line that a command has finished."
   (setq eshell-command-running-string "--")
   (force-mode-line-update))
 
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index 1581d05889e..2e3c6b8b7b5 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, 2002-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes
@@ -36,7 +36,9 @@ customizing the variable `eshell-modules-list'."
 
 ;; load the defgroup's for the standard extension modules, so that
 ;; documentation can be provided when the user customize's
-;; `eshell-modules-list'.
+;; `eshell-modules-list'.  We use "(progn (defgroup ..." in each file
+;; to force the autoloader into including the entire defgroup, rather
+;; than an abbreviated version.
 (load "esh-groups" nil 'nomessage)
 
 ;;; User Variables:
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 91d3cac198a..fed2d8f1c62 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -1,6 +1,6 @@
 ;;; esh-opt.el --- command options processing
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -106,7 +106,9 @@ interned variable `args' (created using a `let' form)."
                                        (and (listp opt) (nth 3 opt)))
                                      (cadr options)))
                    '(usage-msg last-value ext-command args))
-       (eshell-do-opt ,name ,options (quote ,body-forms)))))
+       ;; FIXME: `options' ends up hiding some variable names under `quote',
+       ;; which is incompatible with lexical scoping!!
+       (eshell-do-opt ,name ,options (lambda () ,@body-forms)))))
 
 ;;; Internal Functions:
 
@@ -117,7 +119,7 @@ interned variable `args' (created using a `let' form)."
 ;; Documented part of the interface; see eshell-eval-using-options.
 (defvar args)
 
-(defun eshell-do-opt (name options body-forms)
+(defun eshell-do-opt (name options body-fun)
   "Helper function for `eshell-eval-using-options'.
 This code doesn't really need to be macro expanded everywhere."
   (setq args temp-args)
@@ -133,8 +135,7 @@ This code doesn't really need to be macro expanded everywhere."
                       (throw 'eshell-usage
                              (eshell-show-usage name options)))
                   (setq args (eshell-process-args name args options)
-                        last-value (eval (append (list 'progn)
-                                                 body-forms)))
+                        last-value (funcall body-fun))
                   nil))
            (error "%s" usage-msg))))
       (throw 'eshell-external
@@ -218,10 +219,8 @@ switch is unrecognized."
          found)
     (while opts
       (if (and (listp (car opts))
-                 (nth kind (car opts))
-                 (if (= kind 0)
-                     (eq switch (nth kind (car opts)))
-                   (string= switch (nth kind (car opts)))))
+               (nth kind (car opts))
+               (equal switch (nth kind (car opts))))
           (progn
             (eshell-set-option name ai (car opts) options)
             (setq found t opts nil))
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index eeaccc4b890..f510f4b5329 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -1,6 +1,6 @@
 ;;; esh-proc.el --- process management
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index b508fd5352f..01df5fced62 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -1,6 +1,6 @@
 ;;; esh-util.el --- general utilities
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -84,7 +84,7 @@ Numeric form is tested using the regular expression
 NOTE: If you find that numeric conversions are interfering with the
 specification of filenames (for example, in calling `find-file', or
 some other Lisp function that deals with files, not numbers), add the
-following in your .emacs file:
+following in your init file:
 
   (put 'find-file 'eshell-no-numeric-conversions t)
 
@@ -275,6 +275,7 @@ Prepend remote identification of `default-directory', if any."
 
 (defmacro eshell-for (for-var for-list &rest forms)
   "Iterate through a list."
+  (declare (obsolete dolist "24.1"))
   (declare (indent 2))
   `(let ((list-iter ,for-list))
      (while list-iter
@@ -282,9 +283,6 @@ Prepend remote identification of `default-directory', if any."
          ,@forms)
        (setq list-iter (cdr list-iter)))))
 
-
-(make-obsolete 'eshell-for 'dolist "24.1")
-
 (defun eshell-flatten-list (args)
   "Flatten any lists within ARGS, so that there are no sublists."
   (let ((new-list (list t)))
@@ -483,7 +481,7 @@ list."
       (insert-file-contents eshell-hosts-file)
       (goto-char (point-min))
       (while (re-search-forward
-              "^\\(\\S-+\\)\\s-+\\(\\S-+\\)\\(\\s-*\\(\\S-+\\)\\)?" nil t)
+              "^\\([^#[:space:]]+\\)\\s-+\\(\\S-+\\)\\(\\s-*\\(\\S-+\\)\\)?" nil t)
         (if (match-string 1)
             (add-to-list 'hosts (match-string 1)))
         (if (match-string 2)
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 03774396485..6a0e159e82e 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -1,6 +1,6 @@
 ;;; esh-var.el --- handling of variables
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -110,8 +110,8 @@
 (eval-when-compile
   (require 'pcomplete)
   (require 'esh-util)
-  (require 'esh-opt)
   (require 'esh-mode))
+(require 'esh-opt)
 (require 'env)
 (require 'ring)
 
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 0c1c03941e5..a9a854221a4 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -1,6 +1,6 @@
 ;;; eshell.el --- the Emacs command shell
 
-;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Version: 2.4.2
@@ -140,12 +140,12 @@
 ;;   paragraph wasn't discovered until two months after I wrote the
 ;;   text; it was not intentional).
 ;;
-;; @ Emacs' register and bookmarking facilities can be used for
+;; @ Emacs's register and bookmarking facilities can be used for
 ;;   remembering where you've been, and what you've seen -- to varying
 ;;   levels of persistence.  They could perhaps even be tied to
 ;;   specific "moments" during eshell execution, which would include
 ;;   the environment at that time, as well as other variables.
-;;   Although this would require functionality orthogonal to Emacs'
+;;   Although this would require functionality orthogonal to Emacs's
 ;;   own bookmarking facilities, the interface used could be made to
 ;;   operate very similarly.
 ;;
@@ -222,36 +222,33 @@
 ;; things up.
 
 (eval-when-compile
-  (require 'cl)
+  (require 'cl-lib)
   (require 'esh-util))
 (require 'esh-util)
 (require 'esh-mode)
 
 (defgroup eshell nil
-  "A command shell implemented entirely in Emacs Lisp.
+  "Command shell implemented entirely in Emacs Lisp.
 It invokes no external processes beyond those requested by the
 user, and is intended to be a functional replacement for command
 shells such as bash, zsh, rc, 4dos."
-  :tag "The Emacs shell"
   :link '(info-link "(eshell)Top")
   :version "21.1"
   :group 'applications)
 
-;; This is hack to force make-autoload to put the whole definition
-;; into the autoload file (see esh-module.el).
-(defalias 'eshell-defgroup 'defgroup)
-
 ;;;_* User Options
 ;;
 ;; The following user options modify the behavior of Eshell overall.
 (defvar eshell-buffer-name)
 
-(defsubst eshell-add-to-window-buffer-names ()
+(defun eshell-add-to-window-buffer-names ()
   "Add `eshell-buffer-name' to `same-window-buffer-names'."
+  (declare (obsolete nil "24.3"))
   (add-to-list 'same-window-buffer-names eshell-buffer-name))
 
-(defsubst eshell-remove-from-window-buffer-names ()
+(defun eshell-remove-from-window-buffer-names ()
   "Remove `eshell-buffer-name' from `same-window-buffer-names'."
+  (declare (obsolete nil "24.3"))
   (setq same-window-buffer-names
         (delete eshell-buffer-name same-window-buffer-names)))
 
@@ -260,23 +257,13 @@ shells such as bash, zsh, rc, 4dos."
   :type 'hook
   :group 'eshell)
 
-(defcustom eshell-unload-hook
-  '(eshell-remove-from-window-buffer-names
-    eshell-unload-all-modules)
+(defcustom eshell-unload-hook '(eshell-unload-all-modules)
   "A hook run when Eshell is unloaded from memory."
   :type 'hook
   :group 'eshell)
 
 (defcustom eshell-buffer-name "*eshell*"
   "The basename used for Eshell buffers."
-  :set (lambda (symbol value)
-         ;; remove the old value of `eshell-buffer-name', if present
-         (if (boundp 'eshell-buffer-name)
-             (eshell-remove-from-window-buffer-names))
-         (set symbol value)
-         ;; add the new value
-         (eshell-add-to-window-buffer-names)
-         value)
   :type 'string
   :group 'eshell)
 
@@ -303,7 +290,7 @@ switches to the session with that number, creating it if necessary.  A
 nonnumeric prefix arg means to create a new session.  Returns the
 buffer selected (or created)."
   (interactive "P")
-  (assert eshell-buffer-name)
+  (cl-assert eshell-buffer-name)
   (let ((buf (cond ((numberp arg)
                     (get-buffer-create (format "%s<%d>"
                                                eshell-buffer-name
@@ -312,13 +299,8 @@ buffer selected (or created)."
                     (generate-new-buffer eshell-buffer-name))
                    (t
                     (get-buffer-create eshell-buffer-name)))))
-    ;; Simply calling `pop-to-buffer' will not mimic the way that
-    ;; shell-mode buffers appear, since they always reuse the same
-    ;; window that that command was invoked from.  To achieve this,
-    ;; it's necessary to add `eshell-buffer-name' to the variable
-    ;; `same-window-buffer-names', which is done when Eshell is loaded
-    (assert (and buf (buffer-live-p buf)))
-    (pop-to-buffer buf)
+    (cl-assert (and buf (buffer-live-p buf)))
+    (pop-to-buffer-same-window buf)
     (unless (eq major-mode 'eshell-mode)
       (eshell-mode))
     buf))
@@ -385,11 +367,11 @@ With prefix ARG, insert output into the current buffer at point."
         (when intr
           (if (eshell-interactive-process)
               (eshell-wait-for-process (eshell-interactive-process)))
-          (assert (not (eshell-interactive-process)))
+          (cl-assert (not (eshell-interactive-process)))
           (goto-char (point-max))
           (while (and (bolp) (not (bobp)))
             (delete-char -1)))
-        (assert (and buf (buffer-live-p buf)))
+        (cl-assert (and buf (buffer-live-p buf)))
         (unless arg
           (let ((len (if (not intr) 2
                        (count-lines (point-min) (point-max)))))
@@ -429,7 +411,7 @@ corresponding to a successful execution."
                        (list 'eshell-commands
                              (list 'eshell-command-to-value
                                    (eshell-parse-command command))) t)))
-          (assert (eq (car result) 'quote))
+          (cl-assert (eq (car result) 'quote))
           (if (and status-var (symbolp status-var))
               (set status-var eshell-last-command-status))
           (cadr result))))))