# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: nbtrap@nbtrap.com-20131109115727-jhn9e1k2ua493zox # target_branch: file:///home/nathan/opt/etc/bzr-repos/emacs/trunk/ # testament_sha1: 73a49428b51bbcbec941aab9e1b5eec802a8ab58 # timestamp: 2013-11-09 06:58:55 -0500 # base_revision_id: dgutov@yandex.ru-20131108112252-g8bofo4jray5k45v # # Begin patch === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-08 11:22:52 +0000 +++ lisp/ChangeLog 2013-11-09 11:57:27 +0000 @@ -1,3 +1,8 @@ +2013-11-09 Nathan Trapuzzano + + * emacs-lisp/cconv.el (cconv-convert): Print warning instead of + throwing error over malformed let/let*. + 2013-11-08 Dmitry Gutov * progmodes/ruby-mode.el (ruby-smie--indent-to-stmt): Use === modified file 'lisp/emacs-lisp/cconv.el' --- lisp/emacs-lisp/cconv.el 2013-11-04 19:48:07 +0000 +++ lisp/emacs-lisp/cconv.el 2013-11-08 16:50:27 +0000 @@ -291,9 +291,9 @@ (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 # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfliC0cABdr/gACwCwBS9/// XydMAP////BgCc+KkAAAAAAAAAAABKUzU9RT1GTT1APNSP1Q09QGnqAA0yaNNqDmjJiYAJiMCNMC DEYJkwCMOaMmJgAmIwI0wIMRgmTAIw5oyYmACYjAjTAgxGCZMAjDmjJiYAJiMCNMCDEYJkwCMCqI gAgCaNBDQaE9Q0mSaPUPKaNo1GRHhT4xpKqoTSgUo3zvoxRoNIr9VDC5nTmjNNGEb/62ZjzvmVFs 8ERfIZmmzjNuCVx50mlq2KG6yOyAqhyyt4e/9//J/+/bfPuP+o2RMEpTMTf+8GVS9EujmqlVbYpH GeVlOhMXVUttut5cSW/RDLezDUwkqOjnZy6m4os+FHhd+/jgeTkt9nWqoVtZrhNVhWttkUiw3109 9gqyny0sGdmGShnn8KW5Cuzvo4DFHLYOMAxEicQNi5tjjovHgISyzTKckgISZ9eHYqFshjLbLivB uqjytO2Qdw7e0G9cGMIBpDWHttPWIEnv8X4HkdTeeaKoWnwvqhR6nuF31OrfWD1ynpnW/T7rL/ls U5cxDGI7TD2lm7C67M4660pSlKUpTyYRkI7yamxbmNp30Ly1ghSsEJLurB8vxtdYKoW86WYCUJyf P64XZbGzEpMQWXT/WqFglFduNIKzEwbWauO1OuJea9Tfq1oL7ZpBfa0w9Sw+0orKExEFneOPmYbB DUci/AVRS8wNV1xxrnZwtyrgnEpdBC0f8RGw49maSNpblEPA2n9MzkjRGUL4O1XG/IvHxwY48IOi eWY2lOfKrjNL09ltzJ3e+5F6HF2t9b2CxasKIShONeBH5yIWDuncyce5kZcl0pNcJmt6yTc/hc28 cLUWQc+G3HPaa60cOysIv1pN600So7KKfmjHKdVI5MtcpsqIZ3G1DfYOXgw2OvJzZV52Ytzr0wsh m37cFMDodFbzTipv7GqbS1S5u0v2Yxjvv37WTsQwg0RZZpyN6cqoWc6bum0jfhaKZty0v30ItFiM iiG053Wcc+yq/OneaY7UXrDGYmSWo5Cm1c3psv9580LDkvJk3Qcc6cFzRCuRehcaWMKtEm/s4buL suRf01VLaMc192xZtYtmrcyUf6GGPuP9IWIdg5Gxtnao67d87L68nPlQxW1golyd3ipdwpLXYnTn hnbl0OeyRi27b+jHfXBWbTZZDZEYTBdNW5VSk4MEUTuyvzVXYXVbMIZM8Kmw2EZbmK2LLMNNR8zt goZtEZ7tnclG/OFut1UOcwTk4OOG4v3lidbi2rK7RGfBOLPhy1MTDkS14e8wqyt9nDs35zblddTs T9G/jNF4nfFUNd9IiJnNtKUbViMrcZt4UWujpaYRLpgpHRo9h0MoiJOF836b+PxRTy2HVVxwq4uv rntOyDhjTkb6RJqO0tJJvLikFkRFxUiS4m0YQi+4k/SH4w+I6w+h1M0pS8h0mZmZn4ew/Uoen1EP Uw0iJiEzMx+/sxTWbKRXYshP6phYbTYUhHr7bBa+OOO/wvD2Mvf4zj7vsiiv4lrTSju912zy1bXk sbVnw/n7Onh5Re57866R3HlCPLKbf8ZGk3rkeB3wxPB8ysRvhZCENG7eQo9TDRGv8QoZMTJD7+Du dO/7oPD6vJnBc6+V131zujP6+L284O6ND2HiEOo/b0gW4Mtjn58OdtjgmWEfnMZ7tpL6/FKXS1OX z3bnE9uLFzqa7BDYfba2vpERVhGbZHaitU069vod9uzj4dcVvAt/JDuX6waEX3a2FMCMeucdzZdT hd30Td35RpKN+fQx+QtPM1bTlcPzPyecSS8/k+SvzlZbMWfWtyTs746+kzh0nrbXpKPS6++y+ZpG Ha5ejLGzJ3zbk8V8dpuOzbHCSYmhpHAmEbMlzly4suEwubNtdBw8jaOcMObOpsMObn1OPxiMMsvX ErsaVM/ZZ2fsWjQ2+nzdyncNpFKQijqyik9+B7fjgtXPMsi0xjvGUIoHaYFUMiP0QuPfHTv6v0hj 50h6Oq32YL+6r3Xj6FzOvivVVvoxi356ptEj4xh2D8EP3PkeJy7pKPWYfcd8JKLbZRMRocivfB2l ImEetCdlHceT4cSyCahhD+8VNWEFg2er70VjjCOwpDzjZOpvP5IkpaWi3fB3Ij4SJWjbHHzhH4Qb M9yWkzF+kde84mB5au0P/cfQPJFPkf47ry2IbTtR6HjqiqHyKnRDwhHkhX8DT3JTJMhqGpQO9eTM Q/I4GpPzQxh97Jb32Zodxah5nBDYYX3oivj6ekQLkJhZGyFqF4mPhLv9hxFCcCut5QVjG2yE1VmD 70SKVyR7BDm5JxhKiaEqJpCVE090MjNLBBJJkbWSsFkRL5wWHv3F90PgKL/4mNxCtKQikRFCJTxw h0+L0ztNB70K7YnyP8x3w90RENX+ZD7HjYmYGENJbIR/bSwNthHC6ha41ZI4HYIToUELupJJFRiT Hsz63Fx5sIe+DuHoh+iFn0a71aJpCKQjqcQh/MPwNsVvIXfzvbj6HAXNPuwvYUC08MvK+86vpGSG P9jCKxNSPsy6aT7cnww8jezOMxyUulKYTvNAkwjtmJlMxM5vVDK6GRMmrKEWRN9uxb/M7J24lClC 0qd4tPZQotLcTMdC+CyFYP7qHPM2DcuZwjUjkeIQorE3yRs3mEYfQuJP6o51jPX84Pkd8tnOPF4H 9KQ7TjEROR4t54DbHauqmZTN5F8S7A3QZQUPvOemh8pxdw7BnV3SqZFN5NEQ9ThBuk4GH5FEOzs1 3QWfWGaHtMYUPojwh/+LuSKcKEh8sQWjgA==