comparison lisp/cedet/semantic/sort.el @ 104476:1da44e87bf90

lisp/cedet/semantic/sort.el (semantic-tag-external-class-default) (semantic-tag-external-member-children-default): Require semantic/db-mode instead of checking if semanticdb-minor-mode-p is bound.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 07 Sep 2009 16:34:35 +0000
parents 273e528a9f9b
children bbd7017a25d9
comparison
equal deleted inserted replaced
104475:9787b67f48d7 104476:1da44e87bf90
546 (defun semantic-tag-external-member-children-default (tag &optional usedb) 546 (defun semantic-tag-external-member-children-default (tag &optional usedb)
547 "Return list of external children for TAG. 547 "Return list of external children for TAG.
548 Optional argument USEDB specifies if the semantic database is used. 548 Optional argument USEDB specifies if the semantic database is used.
549 See `semantic-tag-external-member-children' for details." 549 See `semantic-tag-external-member-children' for details."
550 (if (and usedb 550 (if (and usedb
551 (fboundp 'semanticdb-minor-mode-p) 551 (require 'semantic/db-mode)
552 (semanticdb-minor-mode-p) 552 (semanticdb-minor-mode-p)
553 (require 'semantic/db-find)) 553 (require 'semantic/db-find))
554 (let ((m (semanticdb-find-tags-external-children-of-type 554 (let ((m (semanticdb-find-tags-external-children-of-type
555 (semantic-tag-name tag)))) 555 (semantic-tag-name tag))))
556 (if m (apply #'append (mapcar #'cdr m)))) 556 (if m (apply #'append (mapcar #'cdr m))))
576 ) 576 )
577 577
578 (defun semantic-tag-external-class-default (tag) 578 (defun semantic-tag-external-class-default (tag)
579 "Return a list of real tags that faux TAG might represent. 579 "Return a list of real tags that faux TAG might represent.
580 See `semantic-tag-external-class' for details." 580 See `semantic-tag-external-class' for details."
581 (if (and (fboundp 'semanticdb-minor-mode-p) 581 (if (and (require 'semantic/db-mode)
582 (semanticdb-minor-mode-p)) 582 (semanticdb-minor-mode-p))
583 (let* ((semanticdb-search-system-databases nil) 583 (let* ((semanticdb-search-system-databases nil)
584 (m (semanticdb-find-tags-by-class 584 (m (semanticdb-find-tags-by-class
585 (semantic-tag-class tag) 585 (semantic-tag-class tag)
586 (semanticdb-find-tags-by-name (semantic-tag-name tag))))) 586 (semanticdb-find-tags-by-name (semantic-tag-name tag)))))