diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/eshell/esh-opt.el | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index adfbc6ce440..603888477fb 100644 --- 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 a9e8f11c39a..91d3cac198a 100644 --- 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))))) |