From: Stefan Monnier Date: Mon, 27 Apr 2015 19:33:43 +0000 (-0400) Subject: * lisp/emacs-lisp/eieio-core.el (eieio-defclass-internal): Reuse oldc. X-Git-Tag: emacs-25.0.90~2284 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d92e0c58e859592eba21176a09797e083ff9c541;p=emacs.git * lisp/emacs-lisp/eieio-core.el (eieio-defclass-internal): Reuse oldc. --- diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 59d834837b0..582ac8a6524 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -277,12 +277,12 @@ See `defclass' for more information." (setq eieio-hook nil) (let* ((oldc (let ((c (eieio--class-v cname))) (if (eieio--class-p c) c))) - (newc (if (and oldc (not (eieio--class-default-object-cache oldc))) - ;; The oldc class is a stub setup by eieio-defclass-autoload. - ;; Reuse it instead of creating a new one, so that existing - ;; references stay valid. - oldc - (eieio--class-make cname))) + (newc (or oldc + ;; Reuse `oldc' instead of creating a new one, so that + ;; existing references stay valid. E.g. when + ;; reloading the file that does the `defclass', we don't + ;; want to create a new class object. + (eieio--class-make cname))) (groups nil) ;; list of groups id'd from slots (clearparent nil))