Merge from emacs-23

[gnu-emacs] / lisp / eshell / esh-opt.el

diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 5b0c02b0cb2a9056b9f7e902076663749a62dd61..a56402ff2e5464c6ff9b3c8a7433de5635638980 100644 (file)
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -64,10 +64,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 +77,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 +224,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