From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 25 Jul 2017 14:12:58 +0000 (-0400)
Subject: * lisp/emacs-lisp/eieio-compat.el (eieio--defgeneric-init-form):
X-Git-Tag: emacs-26.0.90~517^2~107
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=24b91584c214caadff0f2394cf1f021bf480b624;p=emacs.git

* lisp/emacs-lisp/eieio-compat.el (eieio--defgeneric-init-form):

Adjust to change in cl-generic-ensure-function.
---

diff --git a/lisp/emacs-lisp/eieio-compat.el b/lisp/emacs-lisp/eieio-compat.el
index e6e6d118709..8403a8a655f 100644
--- a/lisp/emacs-lisp/eieio-compat.el
+++ b/lisp/emacs-lisp/eieio-compat.el
@@ -165,7 +165,8 @@ Summary:
   (if (memq method '(no-next-method no-applicable-method))
       (symbol-function method)
     (let ((generic (cl-generic-ensure-function method)))
-      (symbol-function (cl--generic-name generic)))))
+      (or (symbol-function (cl--generic-name generic))
+          (cl--generic-make-function generic)))))
 
 ;;;###autoload
 (defun eieio--defmethod (method kind argclass code)