Merge from CEDET upstream (8564).

* lisp/emacs-lisp:

	* emacs-lisp/eieio.el (eieio--defalias, eieio-hook)
	(eieio-error-unsupported-class-tags, eieio-skip-typecheck)
	(eieio-optimize-primary-methods-flag, eieio-initializing-object)
	(eieio-unbound, eieio-default-superclass)
	(eieio--define-field-accessors, method-static, method-before)
	(method-primary, method-after, method-num-lists)
	(method-generic-before, method-generic-primary)
	(method-generic-after, method-num-slots)
	(eieio-specialized-key-to-generic-key)
	(eieio--check-type, class-v, class-p)
	(eieio-class-name, define-obsolete-function-alias)
	(eieio-class-parents-fast, eieio-class-children-fast)
	(same-class-fast-p, class-constructor, generic-p)
	(generic-primary-only-p, generic-primary-only-one-p)
	(class-option-assoc, class-option, eieio-object-p)
	(class-abstract-p, class-method-invocation-order)
	(eieio-defclass-autoload-map, eieio-defclass-autoload)
	(eieio-class-un-autoload, eieio-defclass)
	(eieio-eval-default-p, eieio-perform-slot-validation-for-default)
	(eieio-add-new-slot, eieio-copy-parents-into-subclass)
	(eieio--defgeneric-init-form, eieio-defgeneric-form)
	(eieio-defgeneric-reset-generic-form)
	(eieio-defgeneric-form-primary-only)
	(eieio-defgeneric-reset-generic-form-primary-only)
	(eieio-defgeneric-form-primary-only-one)
	(eieio-defgeneric-reset-generic-form-primary-only-one)
	(eieio-unbind-method-implementations)
	(eieio--defmethod, eieio--typep)
	(eieio-perform-slot-validation, eieio-validate-slot-value)
	(eieio-validate-class-slot-value, eieio-barf-if-slot-unbound)
	(eieio-oref, eieio-oref-default, eieio-default-eval-maybe)
	(eieio-oset, eieio-oset-default, eieio-slot-originating-class-p)
	(eieio-slot-name-index, eieio-class-slot-name-index)
	(eieio-set-defaults, eieio-initarg-to-attribute)
	(eieio-attribute-to-initarg, eieio-c3-candidate)
	(eieio-c3-merge-lists, eieio-class-precedence-c3)
	(eieio-class-precedence-dfs, eieio-class-precedence-bfs)
	(eieio-class-precedence-list, eieio-generic-call-methodname)
	(eieio-generic-call-arglst, eieio-generic-call-key)
	(eieio-generic-call-next-method-list)
	(eieio-pre-method-execution-functions, eieio-generic-call)
	(eieio-generic-call-primary-only, eieiomt-method-list)
	(eieiomt-optimizing-obarray, eieiomt-install)
	(eieiomt-add, eieiomt-next, eieiomt-sym-optimize)
	(eieio-generic-form, eieio-defmethod, make-obsolete)
	(eieio-defgeneric, make-obsolete): Moved to eieio-core.el
	(defclass): Remove `eval-and-compile' from macro.
	(call-next-method, shared-initialize): Instead of using
	`scoped-class' variable, use new eieio--scoped-class, and
	eieio--with-scoped-class.
	(initialize-instance): Rename local variable 'scoped-class' to
	'this-class' to remove ambiguitity from old global.

	* emacs-lisp/eieio-core.el: New file.  Derived from key parts of
	eieio.el.
	(eieio--scoped-class-stack): New variable
	(eieio--scoped-class): New fcn
	(eieio--with-scoped-class): New scoping macro.
	(eieio-defclass): Use pushnew instead of add-to-list.
	(eieio-defgeneric-form-primary-only-one, eieio-oset-default)
	(eieio-slot-name-index, eieio-set-defaults, eieio-generic-call)
	(eieio-generic-call-primary-only, eieiomt-add): Instead of using
	`scoped-class' variable, use new eieio--scoped-class, and
	eieio--with-scoped-class.

	* emacs-lisp/eieio-base.el (cl-lib): Require during compile.

* admin/grammars:

	* grammars/srecode-template.wy (variable): Accept a single number
	as a variable value.  Allows the 'priority' to be set to a number.
	(wisent-srecode-template-lexer): Move number up so it can be
	created.

* etc/srecode:

	* srecode/c.srt (header_guard): Add :c parameter so it works
	standalone

* lisp/cedet:

	* semantic/edit.el (semantic-change-function): Use
	`save-match-data' around running hooks.

	* semantic/decorate/mode.el
	(semantic-decorate-style-predicate-default)
	(semantic-decorate-style-highlighter-default): New.
	(semantic-decoration-mode): Do not require
	`semantic/decorate/include' anymore.
	(semantic-toggle-decoration-style): Error if an unknown decoration
	style is toggled.
	(define-semantic-decoration-style): Add new :load option.  When
	:load is specified, add autoload tokens for the definition
	functions so that code is loaded when the mode is used.
	(semantic-decoration-on-includes): New autoload definition for
	highlighting includes.

	* semantic/bovine/c.el (semantic-lex-c-ifdef): Allow some misc
	characters to appear after the tested variable.

	* semantic/ede-grammar.el (project-compile-target): Calculate full
	src name via ede-expand-filename instead of the crutch of the
	current buffer.  Enables this target to compile in batch mode.

	* semantic/idle.el
	(semantic-idle-symbol-maybe-highlight): Wrap highlighting of
	remote symbol with `save-excursion'.
	(semantic-idle-scheduler-work-parse-neighboring-files): Instead of
	using directory-files on each found mode pattern, collect all the
	patterns for the current mode, and then for each file, see if it
	matches any of them.  If it does, parse the file.  (Patch
	inspiration from Tomasz Gajewski.)

	* semantic/ctxt.el (semantic-ctxt-end-of-symbol): New.
	(semantic-ctxt-current-symbol-default): New.

	* semantic/bovine/el.el (semantic-default-elisp-setup): Add
	autoload cookie.  Explain existence.
	(footer): Add local variable for loaddefs.

	* semantic/db.el (semanticdb-file-table-object): Add new filter,
	only checking for regular files too.

	* semantic/wisent/python.el
	(semantic-format-tag-abbreviate): New override.  Cuts back on size
	of code tags.

	* srecode/compile.el (srecode-compile-templates): Fix warning
	punctuation.  Remove status messages to clean up testing output

	* ede/base.el (ede-project-placeholder-cache-file): Update doc to
	mention 'nil' value.
	(ede-save-cache): Disable cache save if file is nil.

	* ede.el (ede-initialize-state-current-buffer): Flush deleted
	projects.
	(global-ede-mode): Always append our find-file-hook to the end.
	(ede-flush-deleted-projects): New command.

	* ede/cpp-root.el (ede-preprocessor-map): Protect against init
	problems.

	* ede/proj.el (ede-proj-target): Added a new "custom" option for
	custom symbols representing a compiler or linker instead of
	restricting things to only the predefined compilers and linkers.

	* semantic.el (semantic-mode-map): To avoid showing showing
	Development menu twice, only disable menu item if menu-bar is
	actually enabled, otherwise the popup 'global menu' might display
	a disabled Development menu.

	* semantic/complete.el
	(semantic-displayor-show-request): Fix which slot in obj is set to
	the max tags.

21 files changed, 2706 insertions, 2284 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f9302680be..4d44a291483 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,72 @@
+2013-06-02  Eric Ludlam <zappo@gnu.org>
+
+        * emacs-lisp/eieio.el (eieio--defalias, eieio-hook)
+        (eieio-error-unsupported-class-tags, eieio-skip-typecheck)
+        (eieio-optimize-primary-methods-flag, eieio-initializing-object)
+        (eieio-unbound, eieio-default-superclass)
+        (eieio--define-field-accessors, method-static, method-before)
+        (method-primary, method-after, method-num-lists)
+        (method-generic-before, method-generic-primary)
+        (method-generic-after, method-num-slots)
+        (eieio-specialized-key-to-generic-key)
+        (eieio--check-type, class-v, class-p)
+        (eieio-class-name, define-obsolete-function-alias)
+        (eieio-class-parents-fast, eieio-class-children-fast)
+        (same-class-fast-p, class-constructor, generic-p)
+        (generic-primary-only-p, generic-primary-only-one-p)
+        (class-option-assoc, class-option, eieio-object-p)
+        (class-abstract-p, class-method-invocation-order)
+        (eieio-defclass-autoload-map, eieio-defclass-autoload)
+        (eieio-class-un-autoload, eieio-defclass)
+        (eieio-eval-default-p, eieio-perform-slot-validation-for-default)
+        (eieio-add-new-slot, eieio-copy-parents-into-subclass)
+        (eieio--defgeneric-init-form, eieio-defgeneric-form)
+        (eieio-defgeneric-reset-generic-form)
+        (eieio-defgeneric-form-primary-only)
+        (eieio-defgeneric-reset-generic-form-primary-only)
+        (eieio-defgeneric-form-primary-only-one)
+        (eieio-defgeneric-reset-generic-form-primary-only-one)
+        (eieio-unbind-method-implementations)
+        (eieio--defmethod, eieio--typep)
+        (eieio-perform-slot-validation, eieio-validate-slot-value)
+        (eieio-validate-class-slot-value, eieio-barf-if-slot-unbound)
+        (eieio-oref, eieio-oref-default, eieio-default-eval-maybe)
+        (eieio-oset, eieio-oset-default, eieio-slot-originating-class-p)
+        (eieio-slot-name-index, eieio-class-slot-name-index)
+        (eieio-set-defaults, eieio-initarg-to-attribute)
+        (eieio-attribute-to-initarg, eieio-c3-candidate)
+        (eieio-c3-merge-lists, eieio-class-precedence-c3)
+        (eieio-class-precedence-dfs, eieio-class-precedence-bfs)
+        (eieio-class-precedence-list, eieio-generic-call-methodname)
+        (eieio-generic-call-arglst, eieio-generic-call-key)
+        (eieio-generic-call-next-method-list)
+        (eieio-pre-method-execution-functions, eieio-generic-call)
+        (eieio-generic-call-primary-only, eieiomt-method-list)
+        (eieiomt-optimizing-obarray, eieiomt-install)
+        (eieiomt-add, eieiomt-next, eieiomt-sym-optimize)
+        (eieio-generic-form, eieio-defmethod, make-obsolete)
+        (eieio-defgeneric, make-obsolete): Moved to eieio-core.el
+        (defclass): Remove `eval-and-compile' from macro.
+        (call-next-method, shared-initialize): Instead of using
+        `scoped-class' variable, use new eieio--scoped-class, and
+        eieio--with-scoped-class.
+        (initialize-instance): Rename local variable 'scoped-class' to
+        'this-class' to remove ambiguitity from old global.
+
+        * emacs-lisp/eieio-core.el: New file.  Derived from key parts of
+        eieio.el.
+        (eieio--scoped-class-stack): New variable
+        (eieio--scoped-class): New fcn
+        (eieio--with-scoped-class): New scoping macro.
+        (eieio-defclass): Use pushnew instead of add-to-list.
+        (eieio-defgeneric-form-primary-only-one, eieio-oset-default)
+        (eieio-slot-name-index, eieio-set-defaults, eieio-generic-call)
+        (eieio-generic-call-primary-only, eieiomt-add): Instead of using
+        `scoped-class' variable, use new eieio--scoped-class, and
+        eieio--with-scoped-class.
+
+        * emacs-lisp/eieio-base.el (cl-lib): Require during compile.
+
 2013-05-28  Alan Mackenzie  <acm@muc.de>
 
         Handle "capitalised keywords" correctly.
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 25f966362ce..c662f5e817c 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,83 @@
+2013-06-02  Eric Ludlam <zappo@gnu.org>
+
+        * semantic/edit.el (semantic-change-function): Use
+        `save-match-data' around running hooks.
+
+        * semantic/decorate/mode.el
+        (semantic-decorate-style-predicate-default)
+        (semantic-decorate-style-highlighter-default): New.
+        (semantic-decoration-mode): Do not require
+        `semantic/decorate/include' anymore.
+        (semantic-toggle-decoration-style): Error if an unknown decoration
+        style is toggled.
+        (define-semantic-decoration-style): Add new :load option.  When
+        :load is specified, add autoload tokens for the definition
+        functions so that code is loaded when the mode is used.
+        (semantic-decoration-on-includes): New autoload definition for
+        highlighting includes.
+
+        * semantic/bovine/c.el (semantic-lex-c-ifdef): Allow some misc
+        characters to appear after the tested variable.
+
+        * semantic/ede-grammar.el (project-compile-target): Calculate full
+        src name via ede-expand-filename instead of the crutch of the
+        current buffer.  Enables this target to compile in batch mode.
+
+        * semantic/idle.el
+        (semantic-idle-symbol-maybe-highlight): Wrap highlighting of
+        remote symbol with `save-excursion'.
+        (semantic-idle-scheduler-work-parse-neighboring-files): Instead of
+        using directory-files on each found mode pattern, collect all the
+        patterns for the current mode, and then for each file, see if it
+        matches any of them.  If it does, parse the file.  (Patch
+        inspiration from Tomasz Gajewski.)
+
+        * semantic/ctxt.el (semantic-ctxt-end-of-symbol): New.
+        (semantic-ctxt-current-symbol-default): New.
+
+        * semantic/bovine/el.el (semantic-default-elisp-setup): Add
+        autoload cookie.  Explain existence.
+        (footer): Add local variable for loaddefs.
+
+        * semantic/db.el (semanticdb-file-table-object): Add new filter,
+        only checking for regular files too.
+
+        * semantic/wisent/python.el
+        (semantic-format-tag-abbreviate): New override.  Cuts back on size
+        of code tags.
+
+        * srecode/compile.el (srecode-compile-templates): Fix warning
+        punctuation.  Remove status messages to clean up testing output
+
+        * ede/base.el (ede-project-placeholder-cache-file): Update doc to
+        mention 'nil' value.
+        (ede-save-cache): Disable cache save if file is nil.
+
+        * ede.el (ede-initialize-state-current-buffer): Flush deleted
+        projects.
+        (global-ede-mode): Always append our find-file-hook to the end.
+        (ede-flush-deleted-projects): New command.
+
+        * ede/cpp-root.el (ede-preprocessor-map): Protect against init
+        problems.
+
+        * ede/proj.el (ede-proj-target): Added a new "custom" option for
+        custom symbols representing a compiler or linker instead of
+        restricting things to only the predefined compilers and linkers.
+
+2013-06-02  David Engster <dengste@eml.cc>
+
+        * semantic.el (semantic-mode-map): To avoid showing showing
+        Development menu twice, only disable menu item if menu-bar is
+        actually enabled, otherwise the popup 'global menu' might display
+        a disabled Development menu.
+
+2013-06-02  Pete Beardmore  <elbeardmorez@msn.com>
+
+        * semantic/complete.el
+        (semantic-displayor-show-request): Fix which slot in obj is set to
+        the max tags.
+
 2013-05-24  Glenn Morris  <rgm@gnu.org>
 
         * semantic/bovine/grammar.el (bovine-make-parsers):
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 5fecd8b994f..3483d541122 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -494,6 +494,11 @@ provided `global-ede-mode' is enabled."
 (defun ede-initialize-state-current-buffer ()
   "Initialize the current buffer's state for EDE.
 Sets buffer local variables for EDE."
+  ;; due to inode recycling, make sure we don't
+  ;; we flush projects deleted off the system.
+  (ede-flush-deleted-projects)
+
+  ;; Init the buffer.
   (let* ((ROOT nil)
          (proj (ede-directory-get-open-project default-directory
                                                'ROOT))
@@ -569,7 +574,9 @@ an EDE controlled project."
         (add-hook 'semanticdb-project-predicate-functions 'ede-directory-project-p)
         (add-hook 'semanticdb-project-root-functions 'ede-toplevel-project-or-nil)
         (add-hook 'ecb-source-path-functions 'ede-ecb-project-paths)
-        (add-hook 'find-file-hook 'ede-turn-on-hook)
+        ;; Append our hook to the end.  This allows mode-local to finish
+        ;; it's stuff before we start doing misc file loads, etc.
+        (add-hook 'find-file-hook 'ede-turn-on-hook t)
         (add-hook 'dired-mode-hook 'ede-turn-on-hook)
         (add-hook 'kill-emacs-hook 'ede-save-cache)
         (ede-load-cache)
@@ -1057,6 +1064,18 @@ On success, return the added project."
   (add-to-list 'ede-projects proj)
   proj)
 
+(defun ede-flush-deleted-projects ()
+  "Scan the projects list for projects which no longer exist.
+Flush the dead projects from the project cache."
+  (interactive)
+  (let ((dead nil))
+    (dolist (P ede-projects)
+      (when (not (file-exists-p (oref P :file)))
+        (add-to-list 'dead P)))
+    (dolist (D dead)
+      (setq ede-projects (remove D ede-projects)))
+    ))
+
 (defun ede-load-project-file (dir &optional rootreturn)
   "Project file independent way to read a project in from DIR.
 Optional ROOTRETURN will return the root project for DIR."
diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el
index 5302ac3207a..a94ce8f1868 100644
--- a/lisp/cedet/ede/base.el
+++ b/lisp/cedet/ede/base.el
@@ -306,7 +306,8 @@ All specific project types must derive from this project."
 ;;
 (defcustom ede-project-placeholder-cache-file
   (locate-user-emacs-file "ede-projects.el" ".projects.ede")
-  "File containing the list of projects EDE has viewed."
+  "File containing the list of projects EDE has viewed.
+If set to nil, then the cache is not saved."
   :group 'ede
   :type 'file)
 
@@ -316,38 +317,39 @@ All specific project types must derive from this project."
 (defun ede-save-cache ()
   "Save a cache of EDE objects that Emacs has seen before."
   (interactive)
-  (let ((p ede-projects)
-        (c ede-project-cache-files)
-        (recentf-exclude '( (lambda (f) t) ))
-        )
-    (condition-case nil
-        (progn
-          (set-buffer (find-file-noselect ede-project-placeholder-cache-file t))
-          (erase-buffer)
-          (insert ";; EDE project cache file.
-;; This contains a list of projects you have visited.\n(")
-          (while p
-            (when (and (car p) (ede-project-p p))
-              (let ((f (oref (car p) file)))
-                (when (file-exists-p f)
-                  (insert "\n  \"" f "\""))))
-            (setq p (cdr p)))
-          (while c
-            (insert "\n \"" (car c) "\"")
-            (setq c (cdr c)))
-          (insert "\n)\n")
-          (condition-case nil
-              (save-buffer 0)
-            (error
-             (message "File %s could not be saved."
-                      ede-project-placeholder-cache-file)))
-          (kill-buffer (current-buffer))
+  (when ede-project-placeholder-cache-file
+    (let ((p ede-projects)
+          (c ede-project-cache-files)
+          (recentf-exclude '( (lambda (f) t) ))
           )
-      (error
-       (message "File %s could not be read."
-                ede-project-placeholder-cache-file))
-
-      )))
+      (condition-case nil
+          (progn
+            (set-buffer (find-file-noselect ede-project-placeholder-cache-file t))
+            (erase-buffer)
+            (insert ";; EDE project cache file.
+;; This contains a list of projects you have visited.\n(")
+            (while p
+              (when (and (car p) (ede-project-p p))
+                (let ((f (oref (car p) file)))
+                  (when (file-exists-p f)
+                    (insert "\n  \"" f "\""))))
+              (setq p (cdr p)))
+            (while c
+              (insert "\n \"" (car c) "\"")
+              (setq c (cdr c)))
+            (insert "\n)\n")
+            (condition-case nil
+                (save-buffer 0)
+              (error
+               (message "File %s could not be saved."
+                        ede-project-placeholder-cache-file)))
+            (kill-buffer (current-buffer))
+            )
+        (error
+         (message "File %s could not be read."
+                  ede-project-placeholder-cache-file))
+
+        ))))
 
 (defun ede-load-cache ()
   "Load the cache of EDE projects."
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 47ba16ade7f..719289765a3 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -507,7 +507,10 @@ This is for project include paths and spp source files."
      (lambda (F)
        (let* ((expfile (ede-expand-filename root F))
               (table (when expfile
-                       (semanticdb-file-table-object expfile)))
+                       ;; Disable EDE init on preprocessor file load
+                       ;; otherwise we recurse, cause errs, etc.
+                       (let ((ede-constructing t))
+                         (semanticdb-file-table-object expfile))))
               )
          (cond
           ((not (file-exists-p expfile))
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 702e35f0b1f..99a5978b005 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -104,6 +104,7 @@ distributed, and each should have a corresponding rule to build it.")
              :initform nil
              :type (or null symbol)
              :custom (choice (const :tag "None" nil)
+                             (symbol :tag "Custom Compiler Symbol")
                              :slotofchoices availablecompilers)
              :label "Compiler for building sources"
              :group make
@@ -116,6 +117,7 @@ of these compiler resources, and global customization thereof.")
              :initform nil
              :type (or null symbol)
              :custom (choice (const :tag "None" nil)
+                             (symbol :tag "Custom Linker Symbol")
                              :slotofchoices availablelinkers)
              :label "Linker for combining intermediate object files."
              :group make
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 3c93a8794b1..909902a71fe 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -899,7 +899,8 @@ Throw away all the old tags, and recreate the tag database."
     ;; and Semantic are both enabled.  Is there a better way?
     (define-key map [menu-bar cedet-menu]
       (list 'menu-item "Development" cedet-menu-map
-            :enable (quote (not (bound-and-true-p global-ede-mode)))))
+            :enable (quote (not (and menu-bar-mode
+                                     (bound-and-true-p global-ede-mode))))))
     ;; (define-key km "-"    'senator-fold-tag)
     ;; (define-key km "+"    'senator-unfold-tag)
     map))
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 2f8cf08af3e..3c991ea8555 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -529,7 +529,7 @@ code to parse."
 (define-lex-regex-analyzer semantic-lex-c-ifdef
   "Code blocks wrapped up in #ifdef.
 Uses known macro tables in SPP to determine what block to skip."
-  "^\\s-*#\\s-*\\(ifndef\\|ifdef\\)\\s-+\\(\\(\\sw\\|\\s_\\)+\\)$"
+  "^\\s-*#\\s-*\\(ifndef\\|ifdef\\)\\s-+\\(\\(\\sw\\|\\s_\\)+\\)\\([ \t\C-m].*\\)?$"
   (semantic-c-do-lex-ifdef))
 
 (defun semantic-c-do-lex-ifdef ()
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index a8ddbe106f7..07e0e08bbaf 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -940,8 +940,11 @@ ELisp variables can be pretty long, so track this one too.")
 (define-child-mode lisp-mode emacs-lisp-mode
   "Make `lisp-mode' inherit mode local behavior from `emacs-lisp-mode'.")
 
+;;;###autoload
 (defun semantic-default-elisp-setup ()
   "Setup hook function for Emacs Lisp files and Semantic."
+  ;; This is here mostly to get this file loaded when a .el file is
+  ;; loaded into Emacs.
   )
 
 (add-hook 'emacs-lisp-mode-hook 'semantic-default-elisp-setup)
@@ -960,6 +963,12 @@ ELisp variables can be pretty long, so track this one too.")
   '(require 'semantic/db-el)
   )
 
+
 (provide 'semantic/bovine/el)
 
+;; Local variables:
+;; generated-autoload-file: "../loaddefs.el"
+;; generated-autoload-load-name: "semantic/bovine/el"
+;; End:
+
 ;;; semantic/bovine/el.el ends here
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 6c2b97a677a..b42e24fb9c0 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1667,7 +1667,7 @@ Display mechanism using tooltip for a list of possible completions.")
           (setq msg "...")))
        ((eq mode 'verbose)
         ;; Always show extended match set.
-        (oset obj max-tags semantic-displayor-tooltip-max-tags)
+        (oset obj max-tags-initial semantic-displayor-tooltip-max-tags)
         (setq max-tags semantic-displayor-tooltip-max-tags)))
       (unless msg
         (oset obj shown t)
diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index 2c0b428c195..efaec4f63b4 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -357,6 +357,87 @@ beginning and end of a command."
             (def-edebug-spec semantic-with-buffer-narrowed-to-command
               (def-body))))
 
