summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/eieio.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-06-01 12:04:42 -0700
committerGlenn Morris <rgm@gnu.org>2019-06-01 12:04:42 -0700
commit7e911d007d25df9a483eaad54956a4273405574e (patch)
treece1e4b0eda6c940634922e71a726b5c8aa5270b4 /lisp/emacs-lisp/eieio.el
parentf17e0e93bd8dbe3b069029585dc5d2dda57c1e1e (diff)
parent134edc10367a8434167656e631865c85b5f10c42 (diff)
downloademacs-7e911d007d25df9a483eaad54956a4273405574e.tar.gz
Merge from origin/emacs-26
134edc1 Warn about wrong number of args for subrs (Bug#35767) 5f01af6 Use plain symbols for eieio type descriptors (Bug#29220) 4b24b01 Pacify GCC 9 -Wredundant-decls
Diffstat (limited to 'lisp/emacs-lisp/eieio.el')
-rw-r--r--lisp/emacs-lisp/eieio.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index b6ec191e2ba..7ad44b6d26c 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -710,6 +710,9 @@ calls `initialize-instance' on that object."
;; Call the initialize method on the new object with the slots
;; that were passed down to us.
(initialize-instance new-object slots)
+ (when eieio-backward-compatibility
+ ;; Use symbol as type descriptor, for backwards compatibility.
+ (aset new-object 0 class))
;; Return the created object.
new-object))