aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJ.D. Smith2006-12-05 23:29:16 +0000
committerJ.D. Smith2006-12-05 23:29:16 +0000
commit58c8f9156c7b7394d1f93a3f56c0c3e165e5bbf3 (patch)
tree66194a9d491bcc34aa7b00d261437d1068d9414c /lisp
parent14a56a1b3f2ccd04714f8a05fef5a5f642477deb (diff)
downloademacs-58c8f9156c7b7394d1f93a3f56c0c3e165e5bbf3.tar.gz
emacs-58c8f9156c7b7394d1f93a3f56c0c3e165e5bbf3.zip
(idlwave-xml-create-class-method-lists): Trim out spurious class
inheritance "None" entries.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/idlwave.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24fbfd28277..b289f5fdb4c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-12-05 J.D. Smith <jdsmith@as.arizona.edu>
2
3 * progmodes/idlwave.el (idlwave-xml-create-class-method-lists):
4 Trim out spurious class inheritance "None" entries.
5
12006-12-05 Kim F. Storm <storm@cua.dk> 62006-12-05 Kim F. Storm <storm@cua.dk>
2 7
3 * emulation/cua-base.el (cua-paste-pop-rotate-temporarily): Doc fix. 8 * emulation/cua-base.el (cua-paste-pop-rotate-temporarily): Doc fix.
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 6fa03c27ba1..f33ae35ed30 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -4651,7 +4651,11 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
4651 props (car (cdr pelem))) 4651 props (car (cdr pelem)))
4652 (cond 4652 (cond
4653 ((eq ptype 'SUPERCLASS) 4653 ((eq ptype 'SUPERCLASS)
4654 (push (cdr (assq 'name props)) inherits)) 4654 (let ((pname (cdr (assq 'name props)))
4655 (plink (cdr (assq 'link props))))
4656 (unless (and (string= pname "None")
4657 (string= plink "None"))
4658 (push pname inherits))))
4655 4659
4656 ((eq ptype 'PROPERTY) 4660 ((eq ptype 'PROPERTY)
4657 (let ((pname (cdr (assq 'name props))) 4661 (let ((pname (cdr (assq 'name props)))