summaryrefslogtreecommitdiff
path: root/lisp/cedet/semantic/db-file.el
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2021-03-03 19:54:37 +0100
committerStefan Kangas <stefan@marxist.se>2021-03-03 19:54:37 +0100
commit356636c6a1ebba3e95d0e6609ae0401992008ccf (patch)
treed794c5b821677363c3b2775e18f8dca175bfd0c7 /lisp/cedet/semantic/db-file.el
parent9ef8a3bfca192777e7cf8b4748d188249a517582 (diff)
downloademacs-356636c6a1ebba3e95d0e6609ae0401992008ccf.tar.gz
Make inversion.el obsolete (Bug#46841)
* lisp/cedet/inversion.el: * test/lisp/cedet/inversion-tests.el: Move from here... * lisp/obsolete/inversion.el: * test/lisp/obsolete/inversion-tests.el: ...to here. * lisp/cedet/cedet.el (cedet-version): Make obsolete. * lisp/cedet/cedet-cscope.el (cedet-cscope-version-check): * lisp/cedet/cedet-global.el (cedet-gnu-global-version-check): * lisp/cedet/cedet-idutils.el (cedet-idutils-version-check): * lisp/cedet/ede/make.el (ede-make-check-version): Use 'version<' instead of 'inversion-check-version'. * lisp/cedet/semantic/db-file.el (semanticdb-load-database): Don't use 'inversion-test'. * lisp/cedet/semantic/ede-grammar.el (ede-proj-makefile-insert-variables): Don't add inversion to loadpath. * lisp/speedbar.el: Remove stale comment.
Diffstat (limited to 'lisp/cedet/semantic/db-file.el')
-rw-r--r--lisp/cedet/semantic/db-file.el29
1 files changed, 7 insertions, 22 deletions
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 59e9db9cc0a..d99b94f49eb 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -154,8 +154,6 @@ If DIRECTORY doesn't exist, create a new one."
;;; File IO
-(declare-function inversion-test "inversion")
-
(defun semanticdb-load-database (filename)
"Load the database FILENAME."
(condition-case foo
@@ -163,32 +161,19 @@ If DIRECTORY doesn't exist, create a new one."
'semanticdb-project-database-file))
(c (semanticdb-get-database-tables r))
(tv (oref r semantic-tag-version))
- (fv (oref r semanticdb-version))
- )
+ (fv (oref r semanticdb-version)))
;; Restore the parent-db connection
(while c
(oset (car c) parent-db r)
(setq c (cdr c)))
(unless (and (equal semanticdb-file-version fv)
(equal semantic-tag-version tv))
- ;; Try not to load inversion unless we need it:
- (require 'inversion)
- (if (not (inversion-test 'semanticdb-file fv))
- (when (inversion-test 'semantic-tag tv)
- ;; Incompatible version. Flush tables.
- (semanticdb-flush-database-tables r)
- ;; Reset the version to new version.
- (oset r semantic-tag-version semantic-tag-version)
- ;; Warn user
- (message "Semanticdb file is old. Starting over for %s"
- filename))
- ;; Version is not ok. Flush whole system
- (message "semanticdb file is old. Starting over for %s"
- filename)
- ;; This database is so old, we need to replace it.
- ;; We also need to delete it from the instance tracker.
- (delete-instance r)
- (setq r nil)))
+ ;; Version is not ok. Flush whole system
+ (message "semanticdb file is old. Starting over for %s" filename)
+ ;; This database is so old, we need to replace it.
+ ;; We also need to delete it from the instance tracker.
+ (delete-instance r)
+ (setq r nil))
r)
(error (message "Cache Error: [%s] %s, Restart"
filename foo)