[Emacs-diffs] trunk r116743: lisp/emacs-lisp/eieio.el (with-slots): Use cl-symbol-macrolet (bug#16998).

[Juanma Barranquero]

------------------------------------------------------------
revno: 116743
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16998
author: Jonas Bernoulli <address@hidden>
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2014-03-12 16:02:45 +0100
message:
  lisp/emacs-lisp/eieio.el (with-slots): Use cl-symbol-macrolet (bug#16998).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/eieio.el       eieio.el-20091113204419-o5vbwnq5f7feedwu-10973

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-12 07:28:23 +0000
+++ b/lisp/ChangeLog    2014-03-12 15:02:45 +0000
@@ -1,3 +1,7 @@
+2014-03-12  Jonas Bernoulli  <address@hidden>
+
+       * emacs-lisp/eieio.el (with-slots): Use cl-symbol-macrolet (bug#16998).
+
 2014-03-12  Martin Rudalics  <address@hidden>
 
        * window.el (fit-frame-to-buffer): Get maximum width from

=== modified file 'lisp/emacs-lisp/eieio.el'
--- a/lisp/emacs-lisp/eieio.el  2014-01-30 11:19:16 +0000
+++ b/lisp/emacs-lisp/eieio.el  2014-03-12 15:02:45 +0000
@@ -246,13 +246,13 @@
 SLOT.  A slot specified without a variable name is given a
 variable name of the same name as the slot."
   (declare (indent 2))
-  ;; Transform the spec-list into a symbol-macrolet spec-list.
+  ;; Transform the spec-list into a cl-symbol-macrolet spec-list.
   (let ((mappings (mapcar (lambda (entry)
                            (let ((var  (if (listp entry) (car entry) entry))
                                  (slot (if (listp entry) (cadr entry) entry)))
                              (list var `(slot-value ,object ',slot))))
                          spec-list)))
-    (append (list 'symbol-macrolet mappings)
+    (append (list 'cl-symbol-macrolet mappings)
            body)))
 
 ;;; Simple generators, and query functions.  None of these would do