diff options
| -rw-r--r-- | lisp/cedet/semantic/db-global.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el index 61af619b292..0afa6619d25 100644 --- a/lisp/cedet/semantic/db-global.el +++ b/lisp/cedet/semantic/db-global.el @@ -39,6 +39,8 @@ ;;; Code: +(defvar semanticdb--ih) + ;;;###autoload (defun semanticdb-enable-gnu-global-databases (mode &optional noerror) "Enable the use of the GNU Global SemanticDB back end for all files of MODE. @@ -64,10 +66,10 @@ values." (when (stringp mode) (setq mode (intern mode))) - (let ((ih (mode-local-value mode 'semantic-init-mode-hook))) + (let ((semanticdb--ih (mode-local-value mode 'semantic-init-mode-hook))) (eval `(setq-mode-local ,mode semantic-init-mode-hook - (cons 'semanticdb-enable-gnu-global-hook ih)))) + (cons 'semanticdb-enable-gnu-global-hook semanticdb--ih)))) t ) ) @@ -94,7 +96,7 @@ if optional DONT-ERR-IF-NOT-AVAILABLE is non-nil; else throw an error." (setq ;; Add to the system database list. semanticdb-project-system-databases - (cons (semanticdb-project-database-global "global") + (cons (make-instance 'semanticdb-project-database-global) semanticdb-project-system-databases) ;; Apply the throttle. semanticdb-find-default-throttle @@ -132,7 +134,7 @@ For each file hit, get the traditional semantic table from that file." ;; We need to return something since there is always the "master table" ;; The table can then answer file name type questions. (when (not (slot-boundp obj 'tables)) - (let ((newtable (semanticdb-table-global "GNU Global Search Table"))) + (let ((newtable (make-instance 'semanticdb-table-global))) (oset obj tables (list newtable)) (oset newtable parent-db obj) (oset newtable tags nil) @@ -191,7 +193,7 @@ Returns a table of all matching tags." (faketags nil) ) (when result - (dolist (T (oref result :hit-text)) + (dolist (T (oref result hit-text)) ;; We should look up each tag one at a time, but I'm lazy! ;; Doing this may be good enough. (setq faketags (cons |