diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2016-07-03 23:44:14 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2016-08-06 16:16:02 -0400 |
| commit | 0095837d90a07535abb7848de47cc3745656620f (patch) | |
| tree | c5959c46b2c7bd0770e25db6b5af092bd6670bce /lisp/emacs-lisp | |
| parent | 9ae89c2c99cd222239f368999cd3accb2b9a235d (diff) | |
| download | emacs-0095837d90a07535abb7848de47cc3745656620f.tar.gz emacs-0095837d90a07535abb7848de47cc3745656620f.tar.bz2 emacs-0095837d90a07535abb7848de47cc3745656620f.zip | |
Fix cl-assert with atomp FORM, non-nil SHOW-ARGS
* lisp/emacs-lisp/cl-macs.el (cl-assert): Don't require that FORM is a
list when showing its (non-existent) arguments (Bug #18587).
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 37244f5c350..9a599391e6c 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -3028,7 +3028,7 @@ omitted, a default message listing FORM itself is used." (delq nil (mapcar (lambda (x) (unless (macroexp-const-p x) x)) - (cdr form)))))) + (cdr-safe form)))))) `(progn (or ,form (cl--assertion-failed |