(idlwave-xml-create-class-method-lists): Trim out spurious class

inheritance "None" entries.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24fbfd28277dbc40ea73bac12066989d3ae6b05d..b289f5fdb4c8c46780f0895a3f9db8ef13785a73 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-05  J.D. Smith  <jdsmith@as.arizona.edu>
+
+       * progmodes/idlwave.el (idlwave-xml-create-class-method-lists):
+       Trim out spurious class inheritance "None" entries.
+
 2006-12-05  Kim F. Storm  <storm@cua.dk>
 
        * emulation/cua-base.el (cua-paste-pop-rotate-temporarily): Doc fix.

diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 6fa03c27ba11b2f56aec66db474be8bef2f03047..f33ae35ed301ab3d62b723931b7764e808424518 100644 (file)
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -4651,7 +4651,11 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
              props (car (cdr pelem)))
        (cond
         ((eq ptype 'SUPERCLASS)
-         (push (cdr (assq 'name props)) inherits))
+         (let ((pname (cdr (assq 'name props)))
+               (plink (cdr (assq 'link props))))
+           (unless (and (string= pname "None")
+                        (string= plink "None"))
+             (push pname inherits))))
 
         ((eq ptype 'PROPERTY)
          (let ((pname (cdr (assq 'name props)))