[Emacs-diffs] /srv/bzr/emacs/trunk r105576: Fix format bug in defstruct

[Leo Liu]

------------------------------------------------------------
revno: 105576
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Fri 2011-08-26 17:52:07 +0800
message:
  Fix format bug in defstruct
  
  http://debbugs.gnu.org/9357
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/cl-macs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-25 20:48:45 +0000
+++ b/lisp/ChangeLog    2011-08-26 09:52:07 +0000
@@ -1,3 +1,7 @@
+2011-08-26  Leo Liu  <address@hidden>
+
+       * emacs-lisp/cl-macs.el (defstruct): Fix format.  (Bug#9357)
+
 2011-08-25  Juri Linkov  <address@hidden>
 
        * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to

=== modified file 'lisp/emacs-lisp/cl-macs.el'
--- a/lisp/emacs-lisp/cl-macs.el        2011-08-06 00:21:29 +0000
+++ b/lisp/emacs-lisp/cl-macs.el        2011-08-26 09:52:07 +0000
@@ -2416,9 +2416,8 @@
                        (append
                         (and pred-check
                              (list (list 'or pred-check
-                                         (list 'error
-                                               (format "%s accessing a non-%s"
-                                                       accessor name)))))
+                                         `(error "%s accessing a non-%s"
+                                                 ',accessor ',name))))
                         (list (if (eq type 'vector) (list 'aref 'cl-x pos)
                                 (if (= pos 0) '(car cl-x)
                                   (list 'nth pos 'cl-x)))))) forms)
@@ -2426,9 +2425,8 @@
              (push (list 'define-setf-method accessor '(cl-x)
                             (if (cadr (memq :read-only (cddr desc)))
                                  (list 'progn '(ignore cl-x)
-                                       (list 'error
-                                             (format "%s is a read-only slot"
-                                                     'accessor)))
+                                       `(error "%s is a read-only slot"
+                                              ',accessor))
                               ;; If cl is loaded only for compilation,
                               ;; the call to cl-struct-setf-expander would
                               ;; cause a warning because it may not be