Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 857-865)

   - Update from CVS
   - Merge from emacs--rel--22
   - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
   - Remove RCS keywords

 * emacs--rel--22  (patch 97-100)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

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

1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 94b0e34386f..66310895131 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -58,6 +58,7 @@ BODY-FORMS.  If instead an external command is run, the tag
 
 Lastly, any remaining arguments will be available in a locally
 interned variable `args' (created using a `let' form)."
+  (declare (debug (form form sexp body)))
   `(let ((temp-args
           ,(if (memq ':preserve-args (cadr options))
                macro-args
@@ -101,7 +102,7 @@ This code doesn't really need to be macro expanded everywhere."
                   nil))
            (error "%s" usage-msg))))
       (throw 'eshell-external
-             (eshell-external-command ext-command args))
+             (eshell-external-command ext-command args))
     last-value))
 
 (defun eshell-show-usage (name options)