From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 13 Jan 2015 15:17:44 +0000 (-0500)
Subject: Fixes: debbugs:19552
X-Git-Tag: emacs-25.0.90~2603^2~17
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3024739131467b607fa745daf52ca25a3fd3c4d;p=emacs.git

Fixes: debbugs:19552

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 504012eb573..532a10a1b71 100644
--- 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 dc2c873eb42..0f2da634ff3 100644
--- 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)