esh-opt trivia.

* lisp/eshell/esh-opt.el (eshell-eval-using-options):
Do not bind unused local variable `eshell-option-stub'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index adfbc6c..6038884 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-23  Glenn Morris  <rgm@gnu.org>
 
+       * eshell/esh-opt.el (eshell-eval-using-options):
+       Do not bind unused local variable `eshell-option-stub'.
+
        * progmodes/gdb-mi.el (gdb): Fix typo in previous change.
 
 2011-03-22  Juanma Barranquero  <lekktu@gmail.com>

diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index a9e8f11..91d3cac 100644 (file)
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -102,10 +102,9 @@ interned variable `args' (created using a `let' form)."
               macro-args
             (list 'eshell-stringify-list
                   (list 'eshell-flatten-list macro-args)))))
-     (let ,(append (mapcar (lambda (opt)
-                            (or (and (listp opt) (nth 3 opt))
-                                'eshell-option-stub))
-                          (cadr options))
+     (let ,(append (delq nil (mapcar (lambda (opt)
+                                      (and (listp opt) (nth 3 opt)))
+                                    (cadr options)))
                   '(usage-msg last-value ext-command args))
        (eshell-do-opt ,name ,options (quote ,body-forms)))))