From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 22 Aug 2009 14:37:23 +0000 (+0000)
Subject: eieio-doc.el (eieiodoc--class-indexstring, defvar eieiodoc--class-root): New vars.
X-Git-Tag: emacs-pretest-23.1.90~1091^2~116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8397ae74054225c2aaadbc917101b506a3c0a3c3;p=emacs.git

eieio-doc.el (eieiodoc--class-indexstring, defvar eieiodoc--class-root): New vars.
(eieiodoc-class, eieiodoc-one-node) Use them to silence compiler.
(eieiodoc-one-node): Use `class' instead of `rclass'.  This avoids a
    compiler warning for free use of `rclass', which IIUC is always
    equal to `class'.
---

diff --git a/lisp/eieio/eieio-doc.el b/lisp/eieio/eieio-doc.el
index 966c489b524..35de848c51c 100644
--- a/lisp/eieio/eieio-doc.el
+++ b/lisp/eieio/eieio-doc.el
@@ -52,6 +52,9 @@ ROOT-CLASS, INDEXSTRING, and SKIPLIST are the same as `eieiodoc-class'."
   (sit-for 0)
   (eieiodoc-class root-class indexstring skiplist))
 
+(defvar eieiodoc--class-indexstring)
+(defvar eieiodoc--class-root)
+
 (defun eieiodoc-class (root-class indexstring &optional skiplist)
   "Create documentation starting with ROOT-CLASS.
 The first job is to create an indented menu of all the classes
@@ -89,7 +92,9 @@ into any menus, nodes or lists."
   (save-excursion
     (eieiodoc-main-menu root-class skiplist)
     (insert "\n")
-    (eieiodoc-recurse root-class 'eieiodoc-one-node nil skiplist)))
+    (let ((eieiodoc--class-indexstring indexstring)
+	  (eieiodoc--class-root root-class))
+      (eieiodoc-recurse root-class 'eieiodoc-one-node nil skiplist))))
 
 (defun eieiodoc-main-menu (class skiplist)
   "Create a menu of all classes under CLASS indented the correct amount.
@@ -113,8 +118,8 @@ Argument LEVEL is the current level of recursion we have hit."
 	  eieiodoc-currently-in-node "\n"
 	  "@comment  node-name,  next,  previous,  up\n"
 	  "@" eieiodoc-current-section-level " " (symbol-name class) "\n"
-	  ;; indexstring is grabbed from parent calling function
-	  "@" indexstring "index " (symbol-name class) "\n\n")
+	  "@" eieiodoc--class-indexstring
+	  "index " (symbol-name class) "\n\n")
   ;; Now lets create a nifty little inheritance tree
   (let ((cl class)
 	(revlist nil)
@@ -124,17 +129,15 @@ Argument LEVEL is the current level of recursion we have hit."
 	    cl (class-parent cl)))
     (insert "@table @asis\n@item Inheritance Tree:\n")
     (while revlist
-      ;; root-class is dragged in from the top-level function
       (insert "@table @code\n@item "
-	      (if (and (child-of-class-p (car revlist) root-class)
+	      (if (and (child-of-class-p (car revlist) eieiodoc--class-root)
 		       (not (eq class (car revlist))))
 		  (concat "@w{@xref{" (symbol-name (car revlist)) "}.}")
 		(symbol-name (car revlist)))
 	      "\n")
       (setq revlist (cdr revlist)
 	    depth (1+ depth)))
-    ;; the value of rclass is brought in from caller
-    (let ((clist (reverse (aref (class-v rclass) class-children))))
+    (let ((clist (reverse (aref (class-v class) class-children))))
       (if (not clist)
 	  (insert "No children")
 	(insert "@table @asis\n@item Children:\n")