From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 6 Mar 2021 18:31:58 +0000 (-0500)
Subject: * lisp/cedet/srecode/compile.el: Fix last change
X-Git-Tag: emacs-28.0.90~3401
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8fc6810eb640ffe7af1885166814689f5b28a65e;p=emacs.git

* lisp/cedet/srecode/compile.el: Fix last change

(srecode-compile-inserter): Call `make-instance` properly.
---

diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 22cacab078d..36df1da9e33 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -499,7 +499,7 @@ PROPS are additional properties that might need to be passed
 to the inserter constructor."
   ;;(message "Compile: %s %S" name props)
   (if (not key)
-      (make-instance 'srecode-template-inserter-variable name props)
+      (apply #'make-instance 'srecode-template-inserter-variable name props)
     (let ((classes (eieio-class-children 'srecode-template-inserter))
 	  (new nil))
       ;; Loop over the various subclasses and
@@ -510,7 +510,7 @@ to the inserter constructor."
 	(when (and (not (class-abstract-p (car classes)))
 		   (equal (oref-default (car classes) key) key))
 	  ;; Create the new class, and apply state.
-	  (setq new (apply (car classes) name props))
+	  (setq new (apply #'make-instance (car classes) name props))
 	  (srecode-inserter-apply-state new STATE)
 	  )
 	(setq classes (cdr classes)))