diff options
| author | Nathan Trapuzzano | 2013-11-10 23:55:39 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2013-11-10 23:55:39 -0500 |
| commit | 608c2085c4a3c9ae99a8f08d89da72cb080be412 (patch) | |
| tree | e531d0e6e55ce19aec96a387f3fd97a7a787c0a2 | |
| parent | 122a7e463a3a4db38d15b710688bc7286745f656 (diff) | |
| download | emacs-608c2085c4a3c9ae99a8f08d89da72cb080be412.tar.gz emacs-608c2085c4a3c9ae99a8f08d89da72cb080be412.zip | |
* lisp/emacs-lisp/cconv.el (cconv-convert): Print warning instead of
throwing error over malformed let/let*.
Fixes: debbugs:15814
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2013-11-11 Nathan Trapuzzano <nbtrap@nbtrap.com> (tiny change) | ||
| 2 | |||
| 3 | * emacs-lisp/cconv.el (cconv-convert): Print warning instead of | ||
| 4 | throwing error over malformed let/let* (bug#15814). | ||
| 5 | |||
| 1 | 2013-11-11 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2013-11-11 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * iswitchb.el (iswitchb-mode): Mark obsolete. | 8 | * iswitchb.el (iswitchb-mode): Mark obsolete. |
| @@ -16,14 +21,13 @@ | |||
| 16 | 21 | ||
| 17 | 2013-11-09 Andreas Schwab <schwab@linux-m68k.org> | 22 | 2013-11-09 Andreas Schwab <schwab@linux-m68k.org> |
| 18 | 23 | ||
| 19 | * progmodes/sh-script.el (sh-font-lock-keywords-var): Force | 24 | * progmodes/sh-script.el (sh-font-lock-keywords-var): |
| 20 | highlighting text after Summary keyword in doc face for rpm. | 25 | Force highlighting text after Summary keyword in doc face for rpm. |
| 21 | 26 | ||
| 22 | 2013-11-09 Dmitry Gutov <dgutov@yandex.ru> | 27 | 2013-11-09 Dmitry Gutov <dgutov@yandex.ru> |
| 23 | 28 | ||
| 24 | * textmodes/ispell.el (ispell-lookup-words): When `look' is not | 29 | * textmodes/ispell.el (ispell-lookup-words): When `look' is not |
| 25 | available and the word has no wildcards, append one to the grep | 30 | available and the word has no wildcards, append one to the grep pattern. |
| 26 | pattern. | ||
| 27 | http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00258.html | 31 | http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00258.html |
| 28 | (ispell-complete-word): Call `ispell-lookup-words' with the value | 32 | (ispell-complete-word): Call `ispell-lookup-words' with the value |
| 29 | independent of `ispell-look-p'. | 33 | 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." | |||
| 291 | (let* ((value nil) | 291 | (let* ((value nil) |
| 292 | (var (if (not (consp binder)) | 292 | (var (if (not (consp binder)) |
| 293 | (prog1 binder (setq binder (list binder))) | 293 | (prog1 binder (setq binder (list binder))) |
| 294 | (cl-assert (null (cdr (cdr binder))) nil | 294 | (when (cddr binder) |
| 295 | "malformed let binding: `%s'" | 295 | (byte-compile-log-warning |
| 296 | (prin1-to-string binder)) | 296 | (format "Malformed `%S' binding: %S" letsym binder))) |
| 297 | (setq value (cadr binder)) | 297 | (setq value (cadr binder)) |
| 298 | (car binder))) | 298 | (car binder))) |
| 299 | (new-val | 299 | (new-val |