diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-01-03 16:33:29 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-01-03 16:33:29 +0900 |
| commit | 44f7f57c6833149799539c5e0abcadf4d7d61d43 (patch) | |
| tree | b9bbe6e261c80333dfacb62f7288cc9b37bbf588 /lisp/emacs-lisp/eieio-core.el | |
| parent | 0af4e7587e1b5ac9066e17b875952cb5a16e63c0 (diff) | |
| parent | 825b4ec338e82869dc656c7041ab2483b6c22479 (diff) | |
| download | emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.tar.gz emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.tar.bz2 emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/emacs-lisp/eieio-core.el')
| -rw-r--r-- | lisp/emacs-lisp/eieio-core.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 3bc65d0d4c5..3e5e9b95235 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -1,6 +1,6 @@ ;;; eieio-core.el --- Core implementation for eieio -*- lexical-binding:t -*- -;; Copyright (C) 1995-1996, 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1996, 1998-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Version: 1.4 @@ -587,8 +587,8 @@ If SKIPNIL is non-nil, then if default value is nil return t instead." (defun eieio--add-new-slot (newc slot init alloc &optional defaultoverride skipnil) "Add into NEWC attribute SLOT. -If a slot of that name already exists in NEWC, then do nothing. If it doesn't exist, -INIT is the initarg, if any. +If a slot of that name already exists in NEWC, then do nothing. +If it doesn't exist, INIT is the initarg, if any. Argument ALLOC specifies if the slot is allocated per instance, or per class. If optional DEFAULTOVERRIDE is non-nil, then if A exists in NEWC, we must override its value for a default. |