diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-13 20:35:22 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-13 20:35:22 -0800 |
| commit | c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (patch) | |
| tree | e707b79a846623490feea39a4dceb86dd218eb4d /lisp/emacs-lisp | |
| parent | 6a0bf43d7c5961297aa5024aec534e5bab73c8af (diff) | |
| parent | 56632ce4cd8616f0613e8734d62ec5e2f833c7dc (diff) | |
| download | emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.tar.gz emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.tar.bz2 emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/eieio-opt.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index 1b101cef875..8869530dc23 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -92,7 +92,7 @@ Optional HEADERFCN should be called to insert a few bits of info first." (princ "Class ") (prin1 class) (terpri) - ;; Inheritence tree information + ;; Inheritance tree information (let ((pl (class-parents class))) (when pl (princ " Inherits from ") diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index f1fe9594fc0..352bd245ba4 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -1,5 +1,5 @@ ;;; eieio.el --- Enhanced Implementation of Emacs Interpreted Objects -;;; or maybe Eric's Implementation of Emacs Intrepreted Objects +;;; or maybe Eric's Implementation of Emacs Interpreted Objects ;; Copyright (C) 1995-1996, 1998-2011 Free Software Foundation, Inc. |