* emacs-lisp/eieio-generic.el: New file.

* lisp/emacs-lisp/eieio-core.el: Move all generic function code to
eieio-generic.el.
(eieio--defmethod): Declare.
* lisp/emacs-lisp/eieio.el: Require eieio-generic.  Move all generic
function code to eieio-generic.el.
* lisp/emacs-lisp/eieio-opt.el (eieio-help-generic): Move to
eieio-generic.el.
* lisp/emacs-lisp/eieio-datadebug.el (eieio-debug-methodinvoke): Update call
to eieio--generic-call.
* lisp/emacs-lisp/eieio-base.el (eieio-instance-inheritor): Don't use
<class>-child type.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Update reference to eieio--generic-call-key.
* test/automated/eieio-tests.el (eieio-test-23-inheritance-check): Don't use
<foo>-child-p.

1 files changed, 1 insertions, 64 deletions

diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 4896a4cdead..60bbd503adf 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -1,6 +1,6 @@
 ;;; eieio-opt.el -- eieio optional functions (debug, printing, speedbar)
 
-;; Copyright (C) 1996, 1998-2003, 2005, 2008-2014 Free Software
+;; Copyright (C) 1996, 1998-2003, 2005, 2008-2015 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
@@ -311,69 +311,6 @@ are not abstract."
 	  (eieio-help-class ctr))
 	))))
 
-
-;;;###autoload
-(defun eieio-help-generic (generic)
-  "Describe GENERIC if it is a generic function."
-  (when (and (symbolp generic) (generic-p generic))
-    (save-excursion
-      (goto-char (point-min))
-      (when (re-search-forward " in `.+'.$" nil t)
-	(replace-match ".")))
-    (save-excursion
-      (insert "\n\nThis is a generic function"
-	      (cond
-	       ((and (generic-primary-only-p generic)
-		     (generic-primary-only-one-p generic))
-		" with only one primary method")
-	       ((generic-primary-only-p generic)
-		" with only primary methods")
-	       (t ""))
-	      ".\n\n")
-      (insert (propertize "Implementations:\n\n" 'face 'bold))
-      (let ((i 4)
-	    (prefix [ ":STATIC" ":BEFORE" ":PRIMARY" ":AFTER" ] ))
-	;; Loop over fanciful generics
-	(while (< i 7)
-	  (let ((gm (aref (get generic 'eieio-method-tree) i)))
-	    (when gm
-	      (insert "Generic "
-		      (aref prefix (- i 3))
-		      "\n"
-		      (or (nth 2 gm) "Undocumented")
-		      "\n\n")))
-	  (setq i (1+ i)))
-	(setq i 0)
-	;; Loop over defined class-specific methods
-	(while (< i 4)
-	  (let* ((gm (reverse (aref (get generic 'eieio-method-tree) i)))
-		 cname location)
-	    (while gm
-	      (setq cname (caar gm))
-	      (insert "`")
-	      (help-insert-xref-button (symbol-name cname)
-				       'help-variable cname)
-	      (insert "' " (aref prefix i) " ")
-	      ;; argument list
-	      (let* ((func (cdr (car gm)))
-		     (arglst (help-function-arglist func)))
-		(prin1 arglst (current-buffer)))
-	      (insert "\n"
-		      (or (documentation (cdr (car gm)))
-			  "Undocumented"))
-	      ;; Print file location if available
-	      (when (and (setq location (get generic 'method-locations))
-			 (setq location (assoc cname location)))
-		(setq location (cadr location))
-		(insert "\n\nDefined in `")
-		(help-insert-xref-button
-		 (file-name-nondirectory location)
-		 'eieio-method-def cname generic location)
-		(insert "'\n"))
-	      (setq gm (cdr gm))
-	      (insert "\n")))
-	  (setq i (1+ i)))))))
-
 (defun eieio-all-generic-functions (&optional class)
   "Return a list of all generic functions.
 Optional CLASS argument returns only those functions that contain