[Emacs-diffs] /srv/bzr/emacs/trunk r110899: * lisp/emacs-lisp/cl-macs.el (cl--transform-lambda): Defend against

[Stefan Monnier]

------------------------------------------------------------
revno: 110899
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12884
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-14 20:26:52 -0500
message:
  * lisp/emacs-lisp/cl-macs.el (cl--transform-lambda): Defend against
  potential binding of print-gensym to t, and prettify (back)quotes in
  case they appear in args's default values.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/cl-macs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-14 20:27:42 +0000
+++ b/lisp/ChangeLog    2012-11-15 01:26:52 +0000
@@ -1,3 +1,9 @@
+2012-11-15  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/cl-macs.el (cl--transform-lambda): Defend against
+       potential binding of print-gensym to t, and prettify (back)quotes in
+       case they appear in args's default values (bug#12884).
+
 2012-11-14  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/nadvice.el: Add around advice for interactive specs.

=== modified file 'lisp/emacs-lisp/cl-macs.el'
--- a/lisp/emacs-lisp/cl-macs.el        2012-11-13 03:00:09 +0000
+++ b/lisp/emacs-lisp/cl-macs.el        2012-11-15 01:26:52 +0000
@@ -260,9 +260,11 @@
                         (require 'help-fns)
                         (cons (help-add-fundoc-usage
                                (if (stringp (car hdr)) (pop hdr))
-                               (format "%S"
-                                       (cons 'fn
-                                             (cl--make-usage-args orig-args))))
+                               ;; Be careful with make-symbol and (back)quote,
+                               ;; see bug#12884.
+                               (let ((print-gensym nil) (print-quoted t))
+                                 (format "%S" (cons 'fn (cl--make-usage-args
+                                                         orig-args)))))
                               hdr)))
                    (list `(let* ,cl--bind-lets
                              ,@(nreverse cl--bind-forms)