summaryrefslogtreecommitdiff
path: root/lisp/cedet/semantic/util.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2009-09-05 01:00:36 +0000
committerChong Yidong <cyd@stupidchicken.com>2009-09-05 01:00:36 +0000
commit996bc9bf73f16625e00df0bb58ea98b2ca3ba317 (patch)
treee49ee958cca5804242f25423e251424d3f9553af /lisp/cedet/semantic/util.el
parent55b522b2eb02de72ce207a04aef15ed7f193b568 (diff)
downloademacs-996bc9bf73f16625e00df0bb58ea98b2ca3ba317.tar.gz
* emacs-lisp/autoload.el (generated-autoload-load-name): New var.
(autoload-generate-file-autoloads): Use it. (make-autoload): Handle define-overloadable-function. * emacs-lisp/lisp-mode.el (define-overloadable-function): Add doc-string-elt property for define-overloadable-function. lisp/cedet/semantic/analyze.el: Add generated-autoload-load-name var. lisp/cedet/semantic/ctxt.el: Add generated-autoload-load-name var. lisp/cedet/semantic/db.el: Add generated-autoload-load-name var. lisp/cedet/semantic/db-file.el: Add generated-autoload-load-name var. lisp/cedet/semantic/db-mode.el: Add generated-autoload-load-name var. lisp/cedet/semantic/db-typecache.el: Add generated-autoload-load-name var. lisp/cedet/semantic/doc.el: Add generated-autoload-load-name var. lisp/cedet/semantic/find.el: Add generated-autoload-load-name var. lisp/cedet/semantic/format.el: Add generated-autoload-load-name var. lisp/cedet/semantic/lex.el: Add generated-autoload-load-name var. lisp/cedet/semantic/sb.el: Require semantic/format. lisp/cedet/semantic/sort.el: Add generated-autoload-load-name var. lisp/cedet/semantic/tag.el: Add generated-autoload-load-name var. lisp/cedet/semantic/tag-file.el: Add generated-autoload-load-name var. lisp/cedet/semantic/tag-ls.el: Add generated-autoload-load-name var.
Diffstat (limited to 'lisp/cedet/semantic/util.el')
-rw-r--r--lisp/cedet/semantic/util.el27
1 files changed, 17 insertions, 10 deletions
diff --git a/lisp/cedet/semantic/util.el b/lisp/cedet/semantic/util.el
index 37bb5629335..dfb899e5941 100644
--- a/lisp/cedet/semantic/util.el
+++ b/lisp/cedet/semantic/util.el
@@ -28,14 +28,18 @@
(require 'assoc)
(require 'semantic)
-(eval-when-compile
- ;; Emacs 21
- (condition-case nil
- (require 'newcomment)
- (error nil))
- ;; Semanticdb calls
- (require 'semantic/db)
- )
+
+(declare-function data-debug-insert-stuff-list "data-debug")
+(declare-function data-debug-insert-thing "data-debug")
+(declare-function semanticdb-file-stream "semantic/db")
+(declare-function semanticdb-abstract-table-child-p "semantic/db")
+(declare-function semanticdb-refresh-table "semantic/db")
+(declare-function semanticdb-get-tags "semantic/db")
+(declare-function semanticdb-find-results-p "semantic/db-find")
+
+;; For semantic-find-tags-by-class, semantic--find-tags-by-function,
+;; and semantic-brute-find-tag-standard:
+(eval-when-compile (require 'semantic/find))
;;; Code:
@@ -112,14 +116,15 @@ buffer, or a filename. If SOMETHING is nil return nil."
(file-exists-p something))
(semantic-file-tag-table something))
;; A Semanticdb table
- ((and (featurep 'semanticdb)
+ ((and (featurep 'semantic/db)
(semanticdb-minor-mode-p)
(semanticdb-abstract-table-child-p something))
(semanticdb-refresh-table something)
(semanticdb-get-tags something))
;; Semanticdb find-results
- ((and (featurep 'semanticdb)
+ ((and (featurep 'semantic/db)
(semanticdb-minor-mode-p)
+ (require 'semantic/db-find)
(semanticdb-find-results-p something))
(semanticdb-strip-find-results something))
;; NOTE: This commented out since if a search result returns
@@ -350,6 +355,7 @@ If TAG is not specified, use the tag at point."
"Display the current token.
Argument P is the point to search from in the current buffer."
(interactive "d")
+ (require 'semantic/find)
(let ((tok (semantic-brute-find-innermost-tag-by-position
p (current-buffer))))
(message (mapconcat 'semantic-abbreviate-nonterminal tok ","))
@@ -359,6 +365,7 @@ Argument P is the point to search from in the current buffer."
(defun semantic-hack-search ()
"Display info about something under the cursor using generic methods."
(interactive)
+ (require 'semantic/find)
(let (
;(name (thing-at-point 'symbol))
(strm (cdr (semantic-fetch-tags)))