+(define-overloadable-function semantic-ctxt-end-of-symbol (&optional point)
+  "Move point to the end of the current symbol under POINT.
+This skips forward over symbols in a complex reference.
+For example, in the C statement:
+  this.that().entry;
+
+If the cursor is on 'this', will move point to the ; after entry.")
+
+(defun semantic-ctxt-end-of-symbol-default (&optional point)
+  "Move poin to the end of the current symbol under POINT.
+This will move past type/field names when applicable.
+Depends on `semantic-type-relation-separator-character', and will
+work on C like languages."
+  (if point (goto-char point))
+  (let* ((fieldsep1 (mapconcat (lambda (a) (regexp-quote a))
+                               semantic-type-relation-separator-character
+                               "\\|"))
+         ;; NOTE: The [ \n] expression below should used \\s-, but that
+         ;; doesn't work in C since \n means end-of-comment, and isn't
+         ;; really whitespace.
+         (fieldsep (concat "[ \t\n\r]*\\(" fieldsep1 "\\)[ \t\n\r]*\\(\\w\\|\\s_\\)"))
+         (case-fold-search semantic-case-fold)
+         (continuesearch t)
+         (end nil)
+         )
+      (with-syntax-table semantic-lex-syntax-table
+        (cond ((looking-at "\\w\\|\\s_")
+               ;; In the middle of a symbol, move to the end.
+               (forward-sexp 1))
+              ((looking-at fieldsep1)
+               ;; We are in a fine spot.. do nothing.
+               nil
+               )
+              ((save-excursion
+                 (and (condition-case nil
+                          (progn (forward-sexp -1)
+                                 (forward-sexp 1)
+                                 t)
+                        (error nil))
+                      (looking-at fieldsep1)))
+               (setq symlist (list ""))
+               (forward-sexp -1)
+               ;; Skip array expressions.
+               (while (looking-at "\\s(") (forward-sexp -1))
+               (forward-sexp 1))
+              )
+        ;; Set the current end marker.
+        (setq end (point))
+
+        ;; Cursor is at the safe end of some symbol.  Look until we
+        ;; find the logical end of this current complex symbol.
+        (condition-case nil
+            (while continuesearch
+              ;; If there are functional arguments, arrays, etc, skip them.
+              (when (looking-at "\\s(")
+                (forward-sexp 1))
+
+              ;; If there is a field separator, then skip that, plus
+              ;; the next expected symbol.
+              (if (not (looking-at fieldsep1))
+                  ;; We hit the end.
+                  (error nil)
+
+                ;; Skip the separator and the symbol.
+                (goto-char (match-end 0))
+                
+                (if (looking-at "\\w\\|\\s_")
+                    ;; Skip symbols
+                    (forward-sexp 1)
+                  ;; No symbol, exit the search...
+                  (setq continuesearch nil))
+                  
+                (setq end (point)))
+                
+              ;; Cont...
+              )
+          
+          ;; Restore position if we go to far....
+          (error (goto-char end)) )
+
+        )))
 
 (define-overloadable-function semantic-ctxt-current-symbol (&optional point)
   "Return the current symbol the cursor is on at POINT in a list.
@@ -391,7 +472,7 @@ Depends on `semantic-type-relation-separator-character'."
                  ;; In the middle of a symbol, move to the end.
                  (forward-sexp 1))
                 ((looking-at fieldsep1)
-                 ;; We are in a find spot.. do nothing.
+                 ;; We are in a fine spot.. do nothing.
                  nil
                  )
                 ((save-excursion
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index e8784c4f85c..8d9cfcccd7d 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -899,7 +899,7 @@ If file does not have tags available, and DONTLOAD is nil,
 then load the tags for FILE, and create a new table object for it.
 DONTLOAD does not affect the creation of new database objects."
   ;; (message "Object Translate: %s" file)
-  (when (and file (file-exists-p file))
+  (when (and file (file-exists-p file) (file-regular-p file))
     (let* ((default-directory (file-name-directory file))
            (tab (semanticdb-file-table-object-from-hash file))
            (fullfile nil))
diff --git a/lisp/cedet/semantic/decorate/mode.el b/lisp/cedet/semantic/decorate/mode.el
index fc791f52da1..3487e615168 100644
--- a/lisp/cedet/semantic/decorate/mode.el
+++ b/lisp/cedet/semantic/decorate/mode.el
@@ -64,6 +64,14 @@ add items to this list."
   "Return the STYLE's highlighter function."
   (intern (format "%s-highlight" style)))
 
+(defsubst semantic-decorate-style-predicate-default (style)
+  "Return the STYLE's predicate function."
+  (intern (format "%s-p-default" style)))
+
+(defsubst semantic-decorate-style-highlighter-default (style)
+  "Return the STYLE's highlighter function."
+  (intern (format "%s-highlight-default" style)))
+
 ;;; Base decoration API
 ;;
 (defsubst semantic-decoration-p (object)
@@ -265,8 +273,6 @@ minor mode is enabled."
         (semantic-make-local-hook 'semantic-after-toplevel-cache-change-hook)
         (add-hook 'semantic-after-toplevel-cache-change-hook
                   'semantic-decorate-tags-after-full-reparse nil t)
-        ;; Decorate includes by default
-        (require 'semantic/decorate/include)
         ;; Add decorations to available tags.  The above hooks ensure
         ;; that new tags will be decorated when they become available.
         (semantic-decorate-add-decorations (semantic-fetch-available-tags)))
@@ -325,6 +331,8 @@ Return non-nil if the decoration style is enabled."
            (flag  (if arg
                       (> (prefix-numeric-value arg) 0)
                     (not (cdr style)))))
+      (when (null style)
+        (error "Unknown decoration style %s" name))
       (unless (eq (cdr style) flag)
         ;; Store the new flag.
         (setcdr style flag)
@@ -368,7 +376,8 @@ DOC is a documentation string describing the decoration style NAME.
 It is appended to auto-generated doc strings.
 An Optional list of FLAGS can also be specified.  Flags are:
   :enabled <value>  - specify the default enabled value for NAME.
-
+  :load <value>     - specify a feature (as a string) with the rest of
+                      the definition for decoration mode NAME.
 
 This defines two new overload functions respectively called `NAME-p'
 and `NAME-highlight', for which you must provide a default
@@ -386,9 +395,14 @@ To add other kind of decorations on a tag, `NAME-highlight' must use
 decoration API found in this library."
   (let ((predicate   (semantic-decorate-style-predicate   name))
         (highlighter (semantic-decorate-style-highlighter name))
+        (predicatedef   (semantic-decorate-style-predicate-default   name))
+        (highlighterdef (semantic-decorate-style-highlighter-default name))     
         (defaultenable (if (plist-member flags :enabled)
                            (plist-get flags :enabled)
                          t))
+        (loadfile (if (plist-member flags :load)
+                      (plist-get flags :load)
+                    nil))
         )
     `(progn
        ;; Clear the menu cache so that new items are added when
@@ -408,7 +422,19 @@ decoration API found in this library."
        (add-to-list 'semantic-decoration-styles
                     (cons ',(symbol-name name)
                           ,defaultenable))
-       )))
+       ;; If there is a load file, then create the autload tokens for
+       ;; those functions to load the token, but only if the fsym
+       ;; doesn't exist yet.
+       (when (stringp ,loadfile)
+         (unless (fboundp ',predicatedef)
+           (autoload ',predicatedef ',loadfile "Return non-nil to decorate TAG."
+             nil 'function))
+         
+         (unless (fboundp ',highlighterdef)
+           (autoload ',highlighterdef ',loadfile "Decorate TAG."
+             nil 'function))
+         ))
+    ))
 
 ;;; Predefined decoration styles
 ;;
@@ -514,6 +540,16 @@ Use a primary decoration."
   (semantic-set-tag-face
    tag 'semantic-decoration-on-protected-members-face))
 
+;;; Decoration Modes in other files
+;;
+(define-semantic-decoration-style semantic-decoration-on-includes
+  "Highlight class members that are includes.
+This mode provides a nice context menu on the include statements."
+  :enabled t
+  :load "semantic/decorate/include")
+
+
+
 (provide 'semantic/decorate/mode)
 
 ;; Local variables:
diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el
index cb2a1faaac0..17859e232a3 100644
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -146,7 +146,7 @@ Lays claim to all -by.el, and -wy.el files."
               (let* ((package (semantic-grammar-create-package))
                      (fname (progn (string-match ".*/\\(.+\\.el\\)" package)
                                    (match-string 1 package)))
-                     (src (with-current-buffer fname (buffer-file-name)))
+                     (src (ede-expand-filename obj fname))
                      (csrc (concat (file-name-sans-extension src) ".elc")))
                 (if (< emacs-major-version 24)
                     ;; Does not have `byte-recompile-file'
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index b0540af373d..a27eab5404c 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -141,8 +141,9 @@ Argument START, END, and LENGTH specify the bounds of the change."
    (setq semantic-unmatched-syntax-cache-check t)
    (let ((inhibit-point-motion-hooks t)
          )
-     (run-hook-with-args 'semantic-change-functions start end length)
-     ))
+     (save-match-data
+       (run-hook-with-args 'semantic-change-functions start end length)
+       )))
 
 (defun semantic-changes-in-region (start end &optional buffer)
   "Find change overlays which exist in whole or in part between START and END.
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 9899ab974f7..6c223c2b9f2 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -434,16 +434,27 @@ datasets."
 
 (defun semantic-idle-scheduler-work-parse-neighboring-files ()
   "Parse all the files in similar directories to buffers being edited."
-  ;; Let's check to see if EDE matters.
-  (let ((ede-auto-add-method 'never))
-    (dolist (a auto-mode-alist)
-      (when (eq (cdr a) major-mode)
-        (dolist (file (directory-files default-directory t (car a) t))
-          (semantic-throw-on-input 'parsing-mode-buffers)
-          (save-excursion
-            (semanticdb-file-table-object file)
-            ))))
-    ))
+  ;; Let's tell EDE to ignore all the files we're about to load
+  (let ((ede-auto-add-method 'never)
+        (matching-auto-mode-patterns nil))
+    ;; Collect all patterns matching files of the same mode we edit.
+    (mapc (lambda (pat) (and (eq (cdr pat) major-mode)
+                             (push (car pat) matching-auto-mode-patterns)))
+          auto-mode-alist)
+    ;; Loop over all files, and if one matches our mode, we force its
+    ;; table to load.
+    (dolist (file (directory-files default-directory t ".*" t))
+      (catch 'found
+        (mapc (lambda (pat)
+                (semantic-throw-on-input 'parsing-mode-buffers)
+                ;; We use string-match instead of passing the pattern
+                ;; into directory files, because some patterns don't
+                ;; work with directory files.
+                (and (string-match pat file)
+                     (save-excursion
+                       (semanticdb-file-table-object file))
+                     (throw 'found t)))
+              matching-auto-mode-patterns)))))
 
 
 ;;; REPARSING
@@ -840,17 +851,18 @@ visible, then highlight it."
          )
     (cond ((semantic-overlay-p region)
            (with-current-buffer (semantic-overlay-buffer region)
-             (goto-char (semantic-overlay-start region))
-             (when (pos-visible-in-window-p
-                    (point) (get-buffer-window (current-buffer) 'visible))
-               (if (< (semantic-overlay-end region) (point-at-eol))
-                   (pulse-momentary-highlight-overlay
-                    region semantic-idle-symbol-highlight-face)
-                 ;; Not the same
-                 (pulse-momentary-highlight-region
-                  (semantic-overlay-start region)
-                  (point-at-eol)
-                  semantic-idle-symbol-highlight-face)))
+             (save-excursion
+               (goto-char (semantic-overlay-start region))
+               (when (pos-visible-in-window-p
+                      (point) (get-buffer-window (current-buffer) 'visible))
+                 (if (< (semantic-overlay-end region) (point-at-eol))
+                     (pulse-momentary-highlight-overlay
+                      region semantic-idle-symbol-highlight-face)
+                   ;; Not the same
+                   (pulse-momentary-highlight-region
+                    (semantic-overlay-start region)
+                    (point-at-eol)
+                    semantic-idle-symbol-highlight-face))))
              ))
           ((vectorp region)
            (let ((start (aref region 0))
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index 8ca398ef271..719868f7635 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -485,6 +485,20 @@ Return a list as per `semantic-ctxt-current-symbol'.
 Return nil if there is nothing relevant."
   nil)
 
+;;; Tag Formatting
+;;
+(define-mode-local-override semantic-format-tag-abbreviate python-mode (tag &optional parent color)
+  "Format an abbreviated tag for python.
+Shortens 'code' tags, but passes through for others."
+  (cond ((semantic-tag-of-class-p tag 'code)
+         ;; Just take the first line.
+         (let ((name (semantic-tag-name tag)))
+           (when (string-match "\n" name)
+             (setq name (substring name 0 (match-beginning 0))))
+           name))
+        (t
+         (semantic-format-tag-abbreviate-default tag parent color))))
+
 ;;; Enable Semantic in `python-mode'.
 ;;
 
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 0d68036c433..542fd49f8e5 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -200,10 +200,11 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   "Compile a semantic recode template file into a mode-local variable."
   (interactive)
   (unless (semantic-active-p)
-    (error "You have to activate semantic-mode to compile SRecode templates."))
+    (error "You have to activate semantic-mode to compile SRecode templates"))
   (require 'srecode/insert)
-  (message "Compiling template %s..."
-           (file-name-nondirectory (buffer-file-name)))
+  (when (called-interactively-p 'interactive)
+    (message "Compiling template %s..."
+             (file-name-nondirectory (buffer-file-name))))
   (let ((tags (semantic-fetch-tags))
         (tag nil)
         (class nil)
@@ -288,10 +289,11 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
        )
       ;; Continue
       (setq tags (cdr tags)))
-
+    
     ;; MSG - Before install since nreverse whacks our list.
-    (message "%d templates compiled for %s"
-             (length table) mode)
+    (when (called-interactively-p 'interactive)
+      (message "%d templates compiled for %s"
+               (length table) mode))
 
     ;;
     ;; APPLY TO MODE
@@ -316,12 +318,14 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
             (if (stringp project)
                 (setq priority (+ 50 defaultdelta))
               (setq priority (+ 80 defaultdelta))))
-          (message "Templates %s has estimated priority of %d"
-                   (file-name-nondirectory (buffer-file-name))
-                   priority))
-      (message "Compiling templates %s priority %d... done!"
-               (file-name-nondirectory (buffer-file-name))
-               priority))
+          (when (called-interactively-p 'interactive)
+            (message "Templates %s has estimated priority of %d"
+                     (file-name-nondirectory (buffer-file-name))
+                     priority)))
+      (when (called-interactively-p 'interactive)
+        (message "Compiling templates %s priority %d... done!"
+                 (file-name-nondirectory (buffer-file-name))
+                 priority)))
 
     ;; Save it up!
     (srecode-compile-template-table table mode priority application framework project vars)
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index c8ae3f4bf1a..21190446624 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -31,6 +31,7 @@
 ;;; Code:
 
 (require 'eieio)
+(eval-when-compile (require 'cl))       ;FIXME: Use cl-lib!
 
 ;;; eieio-instance-inheritor
 ;;
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el
new file mode 100644
index 00000000000..da475638bb7
--- /dev/null
+++ b/lisp/emacs-lisp/eieio-core.el
@@ -0,0 +1,2264 @@
+;;; eieio-core.el --- Core implementation for eieio
+
+;; Copyright (C) 1995-1996, 1998-2013 Free Software Foundation, Inc.
+
+;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Version: 1.4
+;; Keywords: OO, lisp
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; The "core" part of EIEIO is the implementation for the object
+;; system (such as eieio-defclass, or eieio-defmethod) but not the
+;; base classes for the object system, which are defined in EIEIO.
+;;
+;; See the commentary for eieio.el for more about EIEIO itself.
+
+;;; Code:
+
+(eval-when-compile (require 'cl))       ;FIXME: Use cl-lib!
+
+;; Compatibility
+(if (fboundp 'compiled-function-arglist)
+
+    ;; XEmacs can only access a compiled functions arglist like this:
+    (defalias 'eieio-compiled-function-arglist 'compiled-function-arglist)
+
+  ;; Emacs doesn't have this function, but since FUNC is a vector, we can just
+  ;; grab the appropriate element.
+  (defun eieio-compiled-function-arglist (func)
+    "Return the argument list for the compiled function FUNC."
+    (aref func 0))
+
+  )
+
+(put 'eieio--defalias 'byte-hunk-handler
+     #'byte-compile-file-form-defalias) ;;(get 'defalias 'byte-hunk-handler)
+(defun eieio--defalias (name body)
+  "Like `defalias', but with less side-effects.
+More specifically, it has no side-effects at all when the new function
+definition is the same (`eq') as the old one."
+  (unless (and (fboundp name)
+               (eq (symbol-function name) body))
+    (defalias name body)))
+
+;;;
+;; A few functions that are better in the official EIEIO src, but
+;; used from the core.
+(declare-function slot-unbound "eieio")
+(declare-function slot-missing "eieio")
+(declare-function child-of-class-p "eieio")
+
+
+;;;
+;; Variable declarations.
+;;
+(defvar eieio-hook nil
+  "This hook is executed, then cleared each time `defclass' is called.")
+
+(defvar eieio-error-unsupported-class-tags nil
+  "Non-nil to throw an error if an encountered tag is unsupported.
+This may prevent classes from CLOS applications from being used with EIEIO
+since EIEIO does not support all CLOS tags.")
+
+(defvar eieio-skip-typecheck nil
+  "If non-nil, skip all slot typechecking.
+Set this to t permanently if a program is functioning well to get a
+small speed increase.  This variable is also used internally to handle
+default setting for optimization purposes.")
+
+(defvar eieio-optimize-primary-methods-flag t
+  "Non-nil means to optimize the method dispatch on primary methods.")
+
+(defvar eieio-initializing-object  nil
+  "Set to non-nil while initializing an object.")
+
+(defconst eieio-unbound
+  (if (and (boundp 'eieio-unbound) (symbolp eieio-unbound))
+      eieio-unbound
+    (make-symbol "unbound"))
+  "Uninterned symbol representing an unbound slot in an object.")
+
+;; This is a bootstrap for eieio-default-superclass so it has a value
+;; while it is being built itself.
+(defvar eieio-default-superclass nil)
+
+;;;
+;; Class currently in scope.
+;;
+;; When invoking methods, the running method needs to know which class
+;; is currently in scope.  Generally this is the class of the method
+;; being called, but 'call-next-method' needs to query this state,
+;; and change it to be then next super class up.
+;;
+;; Thus, the scoped class is a stack that needs to be managed.
+
+(defvar eieio--scoped-class-stack nil
+  "A stack of the classes currently in scope during method invocation.")
+
+(defun eieio--scoped-class ()
+  "Return the class currently in scope, or nil."
+  (car-safe eieio--scoped-class-stack))
+
+(defmacro eieio--with-scoped-class (class &rest forms)
+  "Set CLASS as the currently scoped class while executing FORMS."
+  `(unwind-protect
+       (progn
+         (push ,class eieio--scoped-class-stack)
+         ,@forms)
+     (pop eieio--scoped-class-stack)))
+(put 'eieio--with-scoped-class 'lisp-indent-function 1)
+
+;;;
+;; Field Accessors
+;;
+(defmacro eieio--define-field-accessors (prefix fields)
+  (declare (indent 1))
+  (let ((index 0)
+        (defs '()))
+    (dolist (field fields)
+      (let ((doc (if (listp field)
+                     (prog1 (cadr field) (setq field (car field))))))
+        (push `(defmacro ,(intern (format "eieio--%s-%s" prefix field)) (x)
+                 ,@(if doc (list (format (if (string-match "\n" doc)
+                                             "Return %s" "Return %s of a %s.")
+                                         doc prefix)))
+                 (list 'aref x ,index))
+              defs)
+        (setq index (1+ index))))
+    `(eval-and-compile
+       ,@(nreverse defs)
+       (defconst ,(intern (format "eieio--%s-num-slots" prefix)) ,index))))
+
+(eieio--define-field-accessors class
+  (-unused-0 ;;FIXME: not sure, but at least there was no accessor!
+   (symbol "symbol (self-referencing)")
+   parent children
+   (symbol-obarray "obarray permitting fast access to variable position indexes")
+   ;; @todo
+   ;; the word "public" here is leftovers from the very first version.
+   ;; Get rid of it!
+   (public-a "class attribute index")
+   (public-d "class attribute defaults index")
+   (public-doc "class documentation strings for attributes")
+   (public-type "class type for a slot")
+   (public-custom "class custom type for a slot")
+   (public-custom-label "class custom group for a slot")
+   (public-custom-group "class custom group for a slot")
+   (public-printer "printer for a slot")
+   (protection "protection for a slot")
+   (initarg-tuples "initarg tuples list")
+   (class-allocation-a "class allocated attributes")
+   (class-allocation-doc "class allocated documentation")
+   (class-allocation-type "class allocated value type")
+   (class-allocation-custom "class allocated custom descriptor")
+   (class-allocation-custom-label "class allocated custom descriptor")
+   (class-allocation-custom-group "class allocated custom group")
+   (class-allocation-printer "class allocated printer for a slot")
+   (class-allocation-protection "class allocated protection list")
+   (class-allocation-values "class allocated value vector")
+   (default-object-cache "what a newly created object would look like.
+This will speed up instantiation time as only a `copy-sequence' will
+be needed, instead of looping over all the values and setting them
+from the default.")
+   (options "storage location of tagged class options.
+Stored outright without modifications or stripping.")))
+
+(eieio--define-field-accessors object
+  (-unused-0 ;;FIXME: not sure, but at least there was no accessor!
+   (class "class struct defining OBJ")
+   name))
+
+;; FIXME: The constants below should have an `eieio-' prefix added!!
+
+(defconst method-static 0 "Index into :static tag on a method.")
+(defconst method-before 1 "Index into :before tag on a method.")
+(defconst method-primary 2 "Index into :primary tag on a method.")
+(defconst method-after 3 "Index into :after tag on a method.")
+(defconst method-num-lists 4 "Number of indexes into methods vector in which groups of functions are kept.")
+(defconst method-generic-before 4 "Index into generic :before tag on a method.")
+(defconst method-generic-primary 5 "Index into generic :primary tag on a method.")
+(defconst method-generic-after 6 "Index into generic :after tag on a method.")
+(defconst method-num-slots 7 "Number of indexes into a method's vector.")
+
+(defsubst eieio-specialized-key-to-generic-key (key)
+  "Convert a specialized KEY into a generic method key."
+  (cond ((eq key method-static) 0) ;; don't convert
+        ((< key method-num-lists) (+ key 3)) ;; The conversion
+        (t key) ;; already generic.. maybe.
+        ))
+
+
+;;; Important macros used internally in eieio.
+;;
+(defmacro eieio--check-type (type obj)
+  (unless (symbolp obj)
+    (error "eieio--check-type wants OBJ to be a variable"))
+  `(if (not ,(cond
+              ((eq 'or (car-safe type))
+               `(or ,@(mapcar (lambda (type) `(,type ,obj)) (cdr type))))
+              (t `(,type ,obj))))
+       (signal 'wrong-type-argument (list ',type ,obj))))
+
+(defmacro class-v (class)
+  "Internal: Return the class vector from the CLASS symbol."
+  ;; No check: If eieio gets this far, it has probably been checked already.
+  `(get ,class 'eieio-class-definition))
+
+(defmacro class-p (class)
+  "Return t if CLASS is a valid class vector.
+CLASS is a symbol."
+  ;; this new method is faster since it doesn't waste time checking lots of
+  ;; things.
+  `(condition-case nil
+       (eq (aref (class-v ,class) 0) 'defclass)
+     (error nil)))
+
+(defun eieio-class-name (class) "Return a Lisp like symbol name for CLASS."
+  (eieio--check-type class-p class)
+  ;; I think this is supposed to return a symbol, but to me CLASS is a symbol,
+  ;; and I wanted a string.  Arg!
+  (format "#<class %s>" (symbol-name class)))
+(define-obsolete-function-alias 'class-name #'eieio-class-name "24.4")
+
+(defmacro eieio-class-parents-fast (class)
+  "Return parent classes to CLASS with no check."
+  `(eieio--class-parent (class-v ,class)))
+
+(defmacro eieio-class-children-fast (class) "Return child classes to CLASS with no check."
+  `(eieio--class-children (class-v ,class)))
+
+(defmacro same-class-fast-p (obj class)
+  "Return t if OBJ is of class-type CLASS with no error checking."
+  `(eq (eieio--object-class ,obj) ,class))
+
+(defmacro class-constructor (class)
+  "Return the symbol representing the constructor of CLASS."
+  `(eieio--class-symbol (class-v ,class)))
+
+(defmacro generic-p (method)
+  "Return t if symbol METHOD is a generic function.
+Only methods have the symbol `eieio-method-obarray' as a property
+\(which contains a list of all bindings to that method type.)"
+  `(and (fboundp ,method) (get ,method 'eieio-method-obarray)))
+
+(defun generic-primary-only-p (method)
+  "Return t if symbol METHOD is a generic function with only primary methods.
+Only methods have the symbol `eieio-method-obarray' as a property (which
+contains a list of all bindings to that method type.)
+Methods with only primary implementations are executed in an optimized way."
+  (and (generic-p method)
+       (let ((M (get method 'eieio-method-tree)))
+         (and (< 0 (length (aref M method-primary)))
+              (not (aref M method-static))
+              (not (aref M method-before))
+              (not (aref M method-after))
+              (not (aref M method-generic-before))
+              (not (aref M method-generic-primary))
+              (not (aref M method-generic-after))))
+       ))
+
+(defun generic-primary-only-one-p (method)
+  "Return t if symbol METHOD is a generic function with only primary methods.
+Only methods have the symbol `eieio-method-obarray' as a property (which
+contains a list of all bindings to that method type.)
+Methods with only primary implementations are executed in an optimized way."
+  (and (generic-p method)
+       (let ((M (get method 'eieio-method-tree)))
+         (and (= 1 (length (aref M method-primary)))
+              (not (aref M method-static))
+              (not (aref M method-before))
+              (not (aref M method-after))
+              (not (aref M method-generic-before))
+              (not (aref M method-generic-primary))
+              (not (aref M method-generic-after))))
+       ))
+
+(defmacro class-option-assoc (list option)
+  "Return from LIST the found OPTION, or nil if it doesn't exist."
+  `(car-safe (cdr (memq ,option ,list))))
+
+(defmacro class-option (class option)
+  "Return the value stored for CLASS' OPTION.
+Return nil if that option doesn't exist."
+  `(class-option-assoc (eieio--class-options (class-v ,class)) ',option))
+
+(defmacro eieio-object-p (obj)
+  "Return non-nil if OBJ is an EIEIO object."
+  `(condition-case nil
+       (let ((tobj ,obj))
+         (and (eq (aref tobj 0) 'object)
+              (class-p (eieio--object-class tobj))))
+     (error nil)))
+(defalias 'object-p 'eieio-object-p)
+
+(defmacro class-abstract-p (class)
+  "Return non-nil if CLASS is abstract.
+Abstract classes cannot be instantiated."
+  `(class-option ,class :abstract))
+
+(defmacro class-method-invocation-order (class)
+  "Return the invocation order of CLASS.
+Abstract classes cannot be instantiated."
+  `(or (class-option ,class :method-invocation-order)
+       :breadth-first))
+
+
+
+;;;
+;; Class Creation
+
+(defvar eieio-defclass-autoload-map (make-vector 7 nil)
+  "Symbol map of superclasses we find in autoloads.")
+
+;; We autoload this because it's used in `make-autoload'.
+;;;###autoload
+(defun eieio-defclass-autoload (cname superclasses filename doc)
+  "Create autoload symbols for the EIEIO class CNAME.
+SUPERCLASSES are the superclasses that CNAME inherits from.
+DOC is the docstring for CNAME.
+This function creates a mock-class for CNAME and adds it into
+SUPERCLASSES as children.
+It creates an autoload function for CNAME's constructor."
+  ;; Assume we've already debugged inputs.
+
+  (let* ((oldc (when (class-p cname) (class-v cname)))
+         (newc (make-vector eieio--class-num-slots nil))
+         )
+    (if oldc
+        nil ;; Do nothing if we already have this class.
+
+      ;; Create the class in NEWC, but don't fill anything else in.
+      (aset newc 0 'defclass)
+      (setf (eieio--class-symbol newc) cname)
+
+      (let ((clear-parent nil))
+        ;; No parents?
+        (when (not superclasses)
+          (setq superclasses '(eieio-default-superclass)
+                clear-parent t)
+          )
+
+        ;; Hook our new class into the existing structures so we can
+        ;; autoload it later.
+        (dolist (SC superclasses)
+
+
+          ;; TODO - If we create an autoload that is in the map, that
+          ;;        map needs to be cleared!
+
+
+          ;; Does our parent exist?
+          (if (not (class-p SC))
+
+              ;; Create a symbol for this parent, and then store this
+              ;; parent on that symbol.
+              (let ((sym (intern (symbol-name SC) eieio-defclass-autoload-map)))
+                (if (not (boundp sym))
+                    (set sym (list cname))
+                  (add-to-list sym cname))
+                )
+
+            ;; We have a parent, save the child in there.
+            (when (not (member cname (eieio--class-children (class-v SC))))
+              (setf (eieio--class-children (class-v SC))
+                    (cons cname (eieio--class-children (class-v SC))))))
+
+          ;; save parent in child
+          (setf (eieio--class-parent newc) (cons SC (eieio--class-parent newc)))
+          )
+
+        ;; turn this into a usable self-pointing symbol
+        (set cname cname)
+
+        ;; Store the new class vector definition into the symbol.  We need to
+        ;; do this first so that we can call defmethod for the accessor.
+        ;; The vector will be updated by the following while loop and will not
+        ;; need to be stored a second time.
+        (put cname 'eieio-class-definition newc)
+
+        ;; Clear the parent
+        (if clear-parent (setf (eieio--class-parent newc) nil))
+
+        ;; Create an autoload on top of our constructor function.
+        (autoload cname filename doc nil nil)
+        (autoload (intern (concat (symbol-name cname) "-p")) filename "" nil nil)
+        (autoload (intern (concat (symbol-name cname) "-child-p")) filename "" nil nil)
+        (autoload (intern (concat (symbol-name cname) "-list-p")) filename "" nil nil)
+
+        ))))
+
+(defsubst eieio-class-un-autoload (cname)
+  "If class CNAME is in an autoload state, load its file."
+  (when (eq (car-safe (symbol-function cname)) 'autoload)
+    (load-library (car (cdr (symbol-function cname))))))
+
+(defun eieio-defclass (cname superclasses slots options-and-doc)
+  ;; FIXME: Most of this should be moved to the `defclass' macro.
+  "Define CNAME as a new subclass of SUPERCLASSES.
+SLOTS are the slots residing in that class definition, and options or
+documentation OPTIONS-AND-DOC is the toplevel documentation for this class.
+See `defclass' for more information."
+  ;; Run our eieio-hook each time, and clear it when we are done.
+  ;; This way people can add hooks safely if they want to modify eieio
+  ;; or add definitions when eieio is loaded or something like that.
+  (run-hooks 'eieio-hook)
+  (setq eieio-hook nil)
+
+  (eieio--check-type listp superclasses)
+
+  (let* ((pname superclasses)
+         (newc (make-vector eieio--class-num-slots nil))
+         (oldc (when (class-p cname) (class-v cname)))
+         (groups nil) ;; list of groups id'd from slots
+         (options nil)
+         (clearparent nil))
+
+    (aset newc 0 'defclass)
+    (setf (eieio--class-symbol newc) cname)
+
+    ;; If this class already existed, and we are updating its structure,
+    ;; make sure we keep the old child list.  This can cause bugs, but
+    ;; if no new slots are created, it also saves time, and prevents
+    ;; method table breakage, particularly when the users is only
+    ;; byte compiling an EIEIO file.
+    (if oldc
+        (setf (eieio--class-children newc) (eieio--class-children oldc))
+      ;; If the old class did not exist, but did exist in the autoload map, then adopt those children.
+      ;; This is like the above, but deals with autoloads nicely.
+      (let ((sym (intern-soft (symbol-name cname) eieio-defclass-autoload-map)))
+        (when sym
+          (condition-case nil
+              (setf (eieio--class-children newc) (symbol-value sym))
+            (error nil))
+          (unintern (symbol-name cname) eieio-defclass-autoload-map)
+          ))
+      )
+
+    (cond ((and (stringp (car options-and-doc))
+                (/= 1 (% (length options-and-doc) 2)))
+           (error "Too many arguments to `defclass'"))
+          ((and (symbolp (car options-and-doc))
+                (/= 0 (% (length options-and-doc) 2)))
+           (error "Too many arguments to `defclass'"))
+          )
+
+    (setq options
+          (if (stringp (car options-and-doc))
+              (cons :documentation options-and-doc)
+            options-and-doc))
+
+    (if pname
+        (progn
+          (while pname
+            (if (and (car pname) (symbolp (car pname)))
+                (if (not (class-p (car pname)))
+                    ;; bad class
+                    (error "Given parent class %s is not a class" (car pname))
+                  ;; good parent class...
+                  ;; save new child in parent
+                  (when (not (member cname (eieio--class-children (class-v (car pname)))))
+                    (setf (eieio--class-children (class-v (car pname)))
+                          (cons cname (eieio--class-children (class-v (car pname))))))
+                  ;; Get custom groups, and store them into our local copy.
+                  (mapc (lambda (g) (pushnew g groups :test #'equal))
+                        (class-option (car pname) :custom-groups))
+                  ;; save parent in child
+                  (setf (eieio--class-parent newc) (cons (car pname) (eieio--class-parent newc))))
+              (error "Invalid parent class %s" pname))
+            (setq pname (cdr pname)))
+          ;; Reverse the list of our parents so that they are prioritized in
+          ;; the same order as specified in the code.
+          (setf (eieio--class-parent newc) (nreverse (eieio--class-parent newc))) )
+      ;; If there is nothing to loop over, then inherit from the
+      ;; default superclass.
+      (unless (eq cname 'eieio-default-superclass)
+        ;; adopt the default parent here, but clear it later...
+        (setq clearparent t)
+        ;; save new child in parent
+        (if (not (member cname (eieio--class-children (class-v 'eieio-default-superclass))))
+            (setf (eieio--class-children (class-v 'eieio-default-superclass))
+                  (cons cname (eieio--class-children (class-v 'eieio-default-superclass)))))
+        ;; save parent in child
+        (setf (eieio--class-parent newc) (list eieio-default-superclass))))
+
+    ;; turn this into a usable self-pointing symbol
+    (set cname cname)
+
+    ;; These two tests must be created right away so we can have self-
+    ;; referencing classes.  ei, a class whose slot can contain only
+    ;; pointers to itself.
+
+    ;; Create the test function
+    (let ((csym (intern (concat (symbol-name cname) "-p"))))
+      (fset csym
+            (list 'lambda (list 'obj)
+                  (format "Test OBJ to see if it an object of type %s" cname)
+                  (list 'and '(eieio-object-p obj)
+                        (list 'same-class-p 'obj cname)))))
+
+    ;; Make sure the method invocation order  is a valid value.
+    (let ((io (class-option-assoc options :method-invocation-order)))
+      (when (and io (not (member io '(:depth-first :breadth-first :c3))))
+        (error "Method invocation order %s is not allowed" io)
+        ))
+
+    ;; Create a handy child test too
+    (let ((csym (intern (concat (symbol-name cname) "-child-p"))))
+      (fset csym
+            `(lambda (obj)
+               ,(format
+                  "Test OBJ to see if it an object is a child of type %s"
+                  cname)
+               (and (eieio-object-p obj)
+                    (object-of-class-p obj ,cname))))
+
+    ;; Create a handy list of the class test too
+    (let ((csym (intern (concat (symbol-name cname) "-list-p"))))
+      (fset csym
+            `(lambda (obj)
+               ,(format
+                  "Test OBJ to see if it a list of objects which are a child of type %s"
+                  cname)
+               (when (listp obj)
+                 (let ((ans t)) ;; nil is valid
+                   ;; Loop over all the elements of the input list, test
+                   ;; each to make sure it is a child of the desired object class.
+                   (while (and obj ans)
+                     (setq ans (and (eieio-object-p (car obj))
+                                    (object-of-class-p (car obj) ,cname)))
+                     (setq obj (cdr obj)))
+                   ans)))))
+
+      ;; When using typep, (typep OBJ 'myclass) returns t for objects which
+      ;; are subclasses of myclass.  For our predicates, however, it is
+      ;; important for EIEIO to be backwards compatible, where
+      ;; myobject-p, and myobject-child-p are different.
+      ;; "cl" uses this technique to specify symbols with specific typep
+      ;; test, so we can let typep have the CLOS documented behavior
+      ;; while keeping our above predicate clean.
+
+      ;; It would be cleaner to use `defsetf' here, but that requires cl
+      ;; at runtime.
+      (put cname 'cl-deftype-handler
+           (list 'lambda () `(list 'satisfies (quote ,csym)))))
+
+    ;; Before adding new slots, let's add all the methods and classes
+    ;; in from the parent class.
+    (eieio-copy-parents-into-subclass newc superclasses)
+
+    ;; Store the new class vector definition into the symbol.  We need to
+    ;; do this first so that we can call defmethod for the accessor.
+    ;; The vector will be updated by the following while loop and will not
+    ;; need to be stored a second time.
+    (put cname 'eieio-class-definition newc)
+
+    ;; Query each slot in the declaration list and mangle into the
+    ;; class structure I have defined.
+    (while slots
+      (let* ((slot1  (car slots))
+             (name    (car slot1))
+             (slot   (cdr slot1))
+             (acces   (plist-get slot ':accessor))
+             (init    (or (plist-get slot ':initform)
+                          (if (member ':initform slot) nil
+                            eieio-unbound)))
+             (initarg (plist-get slot ':initarg))
+             (docstr  (plist-get slot ':documentation))
+             (prot    (plist-get slot ':protection))
+             (reader  (plist-get slot ':reader))
+             (writer  (plist-get slot ':writer))
+             (alloc   (plist-get slot ':allocation))
+             (type    (plist-get slot ':type))
+             (custom  (plist-get slot ':custom))
+             (label   (plist-get slot ':label))
+             (customg (plist-get slot ':group))
+             (printer (plist-get slot ':printer))
+
+             (skip-nil (class-option-assoc options :allow-nil-initform))
+             )
+
+        (if eieio-error-unsupported-class-tags
+            (let ((tmp slot))
+              (while tmp
+                (if (not (member (car tmp) '(:accessor
+                                             :initform
+                                             :initarg
+                                             :documentation
+                                             :protection
+                                             :reader
+                                             :writer
+                                             :allocation
+                                             :type
+                                             :custom
+                                             :label
+                                             :group
+                                             :printer
+                                             :allow-nil-initform
+                                             :custom-groups)))
+                    (signal 'invalid-slot-type (list (car tmp))))
+                (setq tmp (cdr (cdr tmp))))))
+
+        ;; Clean up the meaning of protection.
+        (cond ((or (eq prot 'public) (eq prot :public)) (setq prot nil))
+              ((or (eq prot 'protected) (eq prot :protected)) (setq prot 'protected))
+              ((or (eq prot 'private) (eq prot :private)) (setq prot 'private))
+              ((eq prot nil) nil)
+              (t (signal 'invalid-slot-type (list ':protection prot))))
+
+        ;; Make sure the :allocation parameter has a valid value.
+        (if (not (or (not alloc) (eq alloc :class) (eq alloc :instance)))
+            (signal 'invalid-slot-type (list ':allocation alloc)))
+
+        ;; The default type specifier is supposed to be t, meaning anything.
+        (if (not type) (setq type t))
+
+        ;; Label is nil, or a string
+        (if (not (or (null label) (stringp label)))
+            (signal 'invalid-slot-type (list ':label label)))
+
+        ;; Is there an initarg, but allocation of class?
+        (if (and initarg (eq alloc :class))
+            (message "Class allocated slots do not need :initarg"))
+
+        ;; intern the symbol so we can use it blankly
+        (if initarg (set initarg initarg))
+
+        ;; The customgroup should be a list of symbols
+        (cond ((null customg)
+               (setq customg '(default)))
+              ((not (listp customg))
+               (setq customg (list customg))))
+        ;; The customgroup better be a symbol, or list of symbols.
+        (mapc (lambda (cg)
+                (if (not (symbolp cg))
+                    (signal 'invalid-slot-type (list ':group cg))))
+                customg)
+
+        ;; First up, add this slot into our new class.
+        (eieio-add-new-slot newc name init docstr type custom label customg printer
+                             prot initarg alloc 'defaultoverride skip-nil)
+
+        ;; We need to id the group, and store them in a group list attribute.
+        (mapc (lambda (cg) (pushnew cg groups :test 'equal)) customg)
+
+        ;; Anyone can have an accessor function.  This creates a function
+        ;; of the specified name, and also performs a `defsetf' if applicable
+        ;; so that users can `setf' the space returned by this function.
+        (if acces
+            (progn
+              (eieio--defmethod
+               acces (if (eq alloc :class) :static :primary) cname
+               `(lambda (this)
+                  ,(format
+                       "Retrieves the slot `%s' from an object of class `%s'"
+                       name cname)
+                  (if (slot-boundp this ',name)
+                      (eieio-oref this ',name)
+                            ;; Else - Some error?  nil?
+                            nil)))
+
+              (if (fboundp 'gv-define-setter)
+                  ;; FIXME: We should move more of eieio-defclass into the
+                  ;; defclass macro so we don't have to use `eval' and require
+                  ;; `gv' at run-time.
+                  (eval `(gv-define-setter ,acces (eieio--store eieio--object)
+                           (list 'eieio-oset eieio--object '',name
+                                 eieio--store)))
+                ;; Provide a setf method.  It would be cleaner to use
+                ;; defsetf, but that would require CL at runtime.
+                (put acces 'setf-method
+                     `(lambda (widget)
+                        (let* ((--widget-sym-- (make-symbol "--widget--"))
+                               (--store-sym-- (make-symbol "--store--")))
+                          (list
+                           (list --widget-sym--)
+                           (list widget)
+                           (list --store-sym--)
+                           (list 'eieio-oset --widget-sym-- '',name
+                                 --store-sym--)
+                           (list 'getfoo --widget-sym--))))))))
+
+        ;; If a writer is defined, then create a generic method of that
+        ;; name whose purpose is to set the value of the slot.
+        (if writer
+            (eieio--defmethod
+             writer nil cname
+             `(lambda (this value)
+                ,(format "Set the slot `%s' of an object of class `%s'"
+                              name cname)
+                (setf (slot-value this ',name) value))))
+        ;; If a reader is defined, then create a generic method
+        ;; of that name whose purpose is to access this slot value.
+        (if reader
+            (eieio--defmethod
+             reader nil cname
+             `(lambda (this)
+                ,(format "Access the slot `%s' from object of class `%s'"
+                              name cname)
+                (slot-value this ',name))))
+        )
+      (setq slots (cdr slots)))
+
+    ;; Now that everything has been loaded up, all our lists are backwards!
+    ;; Fix that up now.
+    (setf (eieio--class-public-a newc) (nreverse (eieio--class-public-a newc)))
+    (setf (eieio--class-public-d newc) (nreverse (eieio--class-public-d newc)))
+    (setf (eieio--class-public-doc newc) (nreverse (eieio--class-public-doc newc)))
+    (setf (eieio--class-public-type newc)
+          (apply 'vector (nreverse (eieio--class-public-type newc))))
+    (setf (eieio--class-public-custom newc) (nreverse (eieio--class-public-custom newc)))
+    (setf (eieio--class-public-custom-label newc) (nreverse (eieio--class-public-custom-label newc)))
+    (setf (eieio--class-public-custom-group newc) (nreverse (eieio--class-public-custom-group newc)))
+    (setf (eieio--class-public-printer newc) (nreverse (eieio--class-public-printer newc)))
+    (setf (eieio--class-protection newc) (nreverse (eieio--class-protection newc)))
+    (setf (eieio--class-initarg-tuples newc) (nreverse (eieio--class-initarg-tuples newc)))
+
+    ;; The storage for class-class-allocation-type needs to be turned into
+    ;; a vector now.
+    (setf (eieio--class-class-allocation-type newc)
+          (apply 'vector (eieio--class-class-allocation-type newc)))
+
+    ;; Also, take class allocated values, and vectorize them for speed.
+    (setf (eieio--class-class-allocation-values newc)
+          (apply 'vector (eieio--class-class-allocation-values newc)))
+
+    ;; Attach slot symbols into an obarray, and store the index of
+    ;; this slot as the variable slot in this new symbol.  We need to
+    ;; know about primes, because obarrays are best set in vectors of
+    ;; prime number length, and we also need to make our vector small
+    ;; to save space, and also optimal for the number of items we have.
+    (let* ((cnt 0)
+           (pubsyms (eieio--class-public-a newc))
+           (prots (eieio--class-protection newc))
+           (l (length pubsyms))
+           (vl (let ((primes '( 3 5 7 11 13 17 19 23 29 31 37 41 43 47
+                                  53 59 61 67 71 73 79 83 89 97 101 )))
+                 (while (and primes (< (car primes) l))
+                   (setq primes (cdr primes)))
+                 (car primes)))
+           (oa (make-vector vl 0))
+           (newsym))
+      (while pubsyms
+        (setq newsym (intern (symbol-name (car pubsyms)) oa))
+        (set newsym cnt)
+        (setq cnt (1+ cnt))
+        (if (car prots) (put newsym 'protection (car prots)))
+        (setq pubsyms (cdr pubsyms)
+              prots (cdr prots)))
+      (setf (eieio--class-symbol-obarray newc) oa)
+      )
+
+    ;; Create the constructor function
+    (if (class-option-assoc options :abstract)
+        ;; Abstract classes cannot be instantiated.  Say so.
+        (let ((abs (class-option-assoc options :abstract)))
+          (if (not (stringp abs))
+              (setq abs (format "Class %s is abstract" cname)))
+          (fset cname
+                `(lambda (&rest stuff)
+                   ,(format "You cannot create a new object of type %s" cname)
+                   (error ,abs))))
+
+      ;; Non-abstract classes need a constructor.
+      (fset cname
+            `(lambda (newname &rest slots)
+               ,(format "Create a new object with name NAME of class type %s" cname)
+               (apply 'constructor ,cname newname slots)))
+      )
+
+    ;; Set up a specialized doc string.
+    ;; Use stored value since it is calculated in a non-trivial way
+    (put cname 'variable-documentation
+         (class-option-assoc options :documentation))
+
+    ;; Save the file location where this class is defined.
+    (let ((fname (if load-in-progress
+                     load-file-name
+                   buffer-file-name)))
+      (when fname
+        (when (string-match "\\.elc\\'" fname)
+          (setq fname (substring fname 0 (1- (length fname)))))
+        (put cname 'class-location fname)))
+
+    ;; We have a list of custom groups.  Store them into the options.
+    (let ((g (class-option-assoc options :custom-groups)))
+      (mapc (lambda (cg) (pushnew cg g :test 'equal)) groups)
+      (if (memq :custom-groups options)
+          (setcar (cdr (memq :custom-groups options)) g)
+        (setq options (cons :custom-groups (cons g options)))))
+
+    ;; Set up the options we have collected.
+    (setf (eieio--class-options newc) options)
+
+    ;; if this is a superclass, clear out parent (which was set to the
+    ;; default superclass eieio-default-superclass)
+    (if clearparent (setf (eieio--class-parent newc) nil))
+
+    ;; Create the cached default object.
+    (let ((cache (make-vector (+ (length (eieio--class-public-a newc)) 3)
+                              nil)))
+      (aset cache 0 'object)
+      (setf (eieio--object-class cache) cname)
+      (setf (eieio--object-name cache) 'default-cache-object)
+      (let ((eieio-skip-typecheck t))
+        ;; All type-checking has been done to our satisfaction
+        ;; before this call.  Don't waste our time in this call..
+        (eieio-set-defaults cache t))
+      (setf (eieio--class-default-object-cache newc) cache))
+
+    ;; Return our new class object
+    ;; newc
+    cname
+    ))
+
+(defsubst eieio-eval-default-p (val)
+  "Whether the default value VAL should be evaluated for use."
+  (and (consp val) (symbolp (car val)) (fboundp (car val))))
+
+(defun eieio-perform-slot-validation-for-default (slot spec value skipnil)
+  "For SLOT, signal if SPEC does not match VALUE.
+If SKIPNIL is non-nil, then if VALUE is nil return t instead."
+  (if (and (not (eieio-eval-default-p value))
+           (not eieio-skip-typecheck)
+           (not (and skipnil (null value)))
+           (not (eieio-perform-slot-validation spec value)))
+      (signal 'invalid-slot-type (list slot spec value))))
+
+(defun eieio-add-new-slot (newc a d doc type cust label custg print prot init alloc
+                                 &optional defaultoverride skipnil)
+  "Add into NEWC attribute A.
+If A already exists in NEWC, then do nothing.  If it doesn't exist,
+then also add in D (default), DOC, TYPE, CUST, LABEL, CUSTG, PRINT, PROT, and INIT arg.
+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.
+Optional argument SKIPNIL indicates if type checking should be skipped
+if default value is nil."
+  ;; Make sure we duplicate those items that are sequences.
+  (condition-case nil
+      (if (sequencep d) (setq d (copy-sequence d)))
+    ;; This copy can fail on a cons cell with a non-cons in the cdr.  Let's skip it if it doesn't work.
+    (error nil))
+  (if (sequencep type) (setq type (copy-sequence type)))
+  (if (sequencep cust) (setq cust (copy-sequence cust)))
+  (if (sequencep custg) (setq custg (copy-sequence custg)))
+
+  ;; To prevent override information w/out specification of storage,
+  ;; we need to do this little hack.
+  (if (member a (eieio--class-class-allocation-a newc)) (setq alloc ':class))
+
+  (if (or (not alloc) (and (symbolp alloc) (eq alloc ':instance)))
+      ;; In this case, we modify the INSTANCE version of a given slot.
+
+      (progn
+
+        ;; Only add this element if it is so-far unique
+        (if (not (member a (eieio--class-public-a newc)))
+            (progn
+              (eieio-perform-slot-validation-for-default a type d skipnil)
+              (setf (eieio--class-public-a newc) (cons a (eieio--class-public-a newc)))
+              (setf (eieio--class-public-d newc) (cons d (eieio--class-public-d newc)))
+              (setf (eieio--class-public-doc newc) (cons doc (eieio--class-public-doc newc)))
+              (setf (eieio--class-public-type newc) (cons type (eieio--class-public-type newc)))
+              (setf (eieio--class-public-custom newc) (cons cust (eieio--class-public-custom newc)))
+              (setf (eieio--class-public-custom-label newc) (cons label (eieio--class-public-custom-label newc)))
+              (setf (eieio--class-public-custom-group newc) (cons custg (eieio--class-public-custom-group newc)))
+              (setf (eieio--class-public-printer newc) (cons print (eieio--class-public-printer newc)))
+              (setf (eieio--class-protection newc) (cons prot (eieio--class-protection newc)))
+              (setf (eieio--class-initarg-tuples newc) (cons (cons init a) (eieio--class-initarg-tuples newc)))
+              )
+          ;; When defaultoverride is true, we are usually adding new local
+          ;; attributes which must override the default value of any slot
+          ;; passed in by one of the parent classes.
+          (when defaultoverride
+            ;; There is a match, and we must override the old value.
+            (let* ((ca (eieio--class-public-a newc))
+                   (np (member a ca))
+                   (num (- (length ca) (length np)))
+                   (dp (if np (nthcdr num (eieio--class-public-d newc))
+                         nil))
+                   (tp (if np (nth num (eieio--class-public-type newc))))
+                   )
+              (if (not np)
+                  (error "EIEIO internal error overriding default value for %s"
+                         a)
+                ;; If type is passed in, is it the same?
+                (if (not (eq type t))
+                    (if (not (equal type tp))
+                        (error
+                         "Child slot type `%s' does not match inherited type `%s' for `%s'"
+                         type tp a)))
+                ;; If we have a repeat, only update the initarg...
+                (unless (eq d eieio-unbound)
+                  (eieio-perform-slot-validation-for-default a tp d skipnil)
+                  (setcar dp d))
+                ;; If we have a new initarg, check for it.
+                (when init
+                  (let* ((inits (eieio--class-initarg-tuples newc))
+                         (inita (rassq a inits)))
+                    ;; Replace the CAR of the associate INITA.
+                    ;;(message "Initarg: %S replace %s" inita init)
+                    (setcar inita init)
+                    ))
+
+                ;; PLN Tue Jun 26 11:57:06 2007 : The protection is
+                ;; checked and SHOULD match the superclass
+                ;; protection. Otherwise an error is thrown. However
+                ;; I wonder if a more flexible schedule might be
+                ;; implemented.
+                ;;
+                ;; EML - We used to have (if prot... here,
+                ;;       but a prot of 'nil means public.
+                ;;
+                (let ((super-prot (nth num (eieio--class-protection newc)))
+                      )
+                  (if (not (eq prot super-prot))
+                      (error "Child slot protection `%s' does not match inherited protection `%s' for `%s'"
+                             prot super-prot a)))
+                ;; End original PLN
+
+                ;; PLN Tue Jun 26 11:57:06 2007 :
+                ;; Do a non redundant combination of ancient custom
+                ;; groups and new ones.
+                (when custg
+                  (let* ((groups
+                          (nthcdr num (eieio--class-public-custom-group newc)))
+                         (list1 (car groups))
+                         (list2 (if (listp custg) custg (list custg))))
+                    (if (< (length list1) (length list2))
+                        (setq list1 (prog1 list2 (setq list2 list1))))
+                    (dolist (elt list2)
+                      (unless (memq elt list1)
+                        (push elt list1)))
+                    (setcar groups list1)))
+                ;;  End PLN
+
+                ;;  PLN Mon Jun 25 22:44:34 2007 : If a new cust is
+                ;;  set, simply replaces the old one.
+                (when cust
+                  ;; (message "Custom type redefined to %s" cust)
+                  (setcar (nthcdr num (eieio--class-public-custom newc)) cust))
+
+                ;; If a new label is specified, it simply replaces
+                ;; the old one.
+                (when label
+                  ;; (message "Custom label redefined to %s" label)
+                  (setcar (nthcdr num (eieio--class-public-custom-label newc)) label))
+                ;;  End PLN
+
+                ;; PLN Sat Jun 30 17:24:42 2007 : when a new
+                ;; doc is specified, simply replaces the old one.
+                (when doc
+                  ;;(message "Documentation redefined to %s" doc)
+                  (setcar (nthcdr num (eieio--class-public-doc newc))
+                          doc))
+                ;; End PLN
+
+                ;; If a new printer is specified, it simply replaces
+                ;; the old one.
+                (when print
+                  ;; (message "printer redefined to %s" print)
+                  (setcar (nthcdr num (eieio--class-public-printer newc)) print))
+
+                )))
+          ))
+
+    ;; CLASS ALLOCATED SLOTS
+    (let ((value (eieio-default-eval-maybe d)))
+      (if (not (member a (eieio--class-class-allocation-a newc)))
+          (progn
+            (eieio-perform-slot-validation-for-default a type value skipnil)
+            ;; Here we have found a :class version of a slot.  This
+            ;; requires a very different approach.
+            (setf (eieio--class-class-allocation-a newc) (cons a (eieio--class-class-allocation-a newc)))
+            (setf (eieio--class-class-allocation-doc newc) (cons doc (eieio--class-class-allocation-doc newc)))
+            (setf (eieio--class-class-allocation-type newc) (cons type (eieio--class-class-allocation-type newc)))
+            (setf (eieio--class-class-allocation-custom newc) (cons cust (eieio--class-class-allocation-custom newc)))
+            (setf (eieio--class-class-allocation-custom-label newc) (cons label (eieio--class-class-allocation-custom-label newc)))
+            (setf (eieio--class-class-allocation-custom-group newc) (cons custg (eieio--class-class-allocation-custom-group newc)))
+            (setf (eieio--class-class-allocation-protection newc) (cons prot (eieio--class-class-allocation-protection newc)))
+            ;; Default value is stored in the 'values section, since new objects
+            ;; can't initialize from this element.
+            (setf (eieio--class-class-allocation-values newc) (cons value (eieio--class-class-allocation-values newc))))
+        (when defaultoverride
+          ;; There is a match, and we must override the old value.
+          (let* ((ca (eieio--class-class-allocation-a newc))
+                 (np (member a ca))
+                 (num (- (length ca) (length np)))
+                 (dp (if np
+                         (nthcdr num
+                                 (eieio--class-class-allocation-values newc))
+                       nil))
+                 (tp (if np (nth num (eieio--class-class-allocation-type newc))
+                       nil)))
+            (if (not np)
+                (error "EIEIO internal error overriding default value for %s"
+                       a)
+              ;; If type is passed in, is it the same?
+              (if (not (eq type t))
+                  (if (not (equal type tp))
+                      (error
+                       "Child slot type `%s' does not match inherited type `%s' for `%s'"
+                       type tp a)))
+              ;; EML - Note: the only reason to override a class bound slot
+              ;;       is to change the default, so allow unbound in.
+
+              ;; If we have a repeat, only update the value...
+              (eieio-perform-slot-validation-for-default a tp value skipnil)
+              (setcar dp value))
+
+            ;; PLN Tue Jun 26 11:57:06 2007 : The protection is
+            ;; checked and SHOULD match the superclass
+            ;; protection. Otherwise an error is thrown. However
+            ;; I wonder if a more flexible schedule might be
+            ;; implemented.
+            (let ((super-prot
+                   (car (nthcdr num (eieio--class-class-allocation-protection newc)))))
+              (if (not (eq prot super-prot))
+                  (error "Child slot protection `%s' does not match inherited protection `%s' for `%s'"
+                         prot super-prot a)))
+            ;; Do a non redundant combination of ancient custom groups
+            ;; and new ones.
+            (when custg
+              (let* ((groups
+                      (nthcdr num (eieio--class-class-allocation-custom-group newc)))
+                     (list1 (car groups))
+                     (list2 (if (listp custg) custg (list custg))))
+                (if (< (length list1) (length list2))
+                    (setq list1 (prog1 list2 (setq list2 list1))))
+                (dolist (elt list2)
+                  (unless (memq elt list1)
+                    (push elt list1)))
+                (setcar groups list1)))
+
+            ;; PLN Sat Jun 30 17:24:42 2007 : when a new
+            ;; doc is specified, simply replaces the old one.
+            (when doc
+              ;;(message "Documentation redefined to %s" doc)
+              (setcar (nthcdr num (eieio--class-class-allocation-doc newc))
+                      doc))
+            ;; End PLN
+
+            ;; If a new printer is specified, it simply replaces
+            ;; the old one.
+            (when print
+              ;; (message "printer redefined to %s" print)
+              (setcar (nthcdr num (eieio--class-class-allocation-printer newc)) print))
+
+            ))
+        ))
+    ))
+
+(defun eieio-copy-parents-into-subclass (newc parents)
+  "Copy into NEWC the slots of PARENTS.
+Follow the rules of not overwriting early parents when applying to
+the new child class."
+  (let ((ps (eieio--class-parent newc))
+        (sn (class-option-assoc (eieio--class-options newc)
+                                ':allow-nil-initform)))
+    (while ps
+      ;; First, duplicate all the slots of the parent.
+      (let ((pcv (class-v (car ps))))
+        (let ((pa (eieio--class-public-a pcv))
+              (pd (eieio--class-public-d pcv))
+              (pdoc (eieio--class-public-doc pcv))
+              (ptype (eieio--class-public-type pcv))
+              (pcust (eieio--class-public-custom pcv))
+              (plabel (eieio--class-public-custom-label pcv))
+              (pcustg (eieio--class-public-custom-group pcv))
+              (printer (eieio--class-public-printer pcv))
+              (pprot (eieio--class-protection pcv))
+              (pinit (eieio--class-initarg-tuples pcv))
+              (i 0))
+          (while pa
+            (eieio-add-new-slot newc
+                                 (car pa) (car pd) (car pdoc) (aref ptype i)
+                                 (car pcust) (car plabel) (car pcustg)
+                                 (car printer)
+                                 (car pprot) (car-safe (car pinit)) nil nil sn)
+            ;; Increment each value.
+            (setq pa (cdr pa)
+                  pd (cdr pd)
+                  pdoc (cdr pdoc)
+                  i (1+ i)
+                  pcust (cdr pcust)
+                  plabel (cdr plabel)
+                  pcustg (cdr pcustg)
+                  printer (cdr printer)
+                  pprot (cdr pprot)
+                  pinit (cdr pinit))
+            )) ;; while/let
+        ;; Now duplicate all the class alloc slots.
+        (let ((pa (eieio--class-class-allocation-a pcv))
+              (pdoc (eieio--class-class-allocation-doc pcv))
+              (ptype (eieio--class-class-allocation-type pcv))
+              (pcust (eieio--class-class-allocation-custom pcv))
+              (plabel (eieio--class-class-allocation-custom-label pcv))
+              (pcustg (eieio--class-class-allocation-custom-group pcv))
+              (printer (eieio--class-class-allocation-printer pcv))
+              (pprot (eieio--class-class-allocation-protection pcv))
+              (pval (eieio--class-class-allocation-values pcv))
+              (i 0))
+          (while pa
+            (eieio-add-new-slot newc
+                                 (car pa) (aref pval i) (car pdoc) (aref ptype i)
+                                 (car pcust) (car plabel) (car pcustg)
+                                 (car printer)
+                                 (car pprot) nil ':class sn)
+            ;; Increment each value.
+            (setq pa (cdr pa)
+                  pdoc (cdr pdoc)
+                  pcust (cdr pcust)
+                  plabel (cdr plabel)
+                  pcustg (cdr pcustg)
+                  printer (cdr printer)
+                  pprot (cdr pprot)
+                  i (1+ i))
+            ))) ;; while/let
+      ;; Loop over each parent class
+      (setq ps (cdr ps)))
+    ))
+
+
+;;; CLOS methods and generics
+;;
+
+(defun eieio--defgeneric-init-form (method doc-string)
+  "Form to use for the initial definition of a generic."
+  (cond
+   ((or (not (fboundp method))
+        (eq 'autoload (car-safe (symbol-function method))))
+    ;; Make sure the method tables are installed.
+    (eieiomt-install method)
+    ;; Construct the actual body of this function.
+    (eieio-defgeneric-form method doc-string))
+   ((generic-p method) (symbol-function method))           ;Leave it as-is.
+   (t (error "You cannot create a generic/method over an existing symbol: %s"
+             method))))
+
+(defun eieio-defgeneric-form (method doc-string)
+  "The lambda form that would be used as the function defined on METHOD.
+All methods should call the same EIEIO function for dispatch.
+DOC-STRING is the documentation attached to METHOD."
+  `(lambda (&rest local-args)
+     ,doc-string
+     (eieio-generic-call (quote ,method) local-args)))
+
+(defsubst eieio-defgeneric-reset-generic-form (method)
+  "Setup METHOD to call the generic form."
+  (let ((doc-string (documentation method)))
+    (fset method (eieio-defgeneric-form method doc-string))))
+
+(defun eieio-defgeneric-form-primary-only (method doc-string)
+  "The lambda form that would be used as the function defined on METHOD.
+All methods should call the same EIEIO function for dispatch.
+DOC-STRING is the documentation attached to METHOD."
+  `(lambda (&rest local-args)
+     ,doc-string
+     (eieio-generic-call-primary-only (quote ,method) local-args)))
+
+(defsubst eieio-defgeneric-reset-generic-form-primary-only (method)
+  "Setup METHOD to call the generic form."
+  (let ((doc-string (documentation method)))
+    (fset method (eieio-defgeneric-form-primary-only method doc-string))))
+
+(defun eieio-defgeneric-form-primary-only-one (method doc-string
+                                                      class
+                                                      impl
+                                                      )
+  "The lambda form that would be used as the function defined on METHOD.
+All methods should call the same EIEIO function for dispatch.
+DOC-STRING is the documentation attached to METHOD.
+CLASS is the class symbol needed for private method access.
+IMPL is the symbol holding the method implementation."
+  ;; NOTE: I tried out byte compiling this little fcn.  Turns out it
+  ;; is faster to execute this for not byte-compiled.  ie, install this,
+  ;; then measure calls going through here.  I wonder why.
+  (require 'bytecomp)
+  (let ((byte-compile-warnings nil))
+    (byte-compile
+     `(lambda (&rest local-args)
+        ,doc-string
+        ;; This is a cool cheat.  Usually we need to look up in the
+        ;; method table to find out if there is a method or not.  We can
+        ;; instead make that determination at load time when there is
+        ;; only one method.  If the first arg is not a child of the class
+        ;; of that one implementation, then clearly, there is no method def.
+        (if (not (eieio-object-p (car local-args)))
+            ;; Not an object.  Just signal.
+            (signal 'no-method-definition
+                    (list ',method local-args))
+
+          ;; We do have an object.  Make sure it is the right type.
+          (if ,(if (eq class eieio-default-superclass)
+                   nil  ; default superclass means just an obj.  Already asked.
+                 `(not (child-of-class-p (eieio--object-class (car local-args))
+                                         ',class)))
+
+              ;; If not the right kind of object, call no applicable
+              (apply 'no-applicable-method (car local-args)
+                     ',method local-args)
+
+            ;; It is ok, do the call.
+            ;; Fill in inter-call variables then evaluate the method.
+            (let ((eieio-generic-call-next-method-list nil)
+                  (eieio-generic-call-key method-primary)
+                  (eieio-generic-call-methodname ',method)
+                  (eieio-generic-call-arglst local-args)
+                  )
+              (eieio--with-scoped-class ',class
+                ,(if (< emacs-major-version 24)
+                     `(apply ,(list 'quote impl) local-args)
+                   `(apply #',impl local-args)))
+              ;(,impl local-args)
+              )))))))
+
+(defsubst eieio-defgeneric-reset-generic-form-primary-only-one (method)
+  "Setup METHOD to call the generic form."
+  (let* ((doc-string (documentation method))
+         (M (get method 'eieio-method-tree))
+         (entry (car (aref M method-primary)))
+         )
+    (fset method (eieio-defgeneric-form-primary-only-one
+                  method doc-string
+                  (car entry)
+                  (cdr entry)
+                  ))))
+
+(defun eieio-unbind-method-implementations (method)
+  "Make the generic method METHOD have no implementations.
+It will leave the original generic function in place,
+but remove reference to all implementations of METHOD."
+  (put method 'eieio-method-tree nil)
+  (put method 'eieio-method-obarray nil))
+
+(defun eieio--defmethod (method kind argclass code)
+  "Work part of the `defmethod' macro defining METHOD with ARGS."
+  (let ((key
+         ;; Find optional keys.
+         (cond ((memq kind '(:BEFORE :before)) method-before)
+               ((memq kind '(:AFTER :after)) method-after)
+               ((memq kind '(:STATIC :static)) method-static)
+               ((memq kind '(:PRIMARY :primary nil)) method-primary)
+               ;; Primary key.
+               ;; (t method-primary)
+               (t (error "Unknown method kind %S" kind)))))
+    ;; Make sure there is a generic (when called from defclass).
+    (eieio--defalias
+     method (eieio--defgeneric-init-form
+             method (or (documentation code)
+                        (format "Generically created method `%s'." method))))
+    ;; Create symbol for property to bind to.  If the first arg is of
+    ;; the form (varname vartype) and `vartype' is a class, then
+    ;; that class will be the type symbol.  If not, then it will fall
+    ;; under the type `primary' which is a non-specific calling of the
+    ;; function.
+    (if argclass
+        (if (not (class-p argclass))
+            (error "Unknown class type %s in method parameters"
+                   argclass))
+      ;; Generics are higher.
+      (setq key (eieio-specialized-key-to-generic-key key)))
+    ;; Put this lambda into the symbol so we can find it.
+    (eieiomt-add method code key argclass)
+    )
+
+  (when eieio-optimize-primary-methods-flag
+    ;; Optimizing step:
+    ;;
+    ;; If this method, after this setup, only has primary methods, then
+    ;; we can setup the generic that way.
+    (if (generic-primary-only-p method)
+        ;; If there is only one primary method, then we can go one more
+        ;; optimization step.
+        (if (generic-primary-only-one-p method)
+            (eieio-defgeneric-reset-generic-form-primary-only-one method)
+          (eieio-defgeneric-reset-generic-form-primary-only method))
+      (eieio-defgeneric-reset-generic-form method)))
+
+  method)
+
+;;; Slot type validation
+
+;; This is a hideous hack for replacing `typep' from cl-macs, to avoid
+;; requiring the CL library at run-time.  It can be eliminated if/when
+;; `typep' is merged into Emacs core.
+(defun eieio--typep (val type)
+  (if (symbolp type)
+      (cond ((get type 'cl-deftype-handler)
+             (eieio--typep val (funcall (get type 'cl-deftype-handler))))
+            ((eq type t) t)
+            ((eq type 'null)   (null val))
+            ((eq type 'atom)   (atom val))
+            ((eq type 'float)  (and (numberp val) (not (integerp val))))
+            ((eq type 'real)   (numberp val))
+            ((eq type 'fixnum) (integerp val))
+            ((memq type '(character string-char)) (characterp val))
+            (t
+             (let* ((name (symbol-name type))
+                    (namep (intern (concat name "p"))))
+               (if (fboundp namep)
+                   (funcall `(lambda () (,namep val)))
+                 (funcall `(lambda ()
+                             (,(intern (concat name "-p")) val)))))))
+    (cond ((get (car type) 'cl-deftype-handler)
+           (eieio--typep val (apply (get (car type) 'cl-deftype-handler)
+                                    (cdr type))))
+          ((memq (car type) '(integer float real number))
+           (and (eieio--typep val (car type))
+                (or (memq (cadr type) '(* nil))
+                    (if (consp (cadr type))
+                        (> val (car (cadr type)))
+                      (>= val (cadr type))))
+                (or (memq (caddr type) '(* nil))
+                    (if (consp (car (cddr type)))
+                        (< val (caar (cddr type)))
+                      (<= val (car (cddr type)))))))
+          ((memq (car type) '(and or not))
+           (eval (cons (car type)
+                       (mapcar (lambda (x)
+                                 `(eieio--typep (quote ,val) (quote ,x)))
+                               (cdr type)))))
+          ((memq (car type) '(member member*))
+           (memql val (cdr type)))
+          ((eq (car type) 'satisfies)
+           (funcall `(lambda () (,(cadr type) val))))
+          (t (error "Bad type spec: %s" type)))))
+
+(defun eieio-perform-slot-validation (spec value)
+  "Return non-nil if SPEC does not match VALUE."
+  (or (eq spec t)                       ; t always passes
+      (eq value eieio-unbound)          ; unbound always passes
+      (eieio--typep value spec)))
+
+(defun eieio-validate-slot-value (class slot-idx value slot)
+  "Make sure that for CLASS referencing SLOT-IDX, VALUE is valid.
+Checks the :type specifier.
+SLOT is the slot that is being checked, and is only used when throwing
+an error."
+  (if eieio-skip-typecheck
+      nil
+    ;; Trim off object IDX junk added in for the object index.
+    (setq slot-idx (- slot-idx 3))
+    (let ((st (aref (eieio--class-public-type (class-v class)) slot-idx)))
+      (if (not (eieio-perform-slot-validation st value))
+          (signal 'invalid-slot-type (list class slot st value))))))
+
+(defun eieio-validate-class-slot-value (class slot-idx value slot)
+  "Make sure that for CLASS referencing SLOT-IDX, VALUE is valid.
+Checks the :type specifier.
+SLOT is the slot that is being checked, and is only used when throwing
+an error."
+  (if eieio-skip-typecheck
+      nil
+    (let ((st (aref (eieio--class-class-allocation-type (class-v class))
+                    slot-idx)))
+      (if (not (eieio-perform-slot-validation st value))
+          (signal 'invalid-slot-type (list class slot st value))))))
+
+(defun eieio-barf-if-slot-unbound (value instance slotname fn)
+  "Throw a signal if VALUE is a representation of an UNBOUND slot.
+INSTANCE is the object being referenced.  SLOTNAME is the offending
+slot.  If the slot is ok, return VALUE.
+Argument FN is the function calling this verifier."
+  (if (and (eq value eieio-unbound) (not eieio-skip-typecheck))
+      (slot-unbound instance (eieio--object-class instance) slotname fn)
+    value))
+
+
+;;; Get/Set slots in an object.
+;;
+(defun eieio-oref (obj slot)
+  "Return the value in OBJ at SLOT in the object vector."
+  (eieio--check-type (or eieio-object-p class-p) obj)
+  (eieio--check-type symbolp slot)
+  (if (class-p obj) (eieio-class-un-autoload obj))
+  (let* ((class (if (class-p obj) obj (eieio--object-class obj)))
+         (c (eieio-slot-name-index class obj slot)))
+    (if (not c)
+        ;; It might be missing because it is a :class allocated slot.
+        ;; Let's check that info out.
+        (if (setq c (eieio-class-slot-name-index class slot))
+            ;; Oref that slot.
+            (aref (eieio--class-class-allocation-values (class-v class)) c)
+          ;; The slot-missing method is a cool way of allowing an object author
+          ;; to intercept missing slot definitions.  Since it is also the LAST
+          ;; thing called in this fn, its return value would be retrieved.
+          (slot-missing obj slot 'oref)
+          ;;(signal 'invalid-slot-name (list (eieio-object-name obj) slot))
+          )
+      (eieio--check-type eieio-object-p obj)
+      (eieio-barf-if-slot-unbound (aref obj c) obj slot 'oref))))
+
+
+(defun eieio-oref-default (obj slot)
+  "Do the work for the macro `oref-default' with similar parameters.
+Fills in OBJ's SLOT with its default value."
+  (eieio--check-type (or eieio-object-p class-p) obj)
+  (eieio--check-type symbolp slot)
+  (let* ((cl (if (eieio-object-p obj) (eieio--object-class obj) obj))
+         (c (eieio-slot-name-index cl obj slot)))
+    (if (not c)
+        ;; It might be missing because it is a :class allocated slot.
+        ;; Let's check that info out.
+        (if (setq c
+                  (eieio-class-slot-name-index cl slot))
+            ;; Oref that slot.
+            (aref (eieio--class-class-allocation-values (class-v cl))
+                  c)
+          (slot-missing obj slot 'oref-default)
+          ;;(signal 'invalid-slot-name (list (class-name cl) slot))
+          )
+      (eieio-barf-if-slot-unbound
+       (let ((val (nth (- c 3) (eieio--class-public-d (class-v cl)))))
+         (eieio-default-eval-maybe val))
+       obj cl 'oref-default))))
+
+(defun eieio-default-eval-maybe (val)
+  "Check VAL, and return what `oref-default' would provide."
+  (cond
+   ;; Is it a function call?  If so, evaluate it.
+   ((eieio-eval-default-p val)
+    (eval val))
+   ;;;; check for quoted things, and unquote them
+   ;;((and (consp val) (eq (car val) 'quote))
+   ;; (car (cdr val)))
+   ;; return it verbatim
+   (t val)))
+
+(defun eieio-oset (obj slot value)
+  "Do the work for the macro `oset'.
+Fills in OBJ's SLOT with VALUE."
+  (eieio--check-type eieio-object-p obj)
+  (eieio--check-type symbolp slot)
+  (let ((c (eieio-slot-name-index (eieio--object-class obj) obj slot)))
+    (if (not c)
+        ;; It might be missing because it is a :class allocated slot.
+        ;; Let's check that info out.
+        (if (setq c
+                  (eieio-class-slot-name-index (eieio--object-class obj) slot))
+            ;; Oset that slot.
+            (progn
+              (eieio-validate-class-slot-value (eieio--object-class obj) c value slot)
+              (aset (eieio--class-class-allocation-values (class-v (eieio--object-class obj)))
+                    c value))
+          ;; See oref for comment on `slot-missing'
+          (slot-missing obj slot 'oset value)
+          ;;(signal 'invalid-slot-name (list (eieio-object-name obj) slot))
+          )
+      (eieio-validate-slot-value (eieio--object-class obj) c value slot)
+      (aset obj c value))))
+
+(defun eieio-oset-default (class slot value)
+  "Do the work for the macro `oset-default'.
+Fills in the default value in CLASS' in SLOT with VALUE."
+  (eieio--check-type class-p class)
+  (eieio--check-type symbolp slot)
+  (eieio--with-scoped-class class
+    (let* ((c (eieio-slot-name-index class nil slot)))
+      (if (not c)
+          ;; It might be missing because it is a :class allocated slot.
+          ;; Let's check that info out.
+          (if (setq c (eieio-class-slot-name-index class slot))
+              (progn
+                ;; Oref that slot.
+                (eieio-validate-class-slot-value class c value slot)
+                (aset (eieio--class-class-allocation-values (class-v class)) c
+                      value))
+            (signal 'invalid-slot-name (list (eieio-class-name class) slot)))
+        (eieio-validate-slot-value class c value slot)
+        ;; Set this into the storage for defaults.
+        (setcar (nthcdr (- c 3) (eieio--class-public-d (class-v class)))
+                value)
+        ;; Take the value, and put it into our cache object.
+        (eieio-oset (eieio--class-default-object-cache (class-v class))
+                    slot value)
+        ))))
+
+
+;;; EIEIO internal search functions
+;;
+(defun eieio-slot-originating-class-p (start-class slot)
+  "Return non-nil if START-CLASS is the first class to define SLOT.
+This is for testing if the class currently in scope is the class that defines SLOT
+so that we can protect private slots."
+  (let ((par (eieio-class-parents-fast start-class))
+        (ret t))
+    (if (not par)
+        t
+      (while (and par ret)
+        (if (intern-soft (symbol-name slot)
+                         (eieio--class-symbol-obarray (class-v (car par))))
+            (setq ret nil))
+        (setq par (cdr par)))
+      ret)))
+
+(defun eieio-slot-name-index (class obj slot)
+  "In CLASS for OBJ find the index of the named SLOT.
+The slot is a symbol which is installed in CLASS by the `defclass'
+call.  OBJ can be nil, but if it is an object, and the slot in question
+is protected, access will be allowed if OBJ is a child of the currently
+scoped class.
+If SLOT is the value created with :initarg instead,
+reverse-lookup that name, and recurse with the associated slot value."
+  ;; Removed checks to outside this call
+  (let* ((fsym (intern-soft (symbol-name slot)
+                            (eieio--class-symbol-obarray (class-v class))))
+         (fsi (if (symbolp fsym) (symbol-value fsym) nil)))
+    (if (integerp fsi)
+        (cond
+         ((not (get fsym 'protection))
+          (+ 3 fsi))
+         ((and (eq (get fsym 'protection) 'protected)
+               (eieio--scoped-class)
+               (or (child-of-class-p class (eieio--scoped-class))
+                   (and (eieio-object-p obj)
+                        (child-of-class-p class (eieio--object-class obj)))))
+          (+ 3 fsi))
+         ((and (eq (get fsym 'protection) 'private)
+               (or (and (eieio--scoped-class)
+                        (eieio-slot-originating-class-p (eieio--scoped-class) slot))
+                   eieio-initializing-object))
+          (+ 3 fsi))
+         (t nil))
+      (let ((fn (eieio-initarg-to-attribute class slot)))
+        (if fn (eieio-slot-name-index class obj fn) nil)))))
+
+(defun eieio-class-slot-name-index (class slot)
+  "In CLASS find the index of the named SLOT.
+The slot is a symbol which is installed in CLASS by the `defclass'
+call.  If SLOT is the value created with :initarg instead,
+reverse-lookup that name, and recurse with the associated slot value."
+  ;; This will happen less often, and with fewer slots.  Do this the
+  ;; storage cheap way.
+  (let* ((a (eieio--class-class-allocation-a (class-v class)))
+         (l1 (length a))
+         (af (memq slot a))
+         (l2 (length af)))
+    ;; Slot # is length of the total list, minus the remaining list of
+    ;; the found slot.
+    (if af (- l1 l2))))
+
+;;;
+;; Way to assign slots based on a list.  Used for constructors, or
+;; even resetting an object at run-time
+;;
+(defun eieio-set-defaults (obj &optional set-all)
+  "Take object OBJ, and reset all slots to their defaults.
+If SET-ALL is non-nil, then when a default is nil, that value is
+reset.  If SET-ALL is nil, the slots are only reset if the default is
+not nil."
+  (eieio--with-scoped-class (eieio--object-class obj)
+    (let ((eieio-initializing-object t)
+          (pub (eieio--class-public-a (class-v (eieio--object-class obj)))))
+      (while pub
+        (let ((df (eieio-oref-default obj (car pub))))
+          (if (or df set-all)
+              (eieio-oset obj (car pub) df)))
+        (setq pub (cdr pub))))))
+
+(defun eieio-initarg-to-attribute (class initarg)
+  "For CLASS, convert INITARG to the actual attribute name.
+If there is no translation, pass it in directly (so we can cheat if
+need be... May remove that later...)"
+  (let ((tuple (assoc initarg (eieio--class-initarg-tuples (class-v class)))))
+    (if tuple
+        (cdr tuple)
+      nil)))
+
+(defun eieio-attribute-to-initarg (class attribute)
+  "In CLASS, convert the ATTRIBUTE into the corresponding init argument tag.
+This is usually a symbol that starts with `:'."
+  (let ((tuple (rassoc attribute (eieio--class-initarg-tuples (class-v class)))))
+    (if tuple
+        (car tuple)
+      nil)))
+
+;;;
+;; Method Invocation order: C3
+(defun eieio-c3-candidate (class remaining-inputs)
+  "Return CLASS if it can go in the result now, otherwise nil"
+  ;; Ensure CLASS is not in any position but the first in any of the
+  ;; element lists of REMAINING-INPUTS.
+  (and (not (let ((found nil))
+              (while (and remaining-inputs (not found))
+                (setq found (member class (cdr (car remaining-inputs)))
+                      remaining-inputs (cdr remaining-inputs)))
+              found))
+       class))
+
+(defun eieio-c3-merge-lists (reversed-partial-result remaining-inputs)
+  "Merge REVERSED-PARTIAL-RESULT REMAINING-INPUTS in a consistent order, if possible.
+If a consistent order does not exist, signal an error."
+  (if (let ((tail remaining-inputs)
+            (found nil))
+        (while (and tail (not found))
+          (setq found (car tail) tail (cdr tail)))
+        (not found))
+      ;; If all remaining inputs are empty lists, we are done.
+      (nreverse reversed-partial-result)
+    ;; Otherwise, we try to find the next element of the result. This
+    ;; is achieved by considering the first element of each
+    ;; (non-empty) input list and accepting a candidate if it is
+    ;; consistent with the rests of the input lists.
+    (let* ((found nil)
+           (tail remaining-inputs)
+           (next (progn
+                   (while (and tail (not found))
+                     (setq found (and (car tail)
+                                      (eieio-c3-candidate (caar tail)
+                                                          remaining-inputs))
+                           tail (cdr tail)))
+                   found)))
+      (if next
+          ;; The graph is consistent so far, add NEXT to result and
+          ;; merge input lists, dropping NEXT from their heads where
+          ;; applicable.
+          (eieio-c3-merge-lists
+           (cons next reversed-partial-result)
+           (mapcar (lambda (l) (if (eq (first l) next) (rest l) l))
+                   remaining-inputs))
+        ;; The graph is inconsistent, give up
+        (signal 'inconsistent-class-hierarchy (list remaining-inputs))))))
+
+(defun eieio-class-precedence-c3 (class)
+  "Return all parents of CLASS in c3 order."
+  (let ((parents (eieio-class-parents-fast class)))
+    (eieio-c3-merge-lists
+     (list class)
+     (append
+      (or
+       (mapcar
+        (lambda (x)
+          (eieio-class-precedence-c3 x))
+        parents)
+       '((eieio-default-superclass)))
+      (list parents))))
+  )
+;;;
+;; Method Invocation Order: Depth First
+
+(defun eieio-class-precedence-dfs (class)
+  "Return all parents of CLASS in depth-first order."
+  (let* ((parents (eieio-class-parents-fast class))
+         (classes (copy-sequence
+                   (apply #'append
+                          (list class)
+                          (or
+                           (mapcar
+                            (lambda (parent)
+                              (cons parent
+                                    (eieio-class-precedence-dfs parent)))
+                            parents)
+                           '((eieio-default-superclass))))))
+         (tail classes))
+    ;; Remove duplicates.
+    (while tail
+      (setcdr tail (delq (car tail) (cdr tail)))
+      (setq tail (cdr tail)))
+    classes))
+
+;;;
+;; Method Invocation Order: Breadth First
+(defun eieio-class-precedence-bfs (class)
+  "Return all parents of CLASS in breadth-first order."
+  (let ((result)
+        (queue (or (eieio-class-parents-fast class)
+                   '(eieio-default-superclass))))
+    (while queue
+      (let ((head (pop queue)))
+        (unless (member head result)
+          (push head result)
+          (unless (eq head 'eieio-default-superclass)
+            (setq queue (append queue (or (eieio-class-parents-fast head)
+                                          '(eieio-default-superclass))))))))
+    (cons class (nreverse result)))
+  )
+
+;;;
+;; Method Invocation Order
+
+(defun eieio-class-precedence-list (class)
+  "Return (transitively closed) list of parents of CLASS.
+The order, in which the parents are returned depends on the
+method invocation orders of the involved classes."
+  (if (or (null class) (eq class 'eieio-default-superclass))
+      nil
+    (case (class-method-invocation-order class)
+      (:depth-first
+       (eieio-class-precedence-dfs class))
+      (:breadth-first
+       (eieio-class-precedence-bfs class))
+      (:c3
+       (eieio-class-precedence-c3 class))))
+  )
+(define-obsolete-function-alias
+  'class-precedence-list 'eieio-class-precedence-list "24.4")
+
+
+;;; CLOS generics internal function handling
+;;
+(defvar eieio-generic-call-methodname nil
+  "When using `call-next-method', provides a context on how to do it.")
+(defvar eieio-generic-call-arglst nil
+  "When using `call-next-method', provides a context for parameters.")
+(defvar eieio-generic-call-key nil
+  "When using `call-next-method', provides a context for the current key.
+Keys are a number representing :before, :primary, and :after methods.")
+(defvar eieio-generic-call-next-method-list nil
+  "When executing a PRIMARY or STATIC method, track the 'next-method'.
+During executions, the list is first generated, then as each next method
+is called, the next method is popped off the stack.")
+
+(define-obsolete-variable-alias 'eieio-pre-method-execution-hooks
+  'eieio-pre-method-execution-functions "24.3")
+(defvar eieio-pre-method-execution-functions nil
+  "Abnormal hook run just before an EIEIO method is executed.
+The hook function must accept one argument, the list of forms
+about to be executed.")
+
+(defun eieio-generic-call (method args)
+  "Call METHOD with ARGS.
+ARGS provides the context on which implementation to use.
+This should only be called from a generic function."
+  ;; We must expand our arguments first as they are always
+  ;; passed in as quoted symbols
+  (let ((newargs nil) (mclass nil)  (lambdas nil) (tlambdas nil) (keys nil)
+        (eieio-generic-call-methodname method)
+        (eieio-generic-call-arglst args)
+        (firstarg nil)
+        (primarymethodlist nil))
+    ;; get a copy
+    (setq newargs args
+          firstarg (car newargs))
+    ;; Is the class passed in autoloaded?
+    ;; Since class names are also constructors, they can be autoloaded
+    ;; via the autoload command.  Check for this, and load them in.
+    ;; It is ok if it doesn't turn out to be a class.  Probably want that
+    ;; function loaded anyway.
+    (if (and (symbolp firstarg)
+             (fboundp firstarg)
+             (listp (symbol-function firstarg))
+             (eq 'autoload (car (symbol-function firstarg))))
+        (load (nth 1 (symbol-function firstarg))))
+    ;; Determine the class to use.
+    (cond ((eieio-object-p firstarg)
+           (setq mclass (eieio--object-class firstarg)))
+          ((class-p firstarg)
+           (setq mclass firstarg))
+          )
+    ;; Make sure the class is a valid class
+    ;; mclass can be nil (meaning a generic for should be used.
+    ;; mclass cannot have a value that is not a class, however.
+    (when (and (not (null mclass)) (not (class-p mclass)))
+      (error "Cannot dispatch method %S on class %S"
+             method mclass)
+      )
+    ;; Now create a list in reverse order of all the calls we have
+    ;; make in order to successfully do this right.  Rules:
+    ;; 1) Only call generics if scoped-class is not defined
+    ;;    This prevents multiple calls in the case of recursion
+    ;; 2) Only call static if this is a static method.
+    ;; 3) Only call specifics if the definition allows for them.
+    ;; 4) Call in order based on :before, :primary, and :after
+    (when (eieio-object-p firstarg)
+      ;; Non-static calls do all this stuff.
+
+      ;; :after methods
+      (setq tlambdas
+            (if mclass
+                (eieiomt-method-list method method-after mclass)
+              (list (eieio-generic-form method method-after nil)))
+            ;;(or (and mclass (eieio-generic-form method method-after mclass))
+            ;;  (eieio-generic-form method method-after nil))
+            )
+      (setq lambdas (append tlambdas lambdas)
+            keys (append (make-list (length tlambdas) method-after) keys))
+
+      ;; :primary methods
+      (setq tlambdas
+            (or (and mclass (eieio-generic-form method method-primary mclass))
+                (eieio-generic-form method method-primary nil)))
+      (when tlambdas
+        (setq lambdas (cons tlambdas lambdas)
+              keys (cons method-primary keys)
+              primarymethodlist
+              (eieiomt-method-list method method-primary mclass)))
+
+      ;; :before methods
+      (setq tlambdas
+            (if mclass
+                (eieiomt-method-list method method-before mclass)
+              (list (eieio-generic-form method method-before nil)))
+            ;;(or (and mclass (eieio-generic-form method method-before mclass))
+            ;;  (eieio-generic-form method method-before nil))
+            )
+      (setq lambdas (append tlambdas lambdas)
+            keys (append (make-list (length tlambdas) method-before) keys))
+      )
+
+    (if mclass
+        ;; For the case of a class,
+        ;; if there were no methods found, then there could be :static methods.
+        (when (not lambdas)
+          (setq tlambdas
+                (eieio-generic-form method method-static mclass))
+          (setq lambdas (cons tlambdas lambdas)
+                keys (cons method-static keys)
+                primarymethodlist  ;; Re-use even with bad name here
+                (eieiomt-method-list method method-static mclass)))
+      ;; For the case of no class (ie - mclass == nil) then there may
+      ;; be a primary method.
+      (setq tlambdas
+            (eieio-generic-form method method-primary nil))
+      (when tlambdas
+        (setq lambdas (cons tlambdas lambdas)
+              keys (cons method-primary keys)
+              primarymethodlist
+              (eieiomt-method-list method method-primary nil)))
+      )
+
+    (run-hook-with-args 'eieio-pre-method-execution-functions
+                        primarymethodlist)
+
+    ;; Now loop through all occurrences forms which we must execute
+    ;; (which are happily sorted now) and execute them all!
+    (let ((rval nil) (lastval nil) (rvalever nil) (found nil))
+      (while lambdas
+        (if (car lambdas)
+            (eieio--with-scoped-class (cdr (car lambdas))
+              (let* ((eieio-generic-call-key (car keys))
+                     (has-return-val
+                      (or (= eieio-generic-call-key method-primary)
+                          (= eieio-generic-call-key method-static)))
+                     (eieio-generic-call-next-method-list
+                      ;; Use the cdr, as the first element is the fcn
+                      ;; we are calling right now.
+                      (when has-return-val (cdr primarymethodlist)))
+                     )
+                (setq found t)
+                ;;(setq rval (apply (car (car lambdas)) newargs))
+                (setq lastval (apply (car (car lambdas)) newargs))
+                (when has-return-val
+                  (setq rval lastval
+                        rvalever t))
+                )))
+        (setq lambdas (cdr lambdas)
+              keys (cdr keys)))
+      (if (not found)
+          (if (eieio-object-p (car args))
+              (setq rval (apply 'no-applicable-method (car args) method args)
+                    rvalever t)
+            (signal
+             'no-method-definition
+             (list method args))))
+      ;; Right Here... it could be that lastval is returned when
+      ;; rvalever is nil.  Is that right?
+      rval)))
+
+(defun eieio-generic-call-primary-only (method args)
+  "Call METHOD with ARGS for methods with only :PRIMARY implementations.
+ARGS provides the context on which implementation to use.
+This should only be called from a generic function.
+
+This method is like `eieio-generic-call', but only
+implementations in the :PRIMARY slot are queried.  After many
+years of use, it appears that over 90% of methods in use
+have :PRIMARY implementations only.  We can therefore optimize
+for this common case to improve performance."
+  ;; We must expand our arguments first as they are always
+  ;; passed in as quoted symbols
+  (let ((newargs nil) (mclass nil)  (lambdas nil)
+        (eieio-generic-call-methodname method)
+        (eieio-generic-call-arglst args)
+        (firstarg nil)
+        (primarymethodlist nil)
+        )
+    ;; get a copy
+    (setq newargs args
+          firstarg (car newargs))
+
+    ;; Determine the class to use.
+    (cond ((eieio-object-p firstarg)
+           (setq mclass (eieio--object-class firstarg)))
+          ((not firstarg)
+           (error "Method %s called on nil" method))
+          ((not (eieio-object-p firstarg))
+           (error "Primary-only method %s called on something not an object" method))
+          (t
+           (error "EIEIO Error: Improperly classified method %s as primary only"
+                  method)
+          ))
+    ;; Make sure the class is a valid class
+    ;; mclass can be nil (meaning a generic for should be used.
+    ;; mclass cannot have a value that is not a class, however.
+    (when (null mclass)
+      (error "Cannot dispatch method %S on class %S" method mclass)
+      )
+
+    ;; :primary methods
+    (setq lambdas (eieio-generic-form method method-primary mclass))
+    (setq primarymethodlist  ;; Re-use even with bad name here
+          (eieiomt-method-list method method-primary mclass))
+
+    ;; Now loop through all occurrences forms which we must execute
+    ;; (which are happily sorted now) and execute them all!
+    (eieio--with-scoped-class (cdr lambdas)
+      (let* ((rval nil) (lastval nil) (rvalever nil)
+             (eieio-generic-call-key method-primary)
+             ;; Use the cdr, as the first element is the fcn
+             ;; we are calling right now.
+             (eieio-generic-call-next-method-list (cdr primarymethodlist))
+             )
+
+        (if (or (not lambdas) (not (car lambdas)))
+
+            ;; No methods found for this impl...
+            (if (eieio-object-p (car args))
+                (setq rval (apply 'no-applicable-method (car args) method args)
+                      rvalever t)
+              (signal
+               'no-method-definition
+               (list method args)))
+
+          ;; Do the regular implementation here.
+
+          (run-hook-with-args 'eieio-pre-method-execution-functions
+                              lambdas)
+
+          (setq lastval (apply (car lambdas) newargs))
+          (setq rval lastval
+                rvalever t)
+          )
+
+        ;; Right Here... it could be that lastval is returned when
+        ;; rvalever is nil.  Is that right?
+        rval))))
+
+(defun eieiomt-method-list (method key class)
+  "Return an alist list of methods lambdas.
+METHOD is the method name.
+KEY represents either :before, or :after methods.
+CLASS is the starting class to search from in the method tree.
+If CLASS is nil, then an empty list of methods should be returned."
+  ;; Note: eieiomt - the MT means MethodTree.  See more comments below
+  ;; for the rest of the eieiomt methods.
+
+  ;; Collect lambda expressions stored for the class and its parent
+  ;; classes.
+  (let (lambdas)
+    (dolist (ancestor (eieio-class-precedence-list class))
+      ;; Lookup the form to use for the PRIMARY object for the next level
+      (let ((tmpl (eieio-generic-form method key ancestor)))
+        (when (and tmpl
+                   (or (not lambdas)
+                       ;; This prevents duplicates coming out of the
+                       ;; class method optimizer.  Perhaps we should
+                       ;; just not optimize before/afters?
+                       (not (member tmpl lambdas))))
+          (push tmpl lambdas))))
+
+    ;; Return collected lambda. For :after methods, return in current
+    ;; order (most general class last); Otherwise, reverse order.
+    (if (eq key method-after)
+        lambdas
+      (nreverse lambdas))))
+
+
+;;;
+;; eieio-method-tree : eieiomt-
+;;
+;; Stored as eieio-method-tree in property list of a generic method
+;;
+;; (eieio-method-tree . [BEFORE PRIMARY AFTER
+;;                       genericBEFORE genericPRIMARY genericAFTER])
+;; and
+;; (eieio-method-obarray . [BEFORE PRIMARY AFTER
+;;                          genericBEFORE genericPRIMARY genericAFTER])
+;;    where the association is a vector.
+;;    (aref 0  -- all static methods.
+;;    (aref 1  -- all methods classified as :before
+;;    (aref 2  -- all methods classified as :primary
+;;    (aref 3  -- all methods classified as :after
+;;    (aref 4  -- a generic classified as :before
+;;    (aref 5  -- a generic classified as :primary
+;;    (aref 6  -- a generic classified as :after
+;;
+(defvar eieiomt-optimizing-obarray nil
+  "While mapping atoms, this contain the obarray being optimized.")
+
+(defun eieiomt-install (method-name)
+  "Install the method tree, and obarray onto METHOD-NAME.
+Do not do the work if they already exist."
+  (let ((emtv (get method-name 'eieio-method-tree))
+        (emto (get method-name 'eieio-method-obarray)))
+    (if (or (not emtv) (not emto))
+        (progn
+          (setq emtv (put method-name 'eieio-method-tree
+                          (make-vector method-num-slots nil))
+                emto (put method-name 'eieio-method-obarray
+                          (make-vector method-num-slots nil)))
+          (aset emto 0 (make-vector 11 0))
+          (aset emto 1 (make-vector 11 0))
+          (aset emto 2 (make-vector 41 0))
+          (aset emto 3 (make-vector 11 0))
+          ))))
+
+(defun eieiomt-add (method-name method key class)
+  "Add to METHOD-NAME the forms METHOD in a call position KEY for CLASS.
+METHOD-NAME is the name created by a call to `defgeneric'.
+METHOD are the forms for a given implementation.
+KEY is an integer (see comment in eieio.el near this function) which
+is associated with the :static :before :primary and :after tags.
+It also indicates if CLASS is defined or not.
+CLASS is the class this method is associated with."
+  (if (or (> key method-num-slots) (< key 0))
+      (error "eieiomt-add: method key error!"))
+  (let ((emtv (get method-name 'eieio-method-tree))
+        (emto (get method-name 'eieio-method-obarray)))
+    ;; Make sure the method tables are available.
+    (if (or (not emtv) (not emto))
+        (error "Programmer error: eieiomt-add"))
+    ;; only add new cells on if it doesn't already exist!
+    (if (assq class (aref emtv key))
+        (setcdr (assq class (aref emtv key)) method)
+      (aset emtv key (cons (cons class method) (aref emtv key))))
+    ;; Add function definition into newly created symbol, and store
+    ;; said symbol in the correct obarray, otherwise use the
+    ;; other array to keep this stuff
+    (if (< key method-num-lists)
+        (let ((nsym (intern (symbol-name class) (aref emto key))))
+          (fset nsym method)))
+    ;; Save the defmethod file location in a symbol property.
+    (let ((fname (if load-in-progress
+                     load-file-name
+                   buffer-file-name))
+          loc)
+      (when fname
+        (when (string-match "\\.elc$" fname)
+          (setq fname (substring fname 0 (1- (length fname)))))
+        (setq loc (get method-name 'method-locations))
+        (pushnew (list class fname) loc :test 'equal)
+        (put method-name 'method-locations loc)))
+    ;; Now optimize the entire obarray
+    (if (< key method-num-lists)
+        (let ((eieiomt-optimizing-obarray (aref emto key)))
+          ;; @todo - Is this overkill?  Should we just clear the symbol?
+          (mapatoms 'eieiomt-sym-optimize eieiomt-optimizing-obarray)))
+    ))
+
+(defun eieiomt-next (class)
+  "Return the next parent class for CLASS.
+If CLASS is a superclass, return variable `eieio-default-superclass'.
+If CLASS is variable `eieio-default-superclass' then return nil.
+This is different from function `class-parent' as class parent returns
+nil for superclasses.  This function performs no type checking!"
+  ;; No type-checking because all calls are made from functions which
+  ;; are safe and do checking for us.
+  (or (eieio-class-parents-fast class)
+      (if (eq class 'eieio-default-superclass)
+          nil
+        '(eieio-default-superclass))))
+
+(defun eieiomt-sym-optimize (s)
+  "Find the next class above S which has a function body for the optimizer."
+  ;; Set the value to nil in case there is no nearest cell.
+  (set s nil)
+  ;; Find the nearest cell that has a function body. If we find one,
+  ;; we replace the nil from above.
+  (let ((external-symbol (intern-soft (symbol-name s))))
+    (catch 'done
+      (dolist (ancestor (rest (eieio-class-precedence-list external-symbol)))
+        (let ((ov (intern-soft (symbol-name ancestor)
+                               eieiomt-optimizing-obarray)))
+          (when (fboundp ov)
+            (set s ov) ;; store ov as our next symbol
+            (throw 'done ancestor)))))))
+
+(defun eieio-generic-form (method key class)
+ "Return the lambda form belonging to METHOD using KEY based upon CLASS.
+If CLASS is not a class then use `generic' instead.  If class has
+no form, but has a parent class, then trace to that parent class.
+The first time a form is requested from a symbol, an optimized path
+is memorized for faster future use."
+ (let ((emto (aref (get method 'eieio-method-obarray)
+                   (if class key (eieio-specialized-key-to-generic-key key)))))
+   (if (class-p class)
+       ;; 1) find our symbol
+       (let ((cs (intern-soft (symbol-name class) emto)))
+         (if (not cs)
+             ;; 2) If there isn't one, then make one.
+             ;;    This can be slow since it only occurs once
+             (progn
+               (setq cs (intern (symbol-name class) emto))
+               ;; 2.1) Cache its nearest neighbor with a quick optimize
+               ;;      which should only occur once for this call ever
+               (let ((eieiomt-optimizing-obarray emto))
+                 (eieiomt-sym-optimize cs))))
+         ;; 3) If it's bound return this one.
+         (if (fboundp  cs)
+             (cons cs (eieio--class-symbol (class-v class)))
+           ;; 4) If it's not bound then this variable knows something
+           (if (symbol-value cs)
+               (progn
+                 ;; 4.1) This symbol holds the next class in its value
+                 (setq class (symbol-value cs)
+                       cs (intern-soft (symbol-name class) emto))
+                 ;; 4.2) The optimizer should always have chosen a
+                 ;;      function-symbol
+                 ;;(if (fboundp cs)
+                 (cons cs (eieio--class-symbol (class-v (intern (symbol-name class)))))
+                   ;;(error "EIEIO optimizer: erratic data loss!"))
+                 )
+               ;; There never will be a funcall...
+               nil)))
+     ;; for a generic call, what is a list, is the function body we want.
+     (let ((emtl (aref (get method 'eieio-method-tree)
+                       (if class key (eieio-specialized-key-to-generic-key key)))))
+       (if emtl
+           ;; The car of EMTL is supposed to be a class, which in this
+           ;; case is nil, so skip it.
+           (cons (cdr (car emtl)) nil)
+         nil)))))
+
+
+;;; Here are some special types of errors
+;;
+(intern "no-method-definition")
+(put 'no-method-definition 'error-conditions '(no-method-definition error))
+(put 'no-method-definition 'error-message "No method definition")
+
+(intern "no-next-method")
+(put 'no-next-method 'error-conditions '(no-next-method error))
+(put 'no-next-method 'error-message "No next method")
+
+(intern "invalid-slot-name")
+(put 'invalid-slot-name 'error-conditions '(invalid-slot-name error))
+(put 'invalid-slot-name 'error-message "Invalid slot name")
+
+(intern "invalid-slot-type")
+(put 'invalid-slot-type 'error-conditions '(invalid-slot-type error nil))
+(put 'invalid-slot-type 'error-message "Invalid slot type")
+
+(intern "unbound-slot")
+(put 'unbound-slot 'error-conditions '(unbound-slot error nil))
+(put 'unbound-slot 'error-message "Unbound slot")
+
+(intern "inconsistent-class-hierarchy")
+(put 'inconsistent-class-hierarchy 'error-conditions
+     '(inconsistent-class-hierarchy error nil))
+(put 'inconsistent-class-hierarchy 'error-message "Inconsistent class hierarchy")
+
+;;; Obsolete backward compatibility functions.
+;; Needed to run byte-code compiled with the EIEIO of Emacs-23.
+
+(defun eieio-defmethod (method args)
+  "Obsolete work part of an old version of the `defmethod' macro."
+  (let ((key nil) (body nil) (firstarg nil) (argfix nil) (argclass nil) loopa)
+    ;; find optional keys
+    (setq key
+          (cond ((memq (car args) '(:BEFORE :before))
+                 (setq args (cdr args))
+                 method-before)
+                ((memq (car args) '(:AFTER :after))
+                 (setq args (cdr args))
+                 method-after)
+                ((memq (car args) '(:STATIC :static))
+                 (setq args (cdr args))
+                 method-static)
+                ((memq (car args) '(:PRIMARY :primary))
+                 (setq args (cdr args))
+                 method-primary)
+                ;; Primary key.
+                (t method-primary)))
+    ;; Get body, and fix contents of args to be the arguments of the fn.
+    (setq body (cdr args)
+          args (car args))
+    (setq loopa args)
+    ;; Create a fixed version of the arguments.
+    (while loopa
+      (setq argfix (cons (if (listp (car loopa)) (car (car loopa)) (car loopa))
+                         argfix))
+      (setq loopa (cdr loopa)))
+    ;; Make sure there is a generic.
+    (eieio-defgeneric
+     method
+     (if (stringp (car body))
+         (car body) (format "Generically created method `%s'." method)))
+    ;; create symbol for property to bind to.  If the first arg is of
+    ;; the form (varname vartype) and `vartype' is a class, then
+    ;; that class will be the type symbol.  If not, then it will fall
+    ;; under the type `primary' which is a non-specific calling of the
+    ;; function.
+    (setq firstarg (car args))
+    (if (listp firstarg)
+        (progn
+          (setq argclass  (nth 1 firstarg))
+          (if (not (class-p argclass))
+              (error "Unknown class type %s in method parameters"
+                     (nth 1 firstarg))))
+      ;; Generics are higher.
+      (setq key (eieio-specialized-key-to-generic-key key)))
+    ;; Put this lambda into the symbol so we can find it.
+    (if (byte-code-function-p (car-safe body))
+        (eieiomt-add method (car-safe body) key argclass)
+      (eieiomt-add method (append (list 'lambda (reverse argfix)) body)
+                   key argclass))
+    )
+
+  (when eieio-optimize-primary-methods-flag
+    ;; Optimizing step:
+    ;;
+    ;; If this method, after this setup, only has primary methods, then
+    ;; we can setup the generic that way.
+    (if (generic-primary-only-p method)
+        ;; If there is only one primary method, then we can go one more
+        ;; optimization step.
+        (if (generic-primary-only-one-p method)
+            (eieio-defgeneric-reset-generic-form-primary-only-one method)
+          (eieio-defgeneric-reset-generic-form-primary-only method))
+      (eieio-defgeneric-reset-generic-form method)))
+
+  method)
+(make-obsolete 'eieio-defmethod 'eieio--defmethod "24.1")
+
+(defun eieio-defgeneric (method doc-string)
+  "Obsolete work part of an old version of the `defgeneric' macro."
+  (if (and (fboundp method) (not (generic-p method))
+           (or (byte-code-function-p (symbol-function method))
+               (not (eq 'autoload (car (symbol-function method)))))
+           )
+      (error "You cannot create a generic/method over an existing symbol: %s"
+             method))
+  ;; Don't do this over and over.
+  (unless (fboundp 'method)
+    ;; This defun tells emacs where the first definition of this
+    ;; method is defined.
+    `(defun ,method nil)
+    ;; Make sure the method tables are installed.
+    (eieiomt-install method)
+    ;; Apply the actual body of this function.
+    (fset method (eieio-defgeneric-form method doc-string))
+    ;; Return the method
+    'method))
+(make-obsolete 'eieio-defgeneric nil "24.1")
+
+(provide 'eieio-core)
+
+;;; eieio-core.el ends here
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 37b1ec5fa94..3cdf1f078bd 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -54,223 +54,7 @@
   (interactive)
   (message eieio-version))
 
-(eval-and-compile
-;; About the above.  EIEIO must process its own code when it compiles
-;; itself, thus, by eval-and-compiling ourselves, we solve the problem.
-
-;; Compatibility
-(if (fboundp 'compiled-function-arglist)
-
-    ;; XEmacs can only access a compiled functions arglist like this:
-    (defalias 'eieio-compiled-function-arglist 'compiled-function-arglist)
-
-  ;; Emacs doesn't have this function, but since FUNC is a vector, we can just
-  ;; grab the appropriate element.
-  (defun eieio-compiled-function-arglist (func)
-    "Return the argument list for the compiled function FUNC."
-    (aref func 0))
-
-  )
-
-
-;;;
-;; Variable declarations.
-;;
-
-(defvar eieio-hook nil
-  "This hook is executed, then cleared each time `defclass' is called.")
-
-(defvar eieio-error-unsupported-class-tags nil
-  "Non-nil to throw an error if an encountered tag is unsupported.
-This may prevent classes from CLOS applications from being used with EIEIO
-since EIEIO does not support all CLOS tags.")
-
-(defvar eieio-skip-typecheck nil
-  "If non-nil, skip all slot typechecking.
-Set this to t permanently if a program is functioning well to get a
-small speed increase.  This variable is also used internally to handle
-default setting for optimization purposes.")
-
-(defvar eieio-optimize-primary-methods-flag t
-  "Non-nil means to optimize the method dispatch on primary methods.")
-
-(defvar eieio-initializing-object  nil
-  "Set to non-nil while initializing an object.")
-
-(defconst eieio-unbound
-  (if (and (boundp 'eieio-unbound) (symbolp eieio-unbound))
-      eieio-unbound
-    (make-symbol "unbound"))
-  "Uninterned symbol representing an unbound slot in an object.")
-
-;; This is a bootstrap for eieio-default-superclass so it has a value
-;; while it is being built itself.
-(defvar eieio-default-superclass nil))
-
-(defmacro eieio--define-field-accessors (prefix fields)
-  (declare (indent 1))
-  (let ((index 0)
-        (defs '()))
-    (dolist (field fields)
-      (let ((doc (if (listp field)
-                     (prog1 (cadr field) (setq field (car field))))))
-        (push `(defmacro ,(intern (format "eieio--%s-%s" prefix field)) (x)
-                 ,@(if doc (list (format (if (string-match "\n" doc)
-                                             "Return %s" "Return %s of a %s.")
-                                         doc prefix)))
-                 (list 'aref x ,index))
-              defs)
-        (setq index (1+ index))))
-    `(eval-and-compile
-       ,@(nreverse defs)
-       (defconst ,(intern (format "eieio--%s-num-slots" prefix)) ,index))))
-
-(eieio--define-field-accessors class
-  (-unused-0 ;;FIXME: not sure, but at least there was no accessor!
-   (symbol "symbol (self-referencing)")
-   parent children
-   (symbol-obarray "obarray permitting fast access to variable position indexes")
-   ;; @todo
-   ;; the word "public" here is leftovers from the very first version.
-   ;; Get rid of it!
-   (public-a "class attribute index")
-   (public-d "class attribute defaults index")
-   (public-doc "class documentation strings for attributes")
-   (public-type "class type for a slot")
-   (public-custom "class custom type for a slot")
-   (public-custom-label "class custom group for a slot")
-   (public-custom-group "class custom group for a slot")
-   (public-printer "printer for a slot")
-   (protection "protection for a slot")
-   (initarg-tuples "initarg tuples list")
-   (class-allocation-a "class allocated attributes")
-   (class-allocation-doc "class allocated documentation")
-   (class-allocation-type "class allocated value type")
-   (class-allocation-custom "class allocated custom descriptor")
-   (class-allocation-custom-label "class allocated custom descriptor")
-   (class-allocation-custom-group "class allocated custom group")
-   (class-allocation-printer "class allocated printer for a slot")
-   (class-allocation-protection "class allocated protection list")
-   (class-allocation-values "class allocated value vector")
-   (default-object-cache "what a newly created object would look like.
-This will speed up instantiation time as only a `copy-sequence' will
-be needed, instead of looping over all the values and setting them
-from the default.")
-   (options "storage location of tagged class options.
-Stored outright without modifications or stripping.")))
-
-(eieio--define-field-accessors object
-  (-unused-0 ;;FIXME: not sure, but at least there was no accessor!
-   (class "class struct defining OBJ")
-   name))
-
-(eval-and-compile
-;; FIXME: The constants below should have an `eieio-' prefix added!!
-
-(defconst method-static 0 "Index into :static tag on a method.")
-(defconst method-before 1 "Index into :before tag on a method.")
-(defconst method-primary 2 "Index into :primary tag on a method.")
-(defconst method-after 3 "Index into :after tag on a method.")
-(defconst method-num-lists 4 "Number of indexes into methods vector in which groups of functions are kept.")
-(defconst method-generic-before 4 "Index into generic :before tag on a method.")
-(defconst method-generic-primary 5 "Index into generic :primary tag on a method.")
-(defconst method-generic-after 6 "Index into generic :after tag on a method.")
-(defconst method-num-slots 7 "Number of indexes into a method's vector.")
-
-(defsubst eieio-specialized-key-to-generic-key (key)
-  "Convert a specialized KEY into a generic method key."
-  (cond ((eq key method-static) 0) ;; don't convert
-        ((< key method-num-lists) (+ key 3)) ;; The conversion
-        (t key) ;; already generic.. maybe.
-        ))
-
-
-;;; Important macros used in eieio.
-;;
-(defmacro class-v (class)
-  "Internal: Return the class vector from the CLASS symbol."
-  ;; No check: If eieio gets this far, it's probably been checked already.
-  `(get ,class 'eieio-class-definition))
-
-(defmacro class-p (class)
-  "Return t if CLASS is a valid class vector.
-CLASS is a symbol."
-  ;; this new method is faster since it doesn't waste time checking lots of
-  ;; things.
-  `(condition-case nil
-       (eq (aref (class-v ,class) 0) 'defclass)
-     (error nil)))
-
-(defmacro eieio-object-p (obj)
-  "Return non-nil if OBJ is an EIEIO object."
-  `(condition-case nil
-       (let ((tobj ,obj))
-         (and (eq (aref tobj 0) 'object)
-              (class-p (eieio--object-class tobj))))
-     (error nil)))
-(defalias 'object-p 'eieio-object-p)
-
-(defmacro class-constructor (class)
-  "Return the symbol representing the constructor of CLASS."
-  `(eieio--class-symbol (class-v ,class)))
-
-(defmacro generic-p (method)
-  "Return t if symbol METHOD is a generic function.
-Only methods have the symbol `eieio-method-obarray' as a property
-\(which contains a list of all bindings to that method type.)"
-  `(and (fboundp ,method) (get ,method 'eieio-method-obarray)))
-
-(defun generic-primary-only-p (method)
-  "Return t if symbol METHOD is a generic function with only primary methods.
-Only methods have the symbol `eieio-method-obarray' as a property (which
-contains a list of all bindings to that method type.)
-Methods with only primary implementations are executed in an optimized way."
-  (and (generic-p method)
-       (let ((M (get method 'eieio-method-tree)))
-         (and (< 0 (length (aref M method-primary)))
-              (not (aref M method-static))
-              (not (aref M method-before))
-              (not (aref M method-after))
-              (not (aref M method-generic-before))
-              (not (aref M method-generic-primary))
-              (not (aref M method-generic-after))))
-       ))
-
-(defun generic-primary-only-one-p (method)
-  "Return t if symbol METHOD is a generic function with only primary methods.
-Only methods have the symbol `eieio-method-obarray' as a property (which
-contains a list of all bindings to that method type.)
-Methods with only primary implementations are executed in an optimized way."
-  (and (generic-p method)
-       (let ((M (get method 'eieio-method-tree)))
-         (and (= 1 (length (aref M method-primary)))
-              (not (aref M method-static))
-              (not (aref M method-before))
-              (not (aref M method-after))
-              (not (aref M method-generic-before))
-              (not (aref M method-generic-primary))
-              (not (aref M method-generic-after))))
-       ))
-
-(defmacro class-option-assoc (list option)
-  "Return from LIST the found OPTION, or nil if it doesn't exist."
-  `(car-safe (cdr (memq ,option ,list))))
-
-(defmacro class-option (class option)
-  "Return the value stored for CLASS' OPTION.
-Return nil if that option doesn't exist."
-  `(class-option-assoc (eieio--class-options (class-v ,class)) ',option))
-
-(defmacro class-abstract-p (class)
-  "Return non-nil if CLASS is abstract.
-Abstract classes cannot be instantiated."
-  `(class-option ,class :abstract))
-
-(defmacro class-method-invocation-order (class)
-  "Return the invocation order of CLASS.
-Abstract classes cannot be instantiated."
-  `(or (class-option ,class :method-invocation-order)
-       :breadth-first))
+(require 'eieio-core)
 
 
 ;;; Defining a new class
@@ -331,829 +115,8 @@ Options in CLOS not supported in EIEIO:
 
 Due to the way class options are set up, you can add any tags you wish,
 and reference them using the function `class-option'."
-  ;; We must `eval-and-compile' this so that when we byte compile
-  ;; an eieio program, there is no need to load it ahead of time.
-  ;; It also provides lots of nice debugging errors at compile time.
-  `(eval-and-compile
-     (eieio-defclass ',name ',superclass ',slots ',options-and-doc)))
-
-(defvar eieio-defclass-autoload-map (make-vector 7 nil)
-  "Symbol map of superclasses we find in autoloads.")
-
-;; We autoload this because it's used in `make-autoload'.
-;;;###autoload
-(defun eieio-defclass-autoload (cname superclasses filename doc)
-  "Create autoload symbols for the EIEIO class CNAME.
-SUPERCLASSES are the superclasses that CNAME inherits from.
-DOC is the docstring for CNAME.
-This function creates a mock-class for CNAME and adds it into
-SUPERCLASSES as children.
-It creates an autoload function for CNAME's constructor."
-  ;; Assume we've already debugged inputs.
-
-  (let* ((oldc (when (class-p cname) (class-v cname)))
-         (newc (make-vector eieio--class-num-slots nil))
-         )
-    (if oldc
-        nil ;; Do nothing if we already have this class.
-
-      ;; Create the class in NEWC, but don't fill anything else in.
-      (aset newc 0 'defclass)
-      (setf (eieio--class-symbol newc) cname)
-
-      (let ((clear-parent nil))
-        ;; No parents?
-        (when (not superclasses)
-          (setq superclasses '(eieio-default-superclass)
-                clear-parent t)
-          )
-
-        ;; Hook our new class into the existing structures so we can
-        ;; autoload it later.
-        (dolist (SC superclasses)
-
-
-          ;; TODO - If we create an autoload that is in the map, that
-          ;;        map needs to be cleared!
-
-
-          ;; Does our parent exist?
-          (if (not (class-p SC))
-
-              ;; Create a symbol for this parent, and then store this
-              ;; parent on that symbol.
-              (let ((sym (intern (symbol-name SC) eieio-defclass-autoload-map)))
-                (if (not (boundp sym))
-                    (set sym (list cname))
-                  (add-to-list sym cname))
-                )
-
-            ;; We have a parent, save the child in there.
-            (when (not (member cname (eieio--class-children (class-v SC))))
-              (setf (eieio--class-children (class-v SC))
-                    (cons cname (eieio--class-children (class-v SC))))))
-
-          ;; save parent in child
-          (setf (eieio--class-parent newc) (cons SC (eieio--class-parent newc)))
-          )
-
-        ;; turn this into a usable self-pointing symbol
-        (set cname cname)
-
-        ;; Store the new class vector definition into the symbol.  We need to
-        ;; do this first so that we can call defmethod for the accessor.
-        ;; The vector will be updated by the following while loop and will not
-        ;; need to be stored a second time.
-        (put cname 'eieio-class-definition newc)
-
-        ;; Clear the parent
-        (if clear-parent (setf (eieio--class-parent newc) nil))
-
-        ;; Create an autoload on top of our constructor function.
-        (autoload cname filename doc nil nil)
-        (autoload (intern (concat (symbol-name cname) "-p")) filename "" nil nil)
-        (autoload (intern (concat (symbol-name cname) "-child-p")) filename "" nil nil)
-        (autoload (intern (concat (symbol-name cname) "-list-p")) filename "" nil nil)
-
-        ))))
-
-(defsubst eieio-class-un-autoload (cname)
-  "If class CNAME is in an autoload state, load its file."
-  (when (eq (car-safe (symbol-function cname)) 'autoload)
-    (load-library (car (cdr (symbol-function cname))))))
-
-(defmacro eieio--check-type (type obj)
-  (unless (symbolp obj)
-    (error "eieio--check-type wants OBJ to be a variable"))
-  `(if (not ,(cond
-              ((eq 'or (car-safe type))
-               `(or ,@(mapcar (lambda (type) `(,type ,obj)) (cdr type))))
-              (t `(,type ,obj))))
-       (signal 'wrong-type-argument (list ',type ,obj))))
-
-(defun eieio-defclass (cname superclasses slots options-and-doc)
-  ;; FIXME: Most of this should be moved to the `defclass' macro.
-  "Define CNAME as a new subclass of SUPERCLASSES.
-SLOTS are the slots residing in that class definition, and options or
-documentation OPTIONS-AND-DOC is the toplevel documentation for this class.
-See `defclass' for more information."
-  ;; Run our eieio-hook each time, and clear it when we are done.
-  ;; This way people can add hooks safely if they want to modify eieio
-  ;; or add definitions when eieio is loaded or something like that.
-  (run-hooks 'eieio-hook)
-  (setq eieio-hook nil)
-
-  (eieio--check-type listp superclasses)
-
-  (let* ((pname superclasses)
-         (newc (make-vector eieio--class-num-slots nil))
-         (oldc (when (class-p cname) (class-v cname)))
-         (groups nil) ;; list of groups id'd from slots
-         (options nil)
-         (clearparent nil))
-
-    (aset newc 0 'defclass)
-    (setf (eieio--class-symbol newc) cname)
-
-    ;; If this class already existed, and we are updating its structure,
-    ;; make sure we keep the old child list.  This can cause bugs, but
-    ;; if no new slots are created, it also saves time, and prevents
-    ;; method table breakage, particularly when the users is only
-    ;; byte compiling an EIEIO file.
-    (if oldc
-        (setf (eieio--class-children newc) (eieio--class-children oldc))
-      ;; If the old class did not exist, but did exist in the autoload map, then adopt those children.
-      ;; This is like the above, but deals with autoloads nicely.
-      (let ((sym (intern-soft (symbol-name cname) eieio-defclass-autoload-map)))
-        (when sym
-          (condition-case nil
-              (setf (eieio--class-children newc) (symbol-value sym))
-            (error nil))
-          (unintern (symbol-name cname) eieio-defclass-autoload-map)
-          ))
-      )
-
-    (cond ((and (stringp (car options-and-doc))
-                (/= 1 (% (length options-and-doc) 2)))
-           (error "Too many arguments to `defclass'"))
-          ((and (symbolp (car options-and-doc))
-                (/= 0 (% (length options-and-doc) 2)))
-           (error "Too many arguments to `defclass'"))
-          )
-
-    (setq options
-          (if (stringp (car options-and-doc))
-              (cons :documentation options-and-doc)
-            options-and-doc))
-
-    (if pname
-        (progn
-          (while pname
-            (if (and (car pname) (symbolp (car pname)))
-                (if (not (class-p (car pname)))
-                    ;; bad class
-                    (error "Given parent class %s is not a class" (car pname))
-                  ;; good parent class...
-                  ;; save new child in parent
-                  (when (not (member cname (eieio--class-children (class-v (car pname)))))
-                    (setf (eieio--class-children (class-v (car pname)))
-                          (cons cname (eieio--class-children (class-v (car pname))))))
-                  ;; Get custom groups, and store them into our local copy.
-                  (mapc (lambda (g) (add-to-list 'groups g))
-                        (class-option (car pname) :custom-groups))
-                  ;; save parent in child
-                  (setf (eieio--class-parent newc) (cons (car pname) (eieio--class-parent newc))))
-              (error "Invalid parent class %s" pname))
-            (setq pname (cdr pname)))
-          ;; Reverse the list of our parents so that they are prioritized in
-          ;; the same order as specified in the code.
-          (setf (eieio--class-parent newc) (nreverse (eieio--class-parent newc))) )
-      ;; If there is nothing to loop over, then inherit from the
-      ;; default superclass.
-      (unless (eq cname 'eieio-default-superclass)
-        ;; adopt the default parent here, but clear it later...
-        (setq clearparent t)
-        ;; save new child in parent
-        (if (not (member cname (eieio--class-children (class-v 'eieio-default-superclass))))
-            (setf (eieio--class-children (class-v 'eieio-default-superclass))
-                  (cons cname (eieio--class-children (class-v 'eieio-default-superclass)))))
-        ;; save parent in child
-        (setf (eieio--class-parent newc) (list eieio-default-superclass))))
-
-    ;; turn this into a usable self-pointing symbol
-    (set cname cname)
-
-    ;; These two tests must be created right away so we can have self-
-    ;; referencing classes.  ei, a class whose slot can contain only
-    ;; pointers to itself.
-
-    ;; Create the test function
-    (let ((csym (intern (concat (symbol-name cname) "-p"))))
-      (fset csym
-            (list 'lambda (list 'obj)
-                  (format "Test OBJ to see if it an object of type %s" cname)
-                  (list 'and '(eieio-object-p obj)
-                        (list 'same-class-p 'obj cname)))))
-
-    ;; Make sure the method invocation order  is a valid value.
-    (let ((io (class-option-assoc options :method-invocation-order)))
-      (when (and io (not (member io '(:depth-first :breadth-first :c3))))
-        (error "Method invocation order %s is not allowed" io)
-        ))
-
-    ;; Create a handy child test too
-    (let ((csym (intern (concat (symbol-name cname) "-child-p"))))
-      (fset csym
-            `(lambda (obj)
-               ,(format
-                  "Test OBJ to see if it an object is a child of type %s"
-                  cname)
-               (and (eieio-object-p obj)
-                    (object-of-class-p obj ,cname))))
-
-    ;; Create a handy list of the class test too
-    (let ((csym (intern (concat (symbol-name cname) "-list-p"))))
-      (fset csym
-            `(lambda (obj)
-               ,(format
-                  "Test OBJ to see if it a list of objects which are a child of type %s"
-                  cname)
-               (when (listp obj)
-                 (let ((ans t)) ;; nil is valid
-                   ;; Loop over all the elements of the input list, test
-                   ;; each to make sure it is a child of the desired object class.
-                   (while (and obj ans)
-                     (setq ans (and (eieio-object-p (car obj))
-                                    (object-of-class-p (car obj) ,cname)))
-                     (setq obj (cdr obj)))
-                   ans)))))
-
-      ;; When using typep, (typep OBJ 'myclass) returns t for objects which
-      ;; are subclasses of myclass.  For our predicates, however, it is
-      ;; important for EIEIO to be backwards compatible, where
-      ;; myobject-p, and myobject-child-p are different.
-      ;; "cl" uses this technique to specify symbols with specific typep
-      ;; test, so we can let typep have the CLOS documented behavior
-      ;; while keeping our above predicate clean.
-
-      ;; It would be cleaner to use `defsetf' here, but that requires cl
-      ;; at runtime.
-      (put cname 'cl-deftype-handler
-           (list 'lambda () `(list 'satisfies (quote ,csym)))))
-
-    ;; Before adding new slots, let's add all the methods and classes
-    ;; in from the parent class.
-    (eieio-copy-parents-into-subclass newc superclasses)
-
-    ;; Store the new class vector definition into the symbol.  We need to
-    ;; do this first so that we can call defmethod for the accessor.
-    ;; The vector will be updated by the following while loop and will not
-    ;; need to be stored a second time.
-    (put cname 'eieio-class-definition newc)
-
-    ;; Query each slot in the declaration list and mangle into the
-    ;; class structure I have defined.
-    (while slots
-      (let* ((slot1  (car slots))
-             (name    (car slot1))
-             (slot   (cdr slot1))
-             (acces   (plist-get slot ':accessor))
-             (init    (or (plist-get slot ':initform)
-                          (if (member ':initform slot) nil
-                            eieio-unbound)))
-             (initarg (plist-get slot ':initarg))
-             (docstr  (plist-get slot ':documentation))
-             (prot    (plist-get slot ':protection))
-             (reader  (plist-get slot ':reader))
-             (writer  (plist-get slot ':writer))
-             (alloc   (plist-get slot ':allocation))
-             (type    (plist-get slot ':type))
-             (custom  (plist-get slot ':custom))
-             (label   (plist-get slot ':label))
-             (customg (plist-get slot ':group))
-             (printer (plist-get slot ':printer))
-
-             (skip-nil (class-option-assoc options :allow-nil-initform))
-             )
-
-        (if eieio-error-unsupported-class-tags
-            (let ((tmp slot))
-              (while tmp
-                (if (not (member (car tmp) '(:accessor
-                                             :initform
-                                             :initarg
-                                             :documentation
-                                             :protection
-                                             :reader
-                                             :writer
-                                             :allocation
-                                             :type
-                                             :custom
-                                             :label
-                                             :group
-                                             :printer
-                                             :allow-nil-initform
-                                             :custom-groups)))
-                    (signal 'invalid-slot-type (list (car tmp))))
-                (setq tmp (cdr (cdr tmp))))))
-
-        ;; Clean up the meaning of protection.
-        (cond ((or (eq prot 'public) (eq prot :public)) (setq prot nil))
-              ((or (eq prot 'protected) (eq prot :protected)) (setq prot 'protected))
-              ((or (eq prot 'private) (eq prot :private)) (setq prot 'private))
-              ((eq prot nil) nil)
-              (t (signal 'invalid-slot-type (list ':protection prot))))
-
-        ;; Make sure the :allocation parameter has a valid value.
-        (if (not (or (not alloc) (eq alloc :class) (eq alloc :instance)))
-            (signal 'invalid-slot-type (list ':allocation alloc)))
-
-        ;; The default type specifier is supposed to be t, meaning anything.
-        (if (not type) (setq type t))
-
-        ;; Label is nil, or a string
-        (if (not (or (null label) (stringp label)))
-            (signal 'invalid-slot-type (list ':label label)))
-
-        ;; Is there an initarg, but allocation of class?
-        (if (and initarg (eq alloc :class))
-            (message "Class allocated slots do not need :initarg"))
-
-        ;; intern the symbol so we can use it blankly
-        (if initarg (set initarg initarg))
-
-        ;; The customgroup should be a list of symbols
-        (cond ((null customg)
-               (setq customg '(default)))
-              ((not (listp customg))
-               (setq customg (list customg))))
-        ;; The customgroup better be a symbol, or list of symbols.
-        (mapc (lambda (cg)
-                (if (not (symbolp cg))
-                    (signal 'invalid-slot-type (list ':group cg))))
-                customg)
-
-        ;; First up, add this slot into our new class.
-        (eieio-add-new-slot newc name init docstr type custom label customg printer
-                             prot initarg alloc 'defaultoverride skip-nil)
-
-        ;; We need to id the group, and store them in a group list attribute.
-        (mapc (lambda (cg) (add-to-list 'groups cg)) customg)
-
-        ;; Anyone can have an accessor function.  This creates a function
-        ;; of the specified name, and also performs a `defsetf' if applicable
-        ;; so that users can `setf' the space returned by this function.
-        (if acces
-            (progn
-              (eieio--defmethod
-               acces (if (eq alloc :class) :static :primary) cname
-               `(lambda (this)
-                  ,(format
-                       "Retrieves the slot `%s' from an object of class `%s'"
-                       name cname)
-                  (if (slot-boundp this ',name)
-                      (eieio-oref this ',name)
-                            ;; Else - Some error?  nil?
-                            nil)))
-
-              (if (fboundp 'gv-define-setter)
-                  ;; FIXME: We should move more of eieio-defclass into the
-                  ;; defclass macro so we don't have to use `eval' and require
-                  ;; `gv' at run-time.
-                  (eval `(gv-define-setter ,acces (eieio--store eieio--object)
-                           (list 'eieio-oset eieio--object '',name
-                                 eieio--store)))
-                ;; Provide a setf method.  It would be cleaner to use
-                ;; defsetf, but that would require CL at runtime.
-                (put acces 'setf-method
-                     `(lambda (widget)
-                        (let* ((--widget-sym-- (make-symbol "--widget--"))
-                               (--store-sym-- (make-symbol "--store--")))
-                          (list
-                           (list --widget-sym--)
-                           (list widget)
-                           (list --store-sym--)
-                           (list 'eieio-oset --widget-sym-- '',name
-                                 --store-sym--)
-                           (list 'getfoo --widget-sym--))))))))
-
-        ;; If a writer is defined, then create a generic method of that
-        ;; name whose purpose is to set the value of the slot.
-        (if writer
-            (eieio--defmethod
-             writer nil cname
-             `(lambda (this value)
-                ,(format "Set the slot `%s' of an object of class `%s'"
-                              name cname)
-                (setf (slot-value this ',name) value))))
-        ;; If a reader is defined, then create a generic method
-        ;; of that name whose purpose is to access this slot value.
-        (if reader
-            (eieio--defmethod
-             reader nil cname
-             `(lambda (this)
-                ,(format "Access the slot `%s' from object of class `%s'"
-                              name cname)
-                (slot-value this ',name))))
-        )
-      (setq slots (cdr slots)))
-
-    ;; Now that everything has been loaded up, all our lists are backwards!
-    ;; Fix that up now.
-    (setf (eieio--class-public-a newc) (nreverse (eieio--class-public-a newc)))
-    (setf (eieio--class-public-d newc) (nreverse (eieio--class-public-d newc)))
-    (setf (eieio--class-public-doc newc) (nreverse (eieio--class-public-doc newc)))
-    (setf (eieio--class-public-type newc)
-          (apply 'vector (nreverse (eieio--class-public-type newc))))
-    (setf (eieio--class-public-custom newc) (nreverse (eieio--class-public-custom newc)))
-    (setf (eieio--class-public-custom-label newc) (nreverse (eieio--class-public-custom-label newc)))
-    (setf (eieio--class-public-custom-group newc) (nreverse (eieio--class-public-custom-group newc)))
-    (setf (eieio--class-public-printer newc) (nreverse (eieio--class-public-printer newc)))
-    (setf (eieio--class-protection newc) (nreverse (eieio--class-protection newc)))
-    (setf (eieio--class-initarg-tuples newc) (nreverse (eieio--class-initarg-tuples newc)))
-
-    ;; The storage for class-class-allocation-type needs to be turned into
-    ;; a vector now.
-    (setf (eieio--class-class-allocation-type newc)
-          (apply 'vector (eieio--class-class-allocation-type newc)))
-
-    ;; Also, take class allocated values, and vectorize them for speed.
-    (setf (eieio--class-class-allocation-values newc)
-          (apply 'vector (eieio--class-class-allocation-values newc)))
-
-    ;; Attach slot symbols into an obarray, and store the index of
-    ;; this slot as the variable slot in this new symbol.  We need to
-    ;; know about primes, because obarrays are best set in vectors of
-    ;; prime number length, and we also need to make our vector small
-    ;; to save space, and also optimal for the number of items we have.
-    (let* ((cnt 0)
-           (pubsyms (eieio--class-public-a newc))
-           (prots (eieio--class-protection newc))
-           (l (length pubsyms))
-           (vl (let ((primes '( 3 5 7 11 13 17 19 23 29 31 37 41 43 47
-                                  53 59 61 67 71 73 79 83 89 97 101 )))
-                 (while (and primes (< (car primes) l))
-                   (setq primes (cdr primes)))
-                 (car primes)))
-           (oa (make-vector vl 0))
-           (newsym))
-      (while pubsyms
-        (setq newsym (intern (symbol-name (car pubsyms)) oa))
-        (set newsym cnt)
-        (setq cnt (1+ cnt))
-        (if (car prots) (put newsym 'protection (car prots)))
-        (setq pubsyms (cdr pubsyms)
-              prots (cdr prots)))
-      (setf (eieio--class-symbol-obarray newc) oa)
-      )
-
-    ;; Create the constructor function
-    (if (class-option-assoc options :abstract)
-        ;; Abstract classes cannot be instantiated.  Say so.
-        (let ((abs (class-option-assoc options :abstract)))
-          (if (not (stringp abs))
-              (setq abs (format "Class %s is abstract" cname)))
-          (fset cname
-                `(lambda (&rest stuff)
-                   ,(format "You cannot create a new object of type %s" cname)
-                   (error ,abs))))
-
-      ;; Non-abstract classes need a constructor.
-      (fset cname
-            `(lambda (newname &rest slots)
-               ,(format "Create a new object with name NAME of class type %s" cname)
-               (apply 'constructor ,cname newname slots)))
-      )
-
-    ;; Set up a specialized doc string.
-    ;; Use stored value since it is calculated in a non-trivial way
-    (put cname 'variable-documentation
-         (class-option-assoc options :documentation))
-
-    ;; Save the file location where this class is defined.
-    (let ((fname (if load-in-progress
-                     load-file-name
-                   buffer-file-name))
-          loc)
-      (when fname
-        (when (string-match "\\.elc\\'" fname)
-          (setq fname (substring fname 0 (1- (length fname)))))
-        (put cname 'class-location fname)))
-
-    ;; We have a list of custom groups.  Store them into the options.
-    (let ((g (class-option-assoc options :custom-groups)))
-      (mapc (lambda (cg) (add-to-list 'g cg)) groups)
-      (if (memq :custom-groups options)
-          (setcar (cdr (memq :custom-groups options)) g)
-        (setq options (cons :custom-groups (cons g options)))))
-
-    ;; Set up the options we have collected.
-    (setf (eieio--class-options newc) options)
-
-    ;; if this is a superclass, clear out parent (which was set to the
-    ;; default superclass eieio-default-superclass)
-    (if clearparent (setf (eieio--class-parent newc) nil))
-
-    ;; Create the cached default object.
-    (let ((cache (make-vector (+ (length (eieio--class-public-a newc)) 3)
-                              nil)))
-      (aset cache 0 'object)
-      (setf (eieio--object-class cache) cname)
-      (setf (eieio--object-name cache) 'default-cache-object)
-      (let ((eieio-skip-typecheck t))
-        ;; All type-checking has been done to our satisfaction
-        ;; before this call.  Don't waste our time in this call..
-        (eieio-set-defaults cache t))
-      (setf (eieio--class-default-object-cache newc) cache))
-
-    ;; Return our new class object
-    ;; newc
-    cname
-    ))
+  `(eieio-defclass ',name ',superclass ',slots ',options-and-doc))
 
-(defun eieio-perform-slot-validation-for-default (slot spec value skipnil)
-  "For SLOT, signal if SPEC does not match VALUE.
-If SKIPNIL is non-nil, then if VALUE is nil return t instead."
-  (if (and (not (eieio-eval-default-p value))
-           (not eieio-skip-typecheck)
-           (not (and skipnil (null value)))
-           (not (eieio-perform-slot-validation spec value)))
-      (signal 'invalid-slot-type (list slot spec value))))
-
-(defun eieio-add-new-slot (newc a d doc type cust label custg print prot init alloc
-                                 &optional defaultoverride skipnil)
-  "Add into NEWC attribute A.
-If A already exists in NEWC, then do nothing.  If it doesn't exist,
-then also add in D (default), DOC, TYPE, CUST, LABEL, CUSTG, PRINT, PROT, and INIT arg.
-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.
-Optional argument SKIPNIL indicates if type checking should be skipped
-if default value is nil."
-  ;; Make sure we duplicate those items that are sequences.
-  (condition-case nil
-      (if (sequencep d) (setq d (copy-sequence d)))
-    ;; This copy can fail on a cons cell with a non-cons in the cdr.  Let's skip it if it doesn't work.
-    (error nil))
-  (if (sequencep type) (setq type (copy-sequence type)))
-  (if (sequencep cust) (setq cust (copy-sequence cust)))
-  (if (sequencep custg) (setq custg (copy-sequence custg)))
-
-  ;; To prevent override information w/out specification of storage,
-  ;; we need to do this little hack.
-  (if (member a (eieio--class-class-allocation-a newc)) (setq alloc ':class))
-
-  (if (or (not alloc) (and (symbolp alloc) (eq alloc ':instance)))
-      ;; In this case, we modify the INSTANCE version of a given slot.
-
-      (progn
-
-        ;; Only add this element if it is so-far unique
-        (if (not (member a (eieio--class-public-a newc)))
-            (progn
-              (eieio-perform-slot-validation-for-default a type d skipnil)
-              (setf (eieio--class-public-a newc) (cons a (eieio--class-public-a newc)))
-              (setf (eieio--class-public-d newc) (cons d (eieio--class-public-d newc)))
-              (setf (eieio--class-public-doc newc) (cons doc (eieio--class-public-doc newc)))
-              (setf (eieio--class-public-type newc) (cons type (eieio--class-public-type newc)))
-              (setf (eieio--class-public-custom newc) (cons cust (eieio--class-public-custom newc)))
-              (setf (eieio--class-public-custom-label newc) (cons label (eieio--class-public-custom-label newc)))
-              (setf (eieio--class-public-custom-group newc) (cons custg (eieio--class-public-custom-group newc)))
-              (setf (eieio--class-public-printer newc) (cons print (eieio--class-public-printer newc)))
-              (setf (eieio--class-protection newc) (cons prot (eieio--class-protection newc)))
-              (setf (eieio--class-initarg-tuples newc) (cons (cons init a) (eieio--class-initarg-tuples newc)))
-              )
-          ;; When defaultoverride is true, we are usually adding new local
-          ;; attributes which must override the default value of any slot
-          ;; passed in by one of the parent classes.
-          (when defaultoverride
-            ;; There is a match, and we must override the old value.
-            (let* ((ca (eieio--class-public-a newc))
-                   (np (member a ca))
-                   (num (- (length ca) (length np)))
-                   (dp (if np (nthcdr num (eieio--class-public-d newc))
-                         nil))
-                   (tp (if np (nth num (eieio--class-public-type newc))))
-                   )
-              (if (not np)
-                  (error "EIEIO internal error overriding default value for %s"
-                         a)
-                ;; If type is passed in, is it the same?
-                (if (not (eq type t))
-                    (if (not (equal type tp))
-                        (error
-                         "Child slot type `%s' does not match inherited type `%s' for `%s'"
-                         type tp a)))
-                ;; If we have a repeat, only update the initarg...
-                (unless (eq d eieio-unbound)
-                  (eieio-perform-slot-validation-for-default a tp d skipnil)
-                  (setcar dp d))
-                ;; If we have a new initarg, check for it.
-                (when init
-                  (let* ((inits (eieio--class-initarg-tuples newc))
-                         (inita (rassq a inits)))
-                    ;; Replace the CAR of the associate INITA.
-                    ;;(message "Initarg: %S replace %s" inita init)
-                    (setcar inita init)
-                    ))
-
-                ;; PLN Tue Jun 26 11:57:06 2007 : The protection is
-                ;; checked and SHOULD match the superclass
-                ;; protection. Otherwise an error is thrown. However
-                ;; I wonder if a more flexible schedule might be
-                ;; implemented.
-                ;;
-                ;; EML - We used to have (if prot... here,
-                ;;       but a prot of 'nil means public.
-                ;;
-                (let ((super-prot (nth num (eieio--class-protection newc)))
-                      )
-                  (if (not (eq prot super-prot))
-                      (error "Child slot protection `%s' does not match inherited protection `%s' for `%s'"
-                             prot super-prot a)))
-                ;; End original PLN
-
-                ;; PLN Tue Jun 26 11:57:06 2007 :
-                ;; Do a non redundant combination of ancient custom
-                ;; groups and new ones.
-                (when custg
-                  (let* ((groups
-                          (nthcdr num (eieio--class-public-custom-group newc)))
-                         (list1 (car groups))
-                         (list2 (if (listp custg) custg (list custg))))
-                    (if (< (length list1) (length list2))
-                        (setq list1 (prog1 list2 (setq list2 list1))))
-                    (dolist (elt list2)
-                      (unless (memq elt list1)
-                        (push elt list1)))
-                    (setcar groups list1)))
-                ;;  End PLN
-
-                ;;  PLN Mon Jun 25 22:44:34 2007 : If a new cust is
-                ;;  set, simply replaces the old one.
-                (when cust
-                  ;; (message "Custom type redefined to %s" cust)
-                  (setcar (nthcdr num (eieio--class-public-custom newc)) cust))
-
-                ;; If a new label is specified, it simply replaces
-                ;; the old one.
-                (when label
-                  ;; (message "Custom label redefined to %s" label)
-                  (setcar (nthcdr num (eieio--class-public-custom-label newc)) label))
-                ;;  End PLN
-
-                ;; PLN Sat Jun 30 17:24:42 2007 : when a new
-                ;; doc is specified, simply replaces the old one.
-                (when doc
-                  ;;(message "Documentation redefined to %s" doc)
-                  (setcar (nthcdr num (eieio--class-public-doc newc))
-                          doc))
-                ;; End PLN
-
-                ;; If a new printer is specified, it simply replaces
-                ;; the old one.
-                (when print
-                  ;; (message "printer redefined to %s" print)
-                  (setcar (nthcdr num (eieio--class-public-printer newc)) print))
-
-                )))
-          ))
-
-    ;; CLASS ALLOCATED SLOTS
-    (let ((value (eieio-default-eval-maybe d)))
-      (if (not (member a (eieio--class-class-allocation-a newc)))
-          (progn
-            (eieio-perform-slot-validation-for-default a type value skipnil)
-            ;; Here we have found a :class version of a slot.  This
-            ;; requires a very different approach.
-            (setf (eieio--class-class-allocation-a newc) (cons a (eieio--class-class-allocation-a newc)))
-            (setf (eieio--class-class-allocation-doc newc) (cons doc (eieio--class-class-allocation-doc newc)))
-            (setf (eieio--class-class-allocation-type newc) (cons type (eieio--class-class-allocation-type newc)))
-            (setf (eieio--class-class-allocation-custom newc) (cons cust (eieio--class-class-allocation-custom newc)))
-            (setf (eieio--class-class-allocation-custom-label newc) (cons label (eieio--class-class-allocation-custom-label newc)))
-            (setf (eieio--class-class-allocation-custom-group newc) (cons custg (eieio--class-class-allocation-custom-group newc)))
-            (setf (eieio--class-class-allocation-protection newc) (cons prot (eieio--class-class-allocation-protection newc)))
-            ;; Default value is stored in the 'values section, since new objects
-            ;; can't initialize from this element.
-            (setf (eieio--class-class-allocation-values newc) (cons value (eieio--class-class-allocation-values newc))))
-        (when defaultoverride
-          ;; There is a match, and we must override the old value.
-          (let* ((ca (eieio--class-class-allocation-a newc))
-                 (np (member a ca))
-                 (num (- (length ca) (length np)))
-                 (dp (if np
-                         (nthcdr num
-                                 (eieio--class-class-allocation-values newc))
-                       nil))
-                 (tp (if np (nth num (eieio--class-class-allocation-type newc))
-                       nil)))
-            (if (not np)
-                (error "EIEIO internal error overriding default value for %s"
-                       a)
-              ;; If type is passed in, is it the same?
-              (if (not (eq type t))
-                  (if (not (equal type tp))
-                      (error
-                       "Child slot type `%s' does not match inherited type `%s' for `%s'"
-                       type tp a)))
-              ;; EML - Note: the only reason to override a class bound slot
-              ;;       is to change the default, so allow unbound in.
-
-              ;; If we have a repeat, only update the value...
-              (eieio-perform-slot-validation-for-default a tp value skipnil)
-              (setcar dp value))
-
-            ;; PLN Tue Jun 26 11:57:06 2007 : The protection is
-            ;; checked and SHOULD match the superclass
-            ;; protection. Otherwise an error is thrown. However
-            ;; I wonder if a more flexible schedule might be
-            ;; implemented.
-            (let ((super-prot
-                   (car (nthcdr num (eieio--class-class-allocation-protection newc)))))
-              (if (not (eq prot super-prot))
-                  (error "Child slot protection `%s' does not match inherited protection `%s' for `%s'"
-                         prot super-prot a)))
-            ;; Do a non redundant combination of ancient custom groups
-            ;; and new ones.
-            (when custg
-              (let* ((groups
-                      (nthcdr num (eieio--class-class-allocation-custom-group newc)))
-                     (list1 (car groups))
-                     (list2 (if (listp custg) custg (list custg))))
-                (if (< (length list1) (length list2))
-                    (setq list1 (prog1 list2 (setq list2 list1))))
-                (dolist (elt list2)
-                  (unless (memq elt list1)
-                    (push elt list1)))
-                (setcar groups list1)))
-
-            ;; PLN Sat Jun 30 17:24:42 2007 : when a new
-            ;; doc is specified, simply replaces the old one.
-            (when doc
-              ;;(message "Documentation redefined to %s" doc)
-              (setcar (nthcdr num (eieio--class-class-allocation-doc newc))
-                      doc))
-            ;; End PLN
-
-            ;; If a new printer is specified, it simply replaces
-            ;; the old one.
-            (when print
-              ;; (message "printer redefined to %s" print)
-              (setcar (nthcdr num (eieio--class-class-allocation-printer newc)) print))
-
-            ))
-        ))
-    ))
-
-(defun eieio-copy-parents-into-subclass (newc parents)
-  "Copy into NEWC the slots of PARENTS.
-Follow the rules of not overwriting early parents when applying to
-the new child class."
-  (let ((ps (eieio--class-parent newc))
-        (sn (class-option-assoc (eieio--class-options newc)
-                                ':allow-nil-initform)))
-    (while ps
-      ;; First, duplicate all the slots of the parent.
-      (let ((pcv (class-v (car ps))))
-        (let ((pa (eieio--class-public-a pcv))
-              (pd (eieio--class-public-d pcv))
-              (pdoc (eieio--class-public-doc pcv))
-              (ptype (eieio--class-public-type pcv))
-              (pcust (eieio--class-public-custom pcv))
-              (plabel (eieio--class-public-custom-label pcv))
-              (pcustg (eieio--class-public-custom-group pcv))
-              (printer (eieio--class-public-printer pcv))
-              (pprot (eieio--class-protection pcv))
-              (pinit (eieio--class-initarg-tuples pcv))
-              (i 0))
-          (while pa
-            (eieio-add-new-slot newc
-                                 (car pa) (car pd) (car pdoc) (aref ptype i)
-                                 (car pcust) (car plabel) (car pcustg)
-                                 (car printer)
-                                 (car pprot) (car-safe (car pinit)) nil nil sn)
-            ;; Increment each value.
-            (setq pa (cdr pa)
-                  pd (cdr pd)
-                  pdoc (cdr pdoc)
-                  i (1+ i)
-                  pcust (cdr pcust)
-                  plabel (cdr plabel)
-                  pcustg (cdr pcustg)
-                  printer (cdr printer)
-                  pprot (cdr pprot)
-                  pinit (cdr pinit))
-            )) ;; while/let
-        ;; Now duplicate all the class alloc slots.
-        (let ((pa (eieio--class-class-allocation-a pcv))
-              (pdoc (eieio--class-class-allocation-doc pcv))
-              (ptype (eieio--class-class-allocation-type pcv))
-              (pcust (eieio--class-class-allocation-custom pcv))
-              (plabel (eieio--class-class-allocation-custom-label pcv))
-              (pcustg (eieio--class-class-allocation-custom-group pcv))
-              (printer (eieio--class-class-allocation-printer pcv))
-              (pprot (eieio--class-class-allocation-protection pcv))
-              (pval (eieio--class-class-allocation-values pcv))
-              (i 0))
-          (while pa
-            (eieio-add-new-slot newc
-                                 (car pa) (aref pval i) (car pdoc) (aref ptype i)
-                                 (car pcust) (car plabel) (car pcustg)
-                                 (car printer)
-                                 (car pprot) nil ':class sn)
-            ;; Increment each value.
-            (setq pa (cdr pa)
-                  pdoc (cdr pdoc)
-                  pcust (cdr pcust)
-                  plabel (cdr plabel)
-                  pcustg (cdr pcustg)
-                  printer (cdr printer)
-                  pprot (cdr pprot)
-                  i (1+ i))
-            ))) ;; while/let
-      ;; Loop over each parent class
-      (setq ps (cdr ps)))
-    ))
 
 ;;; CLOS style implementation of object creators.
 ;;
@@ -1187,17 +150,6 @@ a string."
 
 ;;; CLOS methods and generics
 ;;
-
-(put 'eieio--defalias 'byte-hunk-handler
-     #'byte-compile-file-form-defalias) ;;(get 'defalias 'byte-hunk-handler)
-(defun eieio--defalias (name body)
-  "Like `defalias', but with less side-effects.
-More specifically, it has no side-effects at all when the new function
-definition is the same (`eq') as the old one."
-  (unless (and (fboundp name)
-               (eq (symbol-function name) body))
-    (defalias name body)))
-
 (defmacro defgeneric (method args &optional doc-string)
   "Create a generic function METHOD.
 DOC-STRING is the base documentation for this class.  A generic
@@ -1209,115 +161,6 @@ top level documentation to a method."
   `(eieio--defalias ',method
                     (eieio--defgeneric-init-form ',method ,doc-string)))
 
-(defun eieio--defgeneric-init-form (method doc-string)
-  "Form to use for the initial definition of a generic."
-  (cond
-   ((or (not (fboundp method))
-        (eq 'autoload (car-safe (symbol-function method))))
-    ;; Make sure the method tables are installed.
-    (eieiomt-install method)
-    ;; Construct the actual body of this function.
-    (eieio-defgeneric-form method doc-string))
-   ((generic-p method) (symbol-function method))           ;Leave it as-is.
-   (t (error "You cannot create a generic/method over an existing symbol: %s"
-             method))))
-
-(defun eieio-defgeneric-form (method doc-string)
-  "The lambda form that would be used as the function defined on METHOD.
-All methods should call the same EIEIO function for dispatch.
-DOC-STRING is the documentation attached to METHOD."
-  `(lambda (&rest local-args)
-     ,doc-string
-     (eieio-generic-call (quote ,method) local-args)))
-
-(defsubst eieio-defgeneric-reset-generic-form (method)
-  "Setup METHOD to call the generic form."
-  (let ((doc-string (documentation method)))
-    (fset method (eieio-defgeneric-form method doc-string))))
-
-(defun eieio-defgeneric-form-primary-only (method doc-string)
-  "The lambda form that would be used as the function defined on METHOD.
-All methods should call the same EIEIO function for dispatch.
-DOC-STRING is the documentation attached to METHOD."
-  `(lambda (&rest local-args)
-     ,doc-string
-     (eieio-generic-call-primary-only (quote ,method) local-args)))
-
-(defsubst eieio-defgeneric-reset-generic-form-primary-only (method)
-  "Setup METHOD to call the generic form."
-  (let ((doc-string (documentation method)))
-    (fset method (eieio-defgeneric-form-primary-only method doc-string))))
-
-(defun eieio-defgeneric-form-primary-only-one (method doc-string
-                                                      class
-                                                      impl
-                                                      )
-  "The lambda form that would be used as the function defined on METHOD.
-All methods should call the same EIEIO function for dispatch.
-DOC-STRING is the documentation attached to METHOD.
-CLASS is the class symbol needed for private method access.
-IMPL is the symbol holding the method implementation."
-  ;; NOTE: I tried out byte compiling this little fcn.  Turns out it
-  ;; is faster to execute this for not byte-compiled.  ie, install this,
-  ;; then measure calls going through here.  I wonder why.
-  (require 'bytecomp)
-  (let ((byte-compile-warnings nil))
-    (byte-compile
-     `(lambda (&rest local-args)
-        ,doc-string
-        ;; This is a cool cheat.  Usually we need to look up in the
-        ;; method table to find out if there is a method or not.  We can
-        ;; instead make that determination at load time when there is
-        ;; only one method.  If the first arg is not a child of the class
-        ;; of that one implementation, then clearly, there is no method def.
-        (if (not (eieio-object-p (car local-args)))
-            ;; Not an object.  Just signal.
-            (signal 'no-method-definition
-                    (list ',method local-args))
-
-          ;; We do have an object.  Make sure it is the right type.
-          (if ,(if (eq class eieio-default-superclass)
-                   nil  ; default superclass means just an obj.  Already asked.
-                 `(not (child-of-class-p (eieio--object-class (car local-args))
-                                         ',class)))
-
-              ;; If not the right kind of object, call no applicable
-              (apply 'no-applicable-method (car local-args)
-                     ',method local-args)
-
-            ;; It is ok, do the call.
-            ;; Fill in inter-call variables then evaluate the method.
-            (let ((scoped-class ',class)
-                  (eieio-generic-call-next-method-list nil)
-                  (eieio-generic-call-key method-primary)
-                  (eieio-generic-call-methodname ',method)
-                  (eieio-generic-call-arglst local-args)
-                  )
-              ,(if (< emacs-major-version 24)
-                  `(apply ,(list 'quote impl) local-args)
-                `(apply #',impl local-args))
-              ;(,impl local-args)
-              )))))))
-
-(defsubst eieio-defgeneric-reset-generic-form-primary-only-one (method)
-  "Setup METHOD to call the generic form."
-  (let* ((doc-string (documentation method))
-         (M (get method 'eieio-method-tree))
-         (entry (car (aref M method-primary)))
-         )
-    (fset method (eieio-defgeneric-form-primary-only-one
-                  method doc-string
-                  (car entry)
-                  (cdr entry)
-                  ))))
-
-(defun eieio-unbind-method-implementations (method)
-  "Make the generic method METHOD have no implementations.
-It will leave the original generic function in place,
-but remove reference to all implementations of METHOD."
-  (put method 'eieio-method-tree nil)
-  (put method 'eieio-method-obarray nil))
-
 (defmacro defmethod (method &rest args)
   "Create a new METHOD through `defgeneric' with ARGS.
 
@@ -1358,139 +201,6 @@ Summary:
               (format "Generically created method `%s'." method)))
        (eieio--defmethod ',method ',key ',class #',code))))
 
-(defun eieio--defmethod (method kind argclass code)
-  "Work part of the `defmethod' macro defining METHOD with ARGS."
-  (let ((key
-         ;; Find optional keys.
-         (cond ((memq kind '(:BEFORE :before)) method-before)
-               ((memq kind '(:AFTER :after)) method-after)
-               ((memq kind '(:STATIC :static)) method-static)
-               ((memq kind '(:PRIMARY :primary nil)) method-primary)
-               ;; Primary key.
-               ;; (t method-primary)
-               (t (error "Unknown method kind %S" kind)))))
-    ;; Make sure there is a generic (when called from defclass).
-    (eieio--defalias
-     method (eieio--defgeneric-init-form
-             method (or (documentation code)
-                        (format "Generically created method `%s'." method))))
-    ;; Create symbol for property to bind to.  If the first arg is of
-    ;; the form (varname vartype) and `vartype' is a class, then
-    ;; that class will be the type symbol.  If not, then it will fall
-    ;; under the type `primary' which is a non-specific calling of the
-    ;; function.
-    (if argclass
-        (if (not (class-p argclass))
-            (error "Unknown class type %s in method parameters"
-                   argclass))
-      ;; Generics are higher.
-      (setq key (eieio-specialized-key-to-generic-key key)))
-    ;; Put this lambda into the symbol so we can find it.
-    (eieiomt-add method code key argclass)
-    )
-
-  (when eieio-optimize-primary-methods-flag
-    ;; Optimizing step:
-    ;;
-    ;; If this method, after this setup, only has primary methods, then
-    ;; we can setup the generic that way.
-    (if (generic-primary-only-p method)
-        ;; If there is only one primary method, then we can go one more
-        ;; optimization step.
-        (if (generic-primary-only-one-p method)
-            (eieio-defgeneric-reset-generic-form-primary-only-one method)
-          (eieio-defgeneric-reset-generic-form-primary-only method))
-      (eieio-defgeneric-reset-generic-form method)))
-
-  method)
-
-;;; Slot type validation
-
-;; This is a hideous hack for replacing `typep' from cl-macs, to avoid
-;; requiring the CL library at run-time.  It can be eliminated if/when
-;; `typep' is merged into Emacs core.
-(defun eieio--typep (val type)
-  (if (symbolp type)
-      (cond ((get type 'cl-deftype-handler)
-             (eieio--typep val (funcall (get type 'cl-deftype-handler))))
-            ((eq type t) t)
-            ((eq type 'null)   (null val))
-            ((eq type 'atom)   (atom val))
-            ((eq type 'float)  (and (numberp val) (not (integerp val))))
-            ((eq type 'real)   (numberp val))
-            ((eq type 'fixnum) (integerp val))
-            ((memq type '(character string-char)) (characterp val))
-            (t
-             (let* ((name (symbol-name type))
-                    (namep (intern (concat name "p"))))
-               (if (fboundp namep)
-                   (funcall `(lambda () (,namep val)))
-                 (funcall `(lambda ()
-                             (,(intern (concat name "-p")) val)))))))
-    (cond ((get (car type) 'cl-deftype-handler)
-           (eieio--typep val (apply (get (car type) 'cl-deftype-handler)
-                                    (cdr type))))
-          ((memq (car type) '(integer float real number))
-           (and (eieio--typep val (car type))
-                (or (memq (cadr type) '(* nil))
-                    (if (consp (cadr type))
-                        (> val (car (cadr type)))
-                      (>= val (cadr type))))
-                (or (memq (caddr type) '(* nil))
-                    (if (consp (car (cddr type)))
-                        (< val (caar (cddr type)))
-                      (<= val (car (cddr type)))))))
-          ((memq (car type) '(and or not))
-           (eval (cons (car type)
-                       (mapcar (lambda (x)
-                                 `(eieio--typep (quote ,val) (quote ,x)))
-                               (cdr type)))))
-          ((memq (car type) '(member member*))
-           (memql val (cdr type)))
-          ((eq (car type) 'satisfies)
-           (funcall `(lambda () (,(cadr type) val))))
-          (t (error "Bad type spec: %s" type)))))
-
-(defun eieio-perform-slot-validation (spec value)
-  "Return non-nil if SPEC does not match VALUE."
-  (or (eq spec t)                       ; t always passes
-      (eq value eieio-unbound)          ; unbound always passes
-      (eieio--typep value spec)))
-
-(defun eieio-validate-slot-value (class slot-idx value slot)
-  "Make sure that for CLASS referencing SLOT-IDX, VALUE is valid.
-Checks the :type specifier.
-SLOT is the slot that is being checked, and is only used when throwing
-an error."
-  (if eieio-skip-typecheck
-      nil
-    ;; Trim off object IDX junk added in for the object index.
-    (setq slot-idx (- slot-idx 3))
-    (let ((st (aref (eieio--class-public-type (class-v class)) slot-idx)))
-      (if (not (eieio-perform-slot-validation st value))
-          (signal 'invalid-slot-type (list class slot st value))))))
-
-(defun eieio-validate-class-slot-value (class slot-idx value slot)
-  "Make sure that for CLASS referencing SLOT-IDX, VALUE is valid.
-Checks the :type specifier.
-SLOT is the slot that is being checked, and is only used when throwing
-an error."
-  (if eieio-skip-typecheck
-      nil
-    (let ((st (aref (eieio--class-class-allocation-type (class-v class))
-                    slot-idx)))
-      (if (not (eieio-perform-slot-validation st value))
-          (signal 'invalid-slot-type (list class slot st value))))))
-
-(defun eieio-barf-if-slot-unbound (value instance slotname fn)
-  "Throw a signal if VALUE is a representation of an UNBOUND slot.
-INSTANCE is the object being referenced.  SLOTNAME is the offending
-slot.  If the slot is ok, return VALUE.
-Argument FN is the function calling this verifier."
-  (if (and (eq value eieio-unbound) (not eieio-skip-typecheck))
-      (slot-unbound instance (eieio-object-class instance) slotname fn)
-    value))
-
 ;;; Get/Set slots in an object.
 ;;
 (defmacro oref (obj slot)
@@ -1499,28 +209,6 @@ Slot is the name of the slot when created by `defclass' or the label
 created by the :initarg tag."
   `(eieio-oref ,obj (quote ,slot)))
 
-(defun eieio-oref (obj slot)
-  "Return the value in OBJ at SLOT in the object vector."
-  (eieio--check-type (or eieio-object-p class-p) obj)
-  (eieio--check-type symbolp slot)
-  (if (class-p obj) (eieio-class-un-autoload obj))
-  (let* ((class (if (class-p obj) obj (eieio--object-class obj)))
-         (c (eieio-slot-name-index class obj slot)))
-    (if (not c)
-        ;; It might be missing because it is a :class allocated slot.
-        ;; Let's check that info out.
-        (if (setq c (eieio-class-slot-name-index class slot))
-            ;; Oref that slot.
-            (aref (eieio--class-class-allocation-values (class-v class)) c)
-          ;; The slot-missing method is a cool way of allowing an object author
-          ;; to intercept missing slot definitions.  Since it is also the LAST
-          ;; thing called in this fn, its return value would be retrieved.
-          (slot-missing obj slot 'oref)
-          ;;(signal 'invalid-slot-name (list (eieio-object-name obj) slot))
-          )
-      (eieio--check-type eieio-object-p obj)
-      (eieio-barf-if-slot-unbound (aref obj c) obj slot 'oref))))
-
 (defalias 'slot-value 'eieio-oref)
 (defalias 'set-slot-value 'eieio-oset)
 
@@ -1531,45 +219,6 @@ tag.  SLOT can be the slot name, or the tag specified by the :initarg
 tag in the `defclass' call."
   `(eieio-oref-default ,obj (quote ,slot)))
 
-(defun eieio-oref-default (obj slot)
-  "Do the work for the macro `oref-default' with similar parameters.
-Fills in OBJ's SLOT with its default value."
-  (eieio--check-type (or eieio-object-p class-p) obj)
-  (eieio--check-type symbolp slot)
-  (let* ((cl (if (eieio-object-p obj) (eieio--object-class obj) obj))
-         (c (eieio-slot-name-index cl obj slot)))
-    (if (not c)
-        ;; It might be missing because it is a :class allocated slot.
-        ;; Let's check that info out.
-        (if (setq c
-                  (eieio-class-slot-name-index cl slot))
-            ;; Oref that slot.
-            (aref (eieio--class-class-allocation-values (class-v cl))
-                  c)
-          (slot-missing obj slot 'oref-default)
-          ;;(signal 'invalid-slot-name (list (class-name cl) slot))
-          )
-      (eieio-barf-if-slot-unbound
-       (let ((val (nth (- c 3) (eieio--class-public-d (class-v cl)))))
-         (eieio-default-eval-maybe val))
-       obj cl 'oref-default))))
-
-(defsubst eieio-eval-default-p (val)
-  "Whether the default value VAL should be evaluated for use."
-  (and (consp val) (symbolp (car val)) (fboundp (car val))))
-
-(defun eieio-default-eval-maybe (val)
-  "Check VAL, and return what `oref-default' would provide."
-  (cond
-   ;; Is it a function call?  If so, evaluate it.
-   ((eieio-eval-default-p val)
-    (eval val))
-   ;;;; check for quoted things, and unquote them
-   ;;((and (consp val) (eq (car val) 'quote))
-   ;; (car (cdr val)))
-   ;; return it verbatim
-   (t val)))
-
 ;;; Handy CLOS macros
 ;;
 (defmacro with-slots (spec-list object &rest body)
@@ -1607,13 +256,6 @@ variable name of the same name as the slot."
 (define-obsolete-function-alias
   'object-class-fast #'eieio--object-class "24.4")
 
-(defun eieio-class-name (class) "Return a Lisp like symbol name for CLASS."
-  (eieio--check-type class-p class)
-  ;; I think this is supposed to return a symbol, but to me CLASS is a symbol,
-  ;; and I wanted a string.  Arg!
-  (format "#<class %s>" (symbol-name class)))
-(define-obsolete-function-alias 'class-name #'eieio-class-name "24.4")
-
 (defun eieio-object-name (obj &optional extra)
   "Return a Lisp like symbol string for object OBJ.
 If EXTRA, include that in the string returned to represent the symbol."
@@ -1650,10 +292,6 @@ If EXTRA, include that in the string returned to represent the symbol."
 (define-obsolete-function-alias
   'object-class-name 'eieio-object-class-name "24.4")
 
-(defmacro eieio-class-parents-fast (class)
-  "Return parent classes to CLASS with no check."
-  `(eieio--class-parent (class-v ,class)))
-
 (defun eieio-class-parents (class)
   "Return parent classes to CLASS.  (overload of variable).
 
@@ -1662,130 +300,14 @@ The CLOS function `class-direct-superclasses' is aliased to this function."
   (eieio-class-parents-fast class))
 (define-obsolete-function-alias 'class-parents #'eieio-class-parents "24.4")
 
-(defmacro eieio-class-children-fast (class) "Return child classes to CLASS with no check."
-  `(eieio--class-children (class-v ,class)))
-
 (defun eieio-class-children (class)
   "Return child classes to CLASS.
-
 The CLOS function `class-direct-subclasses' is aliased to this function."
   (eieio--check-type class-p class)
   (eieio-class-children-fast class))
 (define-obsolete-function-alias
   'class-children #'eieio-class-children "24.4")
 
-(defun eieio-c3-candidate (class remaining-inputs)
-  "Return CLASS if it can go in the result now, otherwise nil"
-  ;; Ensure CLASS is not in any position but the first in any of the
-  ;; element lists of REMAINING-INPUTS.
-  (and (not (let ((found nil))
-              (while (and remaining-inputs (not found))
-                (setq found (member class (cdr (car remaining-inputs)))
-                      remaining-inputs (cdr remaining-inputs)))
-              found))
-       class))
-
-(defun eieio-c3-merge-lists (reversed-partial-result remaining-inputs)
-  "Merge REVERSED-PARTIAL-RESULT REMAINING-INPUTS in a consistent order, if possible.
-If a consistent order does not exist, signal an error."
-  (if (let ((tail remaining-inputs)
-            (found nil))
-        (while (and tail (not found))
-          (setq found (car tail) tail (cdr tail)))
-        (not found))
-      ;; If all remaining inputs are empty lists, we are done.
-      (nreverse reversed-partial-result)
-    ;; Otherwise, we try to find the next element of the result. This
-    ;; is achieved by considering the first element of each
-    ;; (non-empty) input list and accepting a candidate if it is
-    ;; consistent with the rests of the input lists.
-    (let* ((found nil)
-           (tail remaining-inputs)
-           (next (progn
-                   (while (and tail (not found))
-                     (setq found (and (car tail)
-                                      (eieio-c3-candidate (caar tail)
-                                                          remaining-inputs))
-                           tail (cdr tail)))
-                   found)))
-      (if next
-          ;; The graph is consistent so far, add NEXT to result and
-          ;; merge input lists, dropping NEXT from their heads where
-          ;; applicable.
-          (eieio-c3-merge-lists
-           (cons next reversed-partial-result)
-           (mapcar (lambda (l) (if (eq (first l) next) (rest l) l))
-                   remaining-inputs))
-        ;; The graph is inconsistent, give up
-        (signal 'inconsistent-class-hierarchy (list remaining-inputs))))))
-
-(defun eieio-class-precedence-dfs (class)
-  "Return all parents of CLASS in depth-first order."
-  (let* ((parents (eieio-class-parents-fast class))
-         (classes (copy-sequence
-                   (apply #'append
-                          (list class)
-                          (or
-                           (mapcar
-                            (lambda (parent)
-                              (cons parent
-                                    (eieio-class-precedence-dfs parent)))
-                            parents)
-                           '((eieio-default-superclass))))))
-         (tail classes))
-    ;; Remove duplicates.
-    (while tail
-      (setcdr tail (delq (car tail) (cdr tail)))
-      (setq tail (cdr tail)))
-    classes))
-
-(defun eieio-class-precedence-bfs (class)
-  "Return all parents of CLASS in breadth-first order."
-  (let ((result)
-        (queue (or (eieio-class-parents-fast class)
-                   '(eieio-default-superclass))))
-    (while queue
-      (let ((head (pop queue)))
-        (unless (member head result)
-          (push head result)
-          (unless (eq head 'eieio-default-superclass)
-            (setq queue (append queue (or (eieio-class-parents-fast head)
-                                          '(eieio-default-superclass))))))))
-    (cons class (nreverse result)))
-  )
-
-(defun eieio-class-precedence-c3 (class)
-  "Return all parents of CLASS in c3 order."
-  (let ((parents (eieio-class-parents-fast class)))
-    (eieio-c3-merge-lists
-     (list class)
-     (append
-      (or
-       (mapcar
-        (lambda (x)
-          (eieio-class-precedence-c3 x))
-        parents)
-       '((eieio-default-superclass)))
-      (list parents))))
-  )
-
-(defun eieio-class-precedence-list (class)
-  "Return (transitively closed) list of parents of CLASS.
-The order, in which the parents are returned depends on the
-method invocation orders of the involved classes."
-  (if (or (null class) (eq class 'eieio-default-superclass))
-      nil
-    (case (class-method-invocation-order class)
-      (:depth-first
-       (eieio-class-precedence-dfs class))
-      (:breadth-first
-       (eieio-class-precedence-bfs class))
-      (:c3
-       (eieio-class-precedence-c3 class))))
-  )
-(define-obsolete-function-alias
-  'class-precedence-list 'eieio-class-precedence-list "24.4")
-
 ;; Official CLOS functions.
 (define-obsolete-function-alias
   'class-direct-superclasses #'eieio-class-parents "24.4")
@@ -1797,10 +319,6 @@ method invocation orders of the involved classes."
   `(car (eieio-class-parents ,class)))
 (define-obsolete-function-alias 'class-parent #'eieio-class-parent "24.4")
 
-(defmacro same-class-fast-p (obj class)
-  "Return t if OBJ is of class-type CLASS with no error checking."
-  `(eq (eieio--object-class ,obj) ,class))
-
 (defun same-class-p (obj class) "Return t if OBJ is of class-type CLASS."
   (eieio--check-type class-p class)
   (eieio--check-type eieio-object-p obj)
@@ -1848,29 +366,6 @@ SLOT is the slot name as specified in `defclass' or the tag created
 with in the :initarg slot.  VALUE can be any Lisp object."
   `(eieio-oset ,obj (quote ,slot) ,value))
 
-(defun eieio-oset (obj slot value)
-  "Do the work for the macro `oset'.
-Fills in OBJ's SLOT with VALUE."
-  (eieio--check-type eieio-object-p obj)
-  (eieio--check-type symbolp slot)
-  (let ((c (eieio-slot-name-index (eieio--object-class obj) obj slot)))
-    (if (not c)
-        ;; It might be missing because it is a :class allocated slot.
-        ;; Let's check that info out.
-        (if (setq c
-                  (eieio-class-slot-name-index (eieio--object-class obj) slot))
-            ;; Oset that slot.
-            (progn
-              (eieio-validate-class-slot-value (eieio--object-class obj) c value slot)
-              (aset (eieio--class-class-allocation-values (class-v (eieio--object-class obj)))
-                    c value))
-          ;; See oref for comment on `slot-missing'
-          (slot-missing obj slot 'oset value)
-          ;;(signal 'invalid-slot-name (list (eieio-object-name obj) slot))
-          )
-      (eieio-validate-slot-value (eieio--object-class obj) c value slot)
-      (aset obj c value))))
-
 (defmacro oset-default (class slot value)
   "Set the default slot in CLASS for SLOT to VALUE.
 The default value is usually set with the :initform tag during class
@@ -1878,32 +373,6 @@ creation.  This allows users to change the default behavior of classes
 after they are created."
   `(eieio-oset-default ,class (quote ,slot) ,value))
 
-(defun eieio-oset-default (class slot value)
-  "Do the work for the macro `oset-default'.
-Fills in the default value in CLASS' in SLOT with VALUE."
-  (eieio--check-type class-p class)
-  (eieio--check-type symbolp slot)
-  (let* ((scoped-class class)
-         (c (eieio-slot-name-index class nil slot)))
-    (if (not c)
-        ;; It might be missing because it is a :class allocated slot.
-        ;; Let's check that info out.
-        (if (setq c (eieio-class-slot-name-index class slot))
-            (progn
-              ;; Oref that slot.
-              (eieio-validate-class-slot-value class c value slot)
-              (aset (eieio--class-class-allocation-values (class-v class)) c
-                    value))
-          (signal 'invalid-slot-name (list (eieio-class-name class) slot)))
-      (eieio-validate-slot-value class c value slot)
-      ;; Set this into the storage for defaults.
-      (setcar (nthcdr (- c 3) (eieio--class-public-d (class-v class)))
-              value)
-      ;; Take the value, and put it into our cache object.
-      (eieio-oset (eieio--class-default-object-cache (class-v class))
-                  slot value)
-      )))
-
 ;;; CLOS queries into classes and slots
 ;;
 (defun slot-boundp (object slot)
@@ -2019,337 +488,9 @@ If SLOT is unbound, do nothing."
   (if (not (slot-boundp object slot))
       nil
     (eieio-oset object slot (delete item (eieio-oref object slot)))))
-
-;;; EIEIO internal search functions
-;;
-(defun eieio-slot-originating-class-p (start-class slot)
-  "Return non-nil if START-CLASS is the first class to define SLOT.
-This is for testing if `scoped-class' is the class that defines SLOT
-so that we can protect private slots."
-  (let ((par (eieio-class-parents start-class))
-        (ret t))
-    (if (not par)
-        t
-      (while (and par ret)
-        (if (intern-soft (symbol-name slot)
-                         (eieio--class-symbol-obarray (class-v (car par))))
-            (setq ret nil))
-        (setq par (cdr par)))
-      ret)))
-
-(defun eieio-slot-name-index (class obj slot)
-  "In CLASS for OBJ find the index of the named SLOT.
-The slot is a symbol which is installed in CLASS by the `defclass'
-call.  OBJ can be nil, but if it is an object, and the slot in question
-is protected, access will be allowed if OBJ is a child of the currently
-`scoped-class'.
-If SLOT is the value created with :initarg instead,
-reverse-lookup that name, and recurse with the associated slot value."
-  ;; Removed checks to outside this call
-  (let* ((fsym (intern-soft (symbol-name slot)
-                            (eieio--class-symbol-obarray (class-v class))))
-         (fsi (if (symbolp fsym) (symbol-value fsym) nil)))
-    (if (integerp fsi)
-        (cond
-         ((not (get fsym 'protection))
-          (+ 3 fsi))
-         ((and (eq (get fsym 'protection) 'protected)
-               (bound-and-true-p scoped-class)
-               (or (child-of-class-p class scoped-class)
-                   (and (eieio-object-p obj)
-                        (child-of-class-p class (eieio-object-class obj)))))
-          (+ 3 fsi))
-         ((and (eq (get fsym 'protection) 'private)
-               (or (and (bound-and-true-p scoped-class)
-                        (eieio-slot-originating-class-p scoped-class slot))
-                   eieio-initializing-object))
-          (+ 3 fsi))
-         (t nil))
-      (let ((fn (eieio-initarg-to-attribute class slot)))
-        (if fn (eieio-slot-name-index class obj fn) nil)))))
-
-(defun eieio-class-slot-name-index (class slot)
-  "In CLASS find the index of the named SLOT.
-The slot is a symbol which is installed in CLASS by the `defclass'
-call.  If SLOT is the value created with :initarg instead,
-reverse-lookup that name, and recurse with the associated slot value."
-  ;; This will happen less often, and with fewer slots.  Do this the
-  ;; storage cheap way.
-  (let* ((a (eieio--class-class-allocation-a (class-v class)))
-         (l1 (length a))
-         (af (memq slot a))
-         (l2 (length af)))
-    ;; Slot # is length of the total list, minus the remaining list of
-    ;; the found slot.
-    (if af (- l1 l2))))
-
-;;; CLOS generics internal function handling
-;;
-(defvar eieio-generic-call-methodname nil
-  "When using `call-next-method', provides a context on how to do it.")
-(defvar eieio-generic-call-arglst nil
-  "When using `call-next-method', provides a context for parameters.")
-(defvar eieio-generic-call-key nil
-  "When using `call-next-method', provides a context for the current key.
-Keys are a number representing :before, :primary, and :after methods.")
-(defvar eieio-generic-call-next-method-list nil
-  "When executing a PRIMARY or STATIC method, track the 'next-method'.
-During executions, the list is first generated, then as each next method
-is called, the next method is popped off the stack.")
-
-(define-obsolete-variable-alias 'eieio-pre-method-execution-hooks
-  'eieio-pre-method-execution-functions "24.3")
-(defvar eieio-pre-method-execution-functions nil
-  "Abnormal hook run just before an EIEIO method is executed.
-The hook function must accept one argument, the list of forms
-about to be executed.")
-
-(defun eieio-generic-call (method args)
-  "Call METHOD with ARGS.
-ARGS provides the context on which implementation to use.
-This should only be called from a generic function."
-  ;; We must expand our arguments first as they are always
-  ;; passed in as quoted symbols
-  (let ((newargs nil) (mclass nil)  (lambdas nil) (tlambdas nil) (keys nil)
-        (eieio-generic-call-methodname method)
-        (eieio-generic-call-arglst args)
-        (firstarg nil)
-        (primarymethodlist nil))
-    ;; get a copy
-    (setq newargs args
-          firstarg (car newargs))
-    ;; Is the class passed in autoloaded?
-    ;; Since class names are also constructors, they can be autoloaded
-    ;; via the autoload command.  Check for this, and load them in.
-    ;; It's ok if it doesn't turn out to be a class.  Probably want that
-    ;; function loaded anyway.
-    (if (and (symbolp firstarg)
-             (fboundp firstarg)
-             (listp (symbol-function firstarg))
-             (eq 'autoload (car (symbol-function firstarg))))
-        (load (nth 1 (symbol-function firstarg))))
-    ;; Determine the class to use.
-    (cond ((eieio-object-p firstarg)
-           (setq mclass (eieio--object-class firstarg)))
-          ((class-p firstarg)
-           (setq mclass firstarg))
-          )
-    ;; Make sure the class is a valid class
-    ;; mclass can be nil (meaning a generic for should be used.
-    ;; mclass cannot have a value that is not a class, however.
-    (when (and (not (null mclass)) (not (class-p mclass)))
-      (error "Cannot dispatch method %S on class %S"
-             method mclass)
-      )
-    ;; Now create a list in reverse order of all the calls we have
-    ;; make in order to successfully do this right.  Rules:
-    ;; 1) Only call generics if scoped-class is not defined
-    ;;    This prevents multiple calls in the case of recursion
-    ;; 2) Only call static if this is a static method.
-    ;; 3) Only call specifics if the definition allows for them.
-    ;; 4) Call in order based on :before, :primary, and :after
-    (when (eieio-object-p firstarg)
-      ;; Non-static calls do all this stuff.
-
-      ;; :after methods
-      (setq tlambdas
-            (if mclass
-                (eieiomt-method-list method method-after mclass)
-              (list (eieio-generic-form method method-after nil)))
-            ;;(or (and mclass (eieio-generic-form method method-after mclass))
-            ;;  (eieio-generic-form method method-after nil))
-            )
-      (setq lambdas (append tlambdas lambdas)
-            keys (append (make-list (length tlambdas) method-after) keys))
-
-      ;; :primary methods
-      (setq tlambdas
-            (or (and mclass (eieio-generic-form method method-primary mclass))
-                (eieio-generic-form method method-primary nil)))
-      (when tlambdas
-        (setq lambdas (cons tlambdas lambdas)
-              keys (cons method-primary keys)
-              primarymethodlist
-              (eieiomt-method-list method method-primary mclass)))
-
-      ;; :before methods
-      (setq tlambdas
-            (if mclass
-                (eieiomt-method-list method method-before mclass)
-              (list (eieio-generic-form method method-before nil)))
-            ;;(or (and mclass (eieio-generic-form method method-before mclass))
-            ;;  (eieio-generic-form method method-before nil))
-            )
-      (setq lambdas (append tlambdas lambdas)
-            keys (append (make-list (length tlambdas) method-before) keys))
-      )
-
-    (if mclass
-        ;; For the case of a class,
-        ;; if there were no methods found, then there could be :static methods.
-        (when (not lambdas)
-          (setq tlambdas
-                (eieio-generic-form method method-static mclass))
-          (setq lambdas (cons tlambdas lambdas)
-                keys (cons method-static keys)
-                primarymethodlist  ;; Re-use even with bad name here
-                (eieiomt-method-list method method-static mclass)))
-      ;; For the case of no class (ie - mclass == nil) then there may
-      ;; be a primary method.
-      (setq tlambdas
-            (eieio-generic-form method method-primary nil))
-      (when tlambdas
-        (setq lambdas (cons tlambdas lambdas)
-              keys (cons method-primary keys)
-              primarymethodlist
-              (eieiomt-method-list method method-primary nil)))
-      )
-
-    (run-hook-with-args 'eieio-pre-method-execution-functions
-                        primarymethodlist)
-
-    ;; Now loop through all occurrences forms which we must execute
-    ;; (which are happily sorted now) and execute them all!
-    (let ((rval nil) (lastval nil) (rvalever nil) (found nil))
-      (while lambdas
-        (if (car lambdas)
-            (let* ((scoped-class (cdr (car lambdas)))
-                   (eieio-generic-call-key (car keys))
-                   (has-return-val
-                    (or (= eieio-generic-call-key method-primary)
-                        (= eieio-generic-call-key method-static)))
-                   (eieio-generic-call-next-method-list
-                    ;; Use the cdr, as the first element is the fcn
-                    ;; we are calling right now.
-                    (when has-return-val (cdr primarymethodlist)))
-                   )
-              (setq found t)
-              ;;(setq rval (apply (car (car lambdas)) newargs))
-              (setq lastval (apply (car (car lambdas)) newargs))
-              (when has-return-val
-                (setq rval lastval
-                      rvalever t))
-              ))
-        (setq lambdas (cdr lambdas)
-              keys (cdr keys)))
-      (if (not found)
-          (if (eieio-object-p (car args))
-              (setq rval (apply 'no-applicable-method (car args) method args)
-                    rvalever t)
-            (signal
-             'no-method-definition
-             (list method args))))
-      ;; Right Here... it could be that lastval is returned when
-      ;; rvalever is nil.  Is that right?
-      rval)))
-
-(defun eieio-generic-call-primary-only (method args)
-  "Call METHOD with ARGS for methods with only :PRIMARY implementations.
-ARGS provides the context on which implementation to use.
-This should only be called from a generic function.
-
-This method is like `eieio-generic-call', but only
-implementations in the :PRIMARY slot are queried.  After many
-years of use, it appears that over 90% of methods in use
-have :PRIMARY implementations only.  We can therefore optimize
-for this common case to improve performance."
-  ;; We must expand our arguments first as they are always
-  ;; passed in as quoted symbols
-  (let ((newargs nil) (mclass nil)  (lambdas nil)
-        (eieio-generic-call-methodname method)
-        (eieio-generic-call-arglst args)
-        (firstarg nil)
-        (primarymethodlist nil)
-        )
-    ;; get a copy
-    (setq newargs args
-          firstarg (car newargs))
-
-    ;; Determine the class to use.
-    (cond ((eieio-object-p firstarg)
-           (setq mclass (eieio--object-class firstarg)))
-          ((not firstarg)
-           (error "Method %s called on nil" method))
-          ((not (eieio-object-p firstarg))
-           (error "Primary-only method %s called on something not an object" method))
-          (t
-           (error "EIEIO Error: Improperly classified method %s as primary only"
-                  method)
-          ))
-    ;; Make sure the class is a valid class
-    ;; mclass can be nil (meaning a generic for should be used.
-    ;; mclass cannot have a value that is not a class, however.
-    (when (null mclass)
-      (error "Cannot dispatch method %S on class %S" method mclass)
-      )
-
-    ;; :primary methods
-    (setq lambdas (eieio-generic-form method method-primary mclass))
-    (setq primarymethodlist  ;; Re-use even with bad name here
-          (eieiomt-method-list method method-primary mclass))
-
-    ;; Now loop through all occurrences forms which we must execute
-    ;; (which are happily sorted now) and execute them all!
-    (let* ((rval nil) (lastval nil) (rvalever nil)
-           (scoped-class (cdr lambdas))
-           (eieio-generic-call-key method-primary)
-           ;; Use the cdr, as the first element is the fcn
-           ;; we are calling right now.
-           (eieio-generic-call-next-method-list (cdr primarymethodlist))
-           )
-
-      (if (or (not lambdas) (not (car lambdas)))
-
-          ;; No methods found for this impl...
-          (if (eieio-object-p (car args))
-              (setq rval (apply 'no-applicable-method (car args) method args)
-                    rvalever t)
-            (signal
-             'no-method-definition
-             (list method args)))
-
-        ;; Do the regular implementation here.
-
-        (run-hook-with-args 'eieio-pre-method-execution-functions
-                            lambdas)
-
-        (setq lastval (apply (car lambdas) newargs))
-        (setq rval lastval
-              rvalever t)
-        )
 
-      ;; Right Here... it could be that lastval is returned when
-      ;; rvalever is nil.  Is that right?
-      rval)))
-
-(defun eieiomt-method-list (method key class)
-  "Return an alist list of methods lambdas.
-METHOD is the method name.
-KEY represents either :before, or :after methods.
-CLASS is the starting class to search from in the method tree.
-If CLASS is nil, then an empty list of methods should be returned."
-  ;; Note: eieiomt - the MT means MethodTree.  See more comments below
-  ;; for the rest of the eieiomt methods.
-
-  ;; Collect lambda expressions stored for the class and its parent
-  ;; classes.
-  (let (lambdas)
-    (dolist (ancestor (eieio-class-precedence-list class))
-      ;; Lookup the form to use for the PRIMARY object for the next level
-      (let ((tmpl (eieio-generic-form method key ancestor)))
-        (when (and tmpl
-                   (or (not lambdas)
-                       ;; This prevents duplicates coming out of the
-                       ;; class method optimizer.  Perhaps we should
-                       ;; just not optimize before/afters?
-                       (not (member tmpl lambdas))))
-          (push tmpl lambdas))))
-
-    ;; Return collected lambda. For :after methods, return in current
-    ;; order (most general class last); Otherwise, reverse order.
-    (if (eq key method-after)
-        lambdas
-      (nreverse lambdas))))
+;;;
+;; Method Calling Functions
 
 (defun next-method-p ()
   "Return non-nil if there is a next method.
@@ -2367,7 +508,7 @@ If REPLACEMENT-ARGS is non-nil, then use them instead of
 arguments passed in at the top level.
 
 Use `next-method-p' to find out if there is a next method to call."
-  (if (not (bound-and-true-p scoped-class))
+  (if (not (eieio--scoped-class))
       (error "`call-next-method' not called within a class specific method"))
   (if (and (/= eieio-generic-call-key method-primary)
            (/= eieio-generic-call-key method-static))
@@ -2381,231 +522,10 @@ Use `next-method-p' to find out if there is a next method to call."
       (let* ((eieio-generic-call-next-method-list
               (cdr eieio-generic-call-next-method-list))
              (eieio-generic-call-arglst newargs)
-             (scoped-class (cdr next))
              (fcn (car next))
              )
-        (apply fcn newargs)
-        ))))
-
-;;;
-;; eieio-method-tree : eieiomt-
-;;
-;; Stored as eieio-method-tree in property list of a generic method
-;;
-;; (eieio-method-tree . [BEFORE PRIMARY AFTER
-;;                       genericBEFORE genericPRIMARY genericAFTER])
-;; and
-;; (eieio-method-obarray . [BEFORE PRIMARY AFTER
-;;                          genericBEFORE genericPRIMARY genericAFTER])
-;;    where the association is a vector.
-;;    (aref 0  -- all static methods.
-;;    (aref 1  -- all methods classified as :before
-;;    (aref 2  -- all methods classified as :primary
-;;    (aref 3  -- all methods classified as :after
-;;    (aref 4  -- a generic classified as :before
-;;    (aref 5  -- a generic classified as :primary
-;;    (aref 6  -- a generic classified as :after
-;;
-(defvar eieiomt-optimizing-obarray nil
-  "While mapping atoms, this contain the obarray being optimized.")
-
-(defun eieiomt-install (method-name)
-  "Install the method tree, and obarray onto METHOD-NAME.
-Do not do the work if they already exist."
-  (let ((emtv (get method-name 'eieio-method-tree))
-        (emto (get method-name 'eieio-method-obarray)))
-    (if (or (not emtv) (not emto))
-        (progn
-          (setq emtv (put method-name 'eieio-method-tree
-                          (make-vector method-num-slots nil))
-                emto (put method-name 'eieio-method-obarray
-                          (make-vector method-num-slots nil)))
-          (aset emto 0 (make-vector 11 0))
-          (aset emto 1 (make-vector 11 0))
-          (aset emto 2 (make-vector 41 0))
-          (aset emto 3 (make-vector 11 0))
-          ))))
-
-(defun eieiomt-add (method-name method key class)
-  "Add to METHOD-NAME the forms METHOD in a call position KEY for CLASS.
-METHOD-NAME is the name created by a call to `defgeneric'.
-METHOD are the forms for a given implementation.
-KEY is an integer (see comment in eieio.el near this function) which
-is associated with the :static :before :primary and :after tags.
-It also indicates if CLASS is defined or not.
-CLASS is the class this method is associated with."
-  (if (or (> key method-num-slots) (< key 0))
-      (error "eieiomt-add: method key error!"))
-  (let ((emtv (get method-name 'eieio-method-tree))
-        (emto (get method-name 'eieio-method-obarray)))
-    ;; Make sure the method tables are available.
-    (if (or (not emtv) (not emto))
-        (error "Programmer error: eieiomt-add"))
-    ;; only add new cells on if it doesn't already exist!
-    (if (assq class (aref emtv key))
-        (setcdr (assq class (aref emtv key)) method)
-      (aset emtv key (cons (cons class method) (aref emtv key))))
-    ;; Add function definition into newly created symbol, and store
-    ;; said symbol in the correct obarray, otherwise use the
-    ;; other array to keep this stuff
-    (if (< key method-num-lists)
-        (let ((nsym (intern (symbol-name class) (aref emto key))))
-          (fset nsym method)))
-    ;; Save the defmethod file location in a symbol property.
-    (let ((fname (if load-in-progress
-                     load-file-name
-                   buffer-file-name))
-          loc)
-      (when fname
-        (when (string-match "\\.elc$" fname)
-          (setq fname (substring fname 0 (1- (length fname)))))
-        (setq loc (get method-name 'method-locations))
-        (add-to-list 'loc
-                     (list class fname))
-        (put method-name 'method-locations loc)))
-    ;; Now optimize the entire obarray
-    (if (< key method-num-lists)
-        (let ((eieiomt-optimizing-obarray (aref emto key)))
-          ;; @todo - Is this overkill?  Should we just clear the symbol?
-          (mapatoms 'eieiomt-sym-optimize eieiomt-optimizing-obarray)))
-    ))
-
-(defun eieiomt-next (class)
-  "Return the next parent class for CLASS.
-If CLASS is a superclass, return variable `eieio-default-superclass'.
-If CLASS is variable `eieio-default-superclass' then return nil.
-This is different from function `class-parent' as class parent returns
-nil for superclasses.  This function performs no type checking!"
-  ;; No type-checking because all calls are made from functions which
-  ;; are safe and do checking for us.
-  (or (eieio-class-parents-fast class)
-      (if (eq class 'eieio-default-superclass)
-          nil
-        '(eieio-default-superclass))))
-
-(defun eieiomt-sym-optimize (s)
-  "Find the next class above S which has a function body for the optimizer."
-  ;; Set the value to nil in case there is no nearest cell.
-  (set s nil)
-  ;; Find the nearest cell that has a function body. If we find one,
-  ;; we replace the nil from above.
-  (let ((external-symbol (intern-soft (symbol-name s))))
-    (catch 'done
-      (dolist (ancestor (rest (eieio-class-precedence-list external-symbol)))
-        (let ((ov (intern-soft (symbol-name ancestor)
-                               eieiomt-optimizing-obarray)))
-          (when (fboundp ov)
-            (set s ov) ;; store ov as our next symbol
-            (throw 'done ancestor)))))))
-
-(defun eieio-generic-form (method key class)
- "Return the lambda form belonging to METHOD using KEY based upon CLASS.
-If CLASS is not a class then use `generic' instead.  If class has
-no form, but has a parent class, then trace to that parent class.
-The first time a form is requested from a symbol, an optimized path
-is memorized for faster future use."
- (let ((emto (aref (get method 'eieio-method-obarray)
-                   (if class key (eieio-specialized-key-to-generic-key key)))))
-   (if (class-p class)
-       ;; 1) find our symbol
-       (let ((cs (intern-soft (symbol-name class) emto)))
-         (if (not cs)
-             ;; 2) If there isn't one, then make one.
-             ;;    This can be slow since it only occurs once
-             (progn
-               (setq cs (intern (symbol-name class) emto))
-               ;; 2.1) Cache its nearest neighbor with a quick optimize
-               ;;      which should only occur once for this call ever
-               (let ((eieiomt-optimizing-obarray emto))
-                 (eieiomt-sym-optimize cs))))
-         ;; 3) If it's bound return this one.
-         (if (fboundp  cs)
-             (cons cs (eieio--class-symbol (class-v class)))
-           ;; 4) If it's not bound then this variable knows something
-           (if (symbol-value cs)
-               (progn
-                 ;; 4.1) This symbol holds the next class in its value
-                 (setq class (symbol-value cs)
-                       cs (intern-soft (symbol-name class) emto))
-                 ;; 4.2) The optimizer should always have chosen a
-                 ;;      function-symbol
-                 ;;(if (fboundp cs)
-                 (cons cs (eieio--class-symbol (class-v (intern (symbol-name class)))))
-                   ;;(error "EIEIO optimizer: erratic data loss!"))
-                 )
-               ;; There never will be a funcall...
-               nil)))
-     ;; for a generic call, what is a list, is the function body we want.
-     (let ((emtl (aref (get method 'eieio-method-tree)
-                       (if class key (eieio-specialized-key-to-generic-key key)))))
-       (if emtl
-           ;; The car of EMTL is supposed to be a class, which in this
-           ;; case is nil, so skip it.
-           (cons (cdr (car emtl)) nil)
-         nil)))))
-
-;;;
-;; Way to assign slots based on a list.  Used for constructors, or
-;; even resetting an object at run-time
-;;
-(defun eieio-set-defaults (obj &optional set-all)
-  "Take object OBJ, and reset all slots to their defaults.
-If SET-ALL is non-nil, then when a default is nil, that value is
-reset.  If SET-ALL is nil, the slots are only reset if the default is
-not nil."
-  (let ((scoped-class (eieio--object-class obj))
-        (eieio-initializing-object t)
-        (pub (eieio--class-public-a (class-v (eieio--object-class obj)))))
-    (while pub
-      (let ((df (eieio-oref-default obj (car pub))))
-        (if (or df set-all)
-            (eieio-oset obj (car pub) df)))
-      (setq pub (cdr pub)))))
-
-(defun eieio-initarg-to-attribute (class initarg)
-  "For CLASS, convert INITARG to the actual attribute name.
-If there is no translation, pass it in directly (so we can cheat if
-need be... May remove that later...)"
-  (let ((tuple (assoc initarg (eieio--class-initarg-tuples (class-v class)))))
-    (if tuple
-        (cdr tuple)
-      nil)))
-
-(defun eieio-attribute-to-initarg (class attribute)
-  "In CLASS, convert the ATTRIBUTE into the corresponding init argument tag.
-This is usually a symbol that starts with `:'."
-  (let ((tuple (rassoc attribute (eieio--class-initarg-tuples (class-v class)))))
-    (if tuple
-        (car tuple)
-      nil)))
-
-
-;;; Here are some special types of errors
-;;
-(intern "no-method-definition")
-(put 'no-method-definition 'error-conditions '(no-method-definition error))
-(put 'no-method-definition 'error-message "No method definition")
-
-(intern "no-next-method")
-(put 'no-next-method 'error-conditions '(no-next-method error))
-(put 'no-next-method 'error-message "No next method")
-
-(intern "invalid-slot-name")
-(put 'invalid-slot-name 'error-conditions '(invalid-slot-name error))
-(put 'invalid-slot-name 'error-message "Invalid slot name")
-
-(intern "invalid-slot-type")
-(put 'invalid-slot-type 'error-conditions '(invalid-slot-type error nil))
-(put 'invalid-slot-type 'error-message "Invalid slot type")
-
-(intern "unbound-slot")
-(put 'unbound-slot 'error-conditions '(unbound-slot error nil))
-(put 'unbound-slot 'error-message "Unbound slot")
-
-(intern "inconsistent-class-hierarchy")
-(put 'inconsistent-class-hierarchy 'error-conditions
-     '(inconsistent-class-hierarchy error nil))
-(put 'inconsistent-class-hierarchy 'error-message "Inconsistent class hierarchy")
+        (eieio--with-scoped-class (cdr next)
+          (apply fcn newargs)) ))))
 
 ;;; Here are some CLOS items that need the CL package
 ;;
@@ -2678,7 +598,7 @@ Called from the constructor routine.")
 (defmethod shared-initialize ((obj eieio-default-superclass) slots)
   "Set slots of OBJ with SLOTS which is a list of name/value pairs.
 Called from the constructor routine."
-  (let ((scoped-class (eieio--object-class obj)))
+  (eieio--with-scoped-class (eieio--object-class obj)
     (while slots
       (let ((rn (eieio-initarg-to-attribute (eieio--object-class obj)
                                             (car slots))))
@@ -2700,27 +620,27 @@ call `shared-initialize' yourself, or you can call `call-next-method'
 to have this constructor called automatically.  If these steps are
 not taken, then new objects of your class will not have their values
 dynamically set from SLOTS."
-    ;; First, see if any of our defaults are `lambda', and
-    ;; re-evaluate them and apply the value to our slots.
-    (let* ((scoped-class (class-v (eieio--object-class this)))
-           (slot (eieio--class-public-a scoped-class))
-           (defaults (eieio--class-public-d scoped-class)))
-      (while slot
-        ;; For each slot, see if we need to evaluate it.
-        ;;
-        ;; Paul Landes said in an email:
-        ;; > CL evaluates it if it can, and otherwise, leaves it as
-        ;; > the quoted thing as you already have.  This is by the
-        ;; > Sonya E. Keene book and other things I've look at on the
-        ;; > web.
-        (let ((dflt (eieio-default-eval-maybe (car defaults))))
-          (when (not (eq dflt (car defaults)))
-            (eieio-oset this (car slot) dflt) ))
-        ;; Next.
-        (setq slot (cdr slot)
-              defaults (cdr defaults))))
-    ;; Shared initialize will parse our slots for us.
-    (shared-initialize this slots))
+  ;; First, see if any of our defaults are `lambda', and
+  ;; re-evaluate them and apply the value to our slots.
+  (let* ((this-class (class-v (eieio--object-class this)))
+         (slot (eieio--class-public-a this-class))
+         (defaults (eieio--class-public-d this-class)))
+    (while slot
+      ;; For each slot, see if we need to evaluate it.
+      ;;
+      ;; Paul Landes said in an email:
+      ;; > CL evaluates it if it can, and otherwise, leaves it as
+      ;; > the quoted thing as you already have.  This is by the
+      ;; > Sonya E. Keene book and other things I've look at on the
+      ;; > web.
+      (let ((dflt (eieio-default-eval-maybe (car defaults))))
+        (when (not (eq dflt (car defaults)))
+          (eieio-oset this (car slot) dflt) ))
+      ;; Next.
+      (setq slot (cdr slot)
+            defaults (cdr defaults))))
+  ;; Shared initialize will parse our slots for us.
+  (shared-initialize this slots))
 
 (defgeneric slot-missing (object slot-name operation &optional new-value)
   "Method invoked when an attempt to access a slot in OBJECT fails.")
@@ -2940,102 +860,6 @@ This may create or delete slots, but does not affect the return value
 of `eq'."
   (error "EIEIO: `change-class' is unimplemented"))
 
-)
-
-;;; Obsolete backward compatibility functions.
-;; Needed to run byte-code compiled with the EIEIO of Emacs-23.
-
-(defun eieio-defmethod (method args)
-  "Obsolete work part of an old version of the `defmethod' macro."
-  (let ((key nil) (body nil) (firstarg nil) (argfix nil) (argclass nil) loopa)
-    ;; find optional keys
-    (setq key
-          (cond ((memq (car args) '(:BEFORE :before))
-                 (setq args (cdr args))
-                 method-before)
-                ((memq (car args) '(:AFTER :after))
-                 (setq args (cdr args))
-                 method-after)
-                ((memq (car args) '(:STATIC :static))
-                 (setq args (cdr args))
-                 method-static)
-                ((memq (car args) '(:PRIMARY :primary))
-                 (setq args (cdr args))
-                 method-primary)
-                ;; Primary key.
-                (t method-primary)))
-    ;; Get body, and fix contents of args to be the arguments of the fn.
-    (setq body (cdr args)
-          args (car args))
-    (setq loopa args)
-    ;; Create a fixed version of the arguments.
-    (while loopa
-      (setq argfix (cons (if (listp (car loopa)) (car (car loopa)) (car loopa))
-                         argfix))
-      (setq loopa (cdr loopa)))
-    ;; Make sure there is a generic.
-    (eieio-defgeneric
-     method
-     (if (stringp (car body))
-         (car body) (format "Generically created method `%s'." method)))
-    ;; create symbol for property to bind to.  If the first arg is of
-    ;; the form (varname vartype) and `vartype' is a class, then
-    ;; that class will be the type symbol.  If not, then it will fall
-    ;; under the type `primary' which is a non-specific calling of the
-    ;; function.
-    (setq firstarg (car args))
-    (if (listp firstarg)
-        (progn
-          (setq argclass  (nth 1 firstarg))
-          (if (not (class-p argclass))
-              (error "Unknown class type %s in method parameters"
-                     (nth 1 firstarg))))
-      ;; Generics are higher.
-      (setq key (eieio-specialized-key-to-generic-key key)))
-    ;; Put this lambda into the symbol so we can find it.
-    (if (byte-code-function-p (car-safe body))
-        (eieiomt-add method (car-safe body) key argclass)
-      (eieiomt-add method (append (list 'lambda (reverse argfix)) body)
-                   key argclass))
-    )
-
-  (when eieio-optimize-primary-methods-flag
-    ;; Optimizing step:
-    ;;
-    ;; If this method, after this setup, only has primary methods, then
-    ;; we can setup the generic that way.
-    (if (generic-primary-only-p method)
-        ;; If there is only one primary method, then we can go one more
-        ;; optimization step.
-        (if (generic-primary-only-one-p method)
-            (eieio-defgeneric-reset-generic-form-primary-only-one method)
-          (eieio-defgeneric-reset-generic-form-primary-only method))
-      (eieio-defgeneric-reset-generic-form method)))
-
-  method)
-(make-obsolete 'eieio-defmethod 'eieio--defmethod "24.1")
-
-(defun eieio-defgeneric (method doc-string)
-  "Obsolete work part of an old version of the `defgeneric' macro."
-  (if (and (fboundp method) (not (generic-p method))
-           (or (byte-code-function-p (symbol-function method))
-               (not (eq 'autoload (car (symbol-function method)))))
-           )
-      (error "You cannot create a generic/method over an existing symbol: %s"
-             method))
-  ;; Don't do this over and over.
-  (unless (fboundp 'method)
-    ;; This defun tells emacs where the first definition of this
-    ;; method is defined.
-    `(defun ,method nil)
-    ;; Make sure the method tables are installed.
-    (eieiomt-install method)
-    ;; Apply the actual body of this function.
-    (fset method (eieio-defgeneric-form method doc-string))
-    ;; Return the method
-    'method))
-(make-obsolete 'eieio-defgeneric nil "24.1")
-
 ;;; Interfacing with edebug
 ;;
 (defun eieio-edebug-prin1-to-string (object &optional noescape)