2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7452455efec..5198f1f55ba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-12  Jonas Bernoulli  <jonas@bernoul.li>
+
+        * emacs-lisp/eieio.el (with-slots): Use cl-symbol-macrolet (bug#16998).
+
 2014-03-12  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (fit-frame-to-buffer): Get maximum width from
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index a1b5b381571..566821ede91 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -246,13 +246,13 @@ Where each VAR is the local variable given to the associated
 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