[Emacs-diffs] master 0095837 6/7: Fix cl-assert with atomp FORM, non-nil SHOW-ARGS

[Noam Postavsky]

branch: master
commit 0095837d90a07535abb7848de47cc3745656620f
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>

    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).
---
 lisp/emacs-lisp/cl-macs.el |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 37244f5..9a59939 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