From 608c2085c4a3c9ae99a8f08d89da72cb080be412 Mon Sep 17 00:00:00 2001 From: Nathan Trapuzzano Date: Sun, 10 Nov 2013 23:55:39 -0500 Subject: [PATCH] * lisp/emacs-lisp/cconv.el (cconv-convert): Print warning instead of throwing error over malformed let/let*. Fixes: debbugs:15814 --- lisp/ChangeLog | 12 ++++++++---- lisp/emacs-lisp/cconv.el | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b09fba703a7..a9eacb56383 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-11-11 Nathan Trapuzzano (tiny change) + + * emacs-lisp/cconv.el (cconv-convert): Print warning instead of + throwing error over malformed let/let* (bug#15814). + 2013-11-11 Stefan Monnier * iswitchb.el (iswitchb-mode): Mark obsolete. @@ -16,14 +21,13 @@ 2013-11-09 Andreas Schwab - * progmodes/sh-script.el (sh-font-lock-keywords-var): Force - highlighting text after Summary keyword in doc face for rpm. + * progmodes/sh-script.el (sh-font-lock-keywords-var): + Force highlighting text after Summary keyword in doc face for rpm. 2013-11-09 Dmitry Gutov * textmodes/ispell.el (ispell-lookup-words): When `look' is not - available and the word has no wildcards, append one to the grep - pattern. + available and the word has no wildcards, append one to the grep pattern. http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00258.html (ispell-complete-word): Call `ispell-lookup-words' with the value independent of `ispell-look-p'. diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index 2a236b35e56..f4f55667729 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -291,9 +291,9 @@ places where they originally did not directly appear." (let* ((value nil) (var (if (not (consp binder)) (prog1 binder (setq binder (list binder))) - (cl-assert (null (cdr (cdr binder))) nil - "malformed let binding: `%s'" - (prin1-to-string binder)) + (when (cddr binder) + (byte-compile-log-warning + (format "Malformed `%S' binding: %S" letsym binder))) (setq value (cadr binder)) (car binder))) (new-val -- 2.39.2