From: Noam Postavsky <npostavs@gmail.com>
Date: Mon, 4 Jul 2016 03:44:14 +0000 (-0400)
Subject: Fix cl-assert with atomp FORM, non-nil SHOW-ARGS
X-Git-Tag: emacs-26.0.90~1777
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0095837d90a07535abb7848de47cc3745656620f;p=emacs.git

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).
---

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