From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 23 Sep 2022 21:42:55 +0000 (-0400)
Subject: * lisp/emacs-lisp/eieio.el (defclass): Fix bug#51068
X-Git-Tag: emacs-29.0.90~1856^2~283
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=40bc027bf44e540fdf702bb56f139a7d95ee55c0;p=emacs.git

* lisp/emacs-lisp/eieio.el (defclass): Fix bug#51068

Accept (defclass <class> <superclasses> (.. <slotname> ..)) without
having to wrap the slot name within parentheses.
---

diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 984166b593a..a6c900a3355 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -136,6 +136,7 @@ and reference them using the function `class-option'."
         (accessors ()))
 
     ;; Collect the accessors we need to define.
+    (setq slots (mapcar (lambda (x) (if (consp x) x (list x))) slots))
     (pcase-dolist (`(,sname . ,soptions) slots)
       (let* ((acces   (plist-get soptions :accessor))
 	     (initarg (plist-get soptions :initarg))