From d6feb1195b8dc8f204d49761bfa828facbb4ba57 Mon Sep 17 00:00:00 2001 From: Nathan Trapuzzano Date: Tue, 5 Nov 2013 14:36:32 -0500 Subject: [PATCH] Signal error with malformed bindings in cl-symbol-macrolet. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/cl-macs.el | 2 ++ 2 files changed, 7 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 828fcda..a4ae0ca 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-11-05 Nathan Trapuzzano + + * emacs-lisp/cl-macs.el (cl-symbol-macrolet): Signal error with + malformed bindings form. + 2013-11-05 Eli Zaretskii * international/quail.el (quail-help): Be more explicit about the diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 60fdc09..1e277f7 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1988,6 +1988,8 @@ by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...). (cl-symbol-macrolet ,(cdr bindings) ,@body))) ((null bindings) (macroexp-progn body)) (t + (cl-assert (and (cdar bindings) (null (cl-cddar bindings))) nil + "Malformed `cl-symbol-macrolet' binding: %S" (car bindings)) (let ((previous-macroexpand (symbol-function 'macroexpand))) (unwind-protect (progn -- 1.8.4.2