(ebrowse-class-in-tree): Return the tail of the tree

rather than the element found, thus enabling the tree to be
setcar'd.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bc8aada7de8fbfab8cdbca9d5ac68c8ad6b8e8e..567b5c5c9d5a9238f48ed7fb2fa514690e0a0c3d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-15  Alan Mackenzie  <acm@muc.de>
+
+       * ebrowse.el (ebrowse-class-in-tree): Return the tail of the tree
+       rather than the element found, thus enabling the tree to be
+       setcar'd.
+
 2005-01-14  Carsten Dominik  <dominik@science.uva.nl>
 
        * textmodes/org.el (org-show-following-heading): New option.

diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 478ce403b31fbaf09b225c5083437fde54e20a7b..bf11ea2851498467cb29552831e0389f28346afc 100644 (file)
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -780,16 +780,16 @@ The class tree is found in the buffer-local variable `ebrowse--tree-obarray'."
 
 (defun ebrowse-class-in-tree (class tree)
   "Search for a class with name CLASS in TREE.
-Return the class found, if any.  This function is used during the load
-phase where classes appended to a file replace older class
-information."
+If CLASS is found, return the tail of TREE starting at CLASS.  This function
+is used during the load phase where classes appended to a file replace older
+class information."
   (let ((tclass (ebrowse-ts-class class))
        found)
     (while (and tree (not found))
-      (let ((root (car tree)))
-       (when (string= (ebrowse-qualified-class-name (ebrowse-ts-class root))
+      (let ((root-ptr tree))
+       (when (string= (ebrowse-qualified-class-name (ebrowse-ts-class (car root-ptr)))
                       (ebrowse-qualified-class-name tclass))
-         (setq found root))
+         (setq found root-ptr))
        (setq tree (cdr tree))))
     found))
 
@@ -903,10 +903,10 @@ and TREE is a list of `ebrowse-ts' structures forming the class tree."
     (let ((gc-cons-threshold 2000000))
       (while (not (progn (skip-chars-forward " \t\n\r") (eobp)))
        (let* ((root (read (current-buffer)))
-              (old-root (ebrowse-class-in-tree root tree)))
+              (old-root-ptr (ebrowse-class-in-tree root tree)))
          (ebrowse-show-progress "Reading data" (null tree))
-         (if old-root
-             (setf (car old-root) root)
+         (if old-root-ptr
+             (setcar old-root-ptr root)
            (push root tree)))))
     (garbage-collect)
     (list header tree)))