diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-04 15:02:03 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-04 15:02:03 -0700 |
commit | ae0a1a890ec7b885e85cd945a21ca42fed80df3d (patch) | |
tree | 495f1d851cb3a43a0e677bff9c09d4211a35fbde /lisp/emacs-lisp | |
parent | 66b5222c3cd72839bf72e0b2a03912719c930451 (diff) | |
parent | acae275b2752357497a2411876b83240ce7c8aec (diff) | |
download | emacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.tar.gz emacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.tar.bz2 emacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.zip |
Merge from origin/emacs-25
acae275 ; Spelling fixes
d8fac73 Update README for precompiled windows Emacs.
23570fd Clarify documentation of 'vc-responsible-backend' wrt symlinks
f708cb2 Clarify doc string of 'transpose-sexps'
cd05b1d Fix docstring of 'browse-url-firefox-new-window-is-tab'
bdc89eb Improve documentation of 'font-lock-remove-keywords'
4a0c590 Fix documentation of the command summary key
0221b7a Mark relocation workarounds with REL_ALLOC
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/eieio-core.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 52577adefac..624dccef075 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -460,7 +460,7 @@ See `defclass' for more information." (cl--slot-descriptor-initform (aref slots i))))) (setf (eieio--class-class-allocation-values newc) v)) - ;; Attach slot symbols into a hashtable, and store the index of + ;; Attach slot symbols into a hash table, and store the index of ;; this slot as the value this table. (let* ((slots (eieio--class-slots newc)) ;; (cslots (eieio--class-class-slots newc)) |