Fixes: debbugs:19552

* lisp/emacs-lisp/eieio-core.el (eieio-defclass): Fix call to `defclass'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 504012eb5735a4fd099ec746a000c798088fa1fe..532a10a1b713f49f745ed1351ef129f8a7ed1662 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/eieio-core.el (eieio-defclass): Fix call to `defclass'
+       (bug#19552).
+
 2015-01-13  Dmitry Gutov  <dgutov@yandex.ru>
 
        * menu-bar.el (menu-bar-goto-menu): Before calling

diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el
index dc2c873eb42cb582d4ba242dbaa882b23cc941a2..0f2da634ff34001be1c85a527ef7f38b871ccb42 100644 (file)
--- a/lisp/emacs-lisp/eieio-core.el
+++ b/lisp/emacs-lisp/eieio-core.el
@@ -1307,7 +1307,7 @@ method invocation orders of the involved classes."
 ;; To support .elc files compiled for older versions of EIEIO.
 
 (defun eieio-defclass (cname superclasses slots options)
-  (eval `(defclass ,cname ,superclasses ,slots ,options)))
+  (eval `(defclass ,cname ,superclasses ,slots ,@options)))
 
 
 (provide 'eieio-core)