diff options
| author | Stefan Monnier | 2011-03-31 00:24:03 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-03-31 00:24:03 -0400 |
| commit | 40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch) | |
| tree | b56f27a7e6d75a8c1fd27b00179a27b5efea0a32 /lisp/eshell | |
| parent | f488fb6528738131ef41859e1f04125f2e50efce (diff) | |
| parent | 44f230aa043ebb222aa0876b44d70484d5dd38db (diff) | |
| download | emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.zip | |
Merge from trunk
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/esh-opt.el | 7 |
1 files changed, 3 insertions, 4 deletions
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)." | |||
| 102 | macro-args | 102 | macro-args |
| 103 | (list 'eshell-stringify-list | 103 | (list 'eshell-stringify-list |
| 104 | (list 'eshell-flatten-list macro-args))))) | 104 | (list 'eshell-flatten-list macro-args))))) |
| 105 | (let ,(append (mapcar (lambda (opt) | 105 | (let ,(append (delq nil (mapcar (lambda (opt) |
| 106 | (or (and (listp opt) (nth 3 opt)) | 106 | (and (listp opt) (nth 3 opt))) |
| 107 | 'eshell-option-stub)) | 107 | (cadr options))) |
| 108 | (cadr options)) | ||
| 109 | '(usage-msg last-value ext-command args)) | 108 | '(usage-msg last-value ext-command args)) |
| 110 | (eshell-do-opt ,name ,options (quote ,body-forms))))) | 109 | (eshell-do-opt ,name ,options (quote ,body-forms))))) |
| 111 | 110 | ||