aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2017-04-24 19:51:20 -0400
committerGlenn Morris2017-04-24 19:51:20 -0400
commit2d0a3feda61186319b7c834ee08c96926dd7ab92 (patch)
treed57512809db3fd35165b7070a44eecfc98533db7
parent53f8f4bf2db097f4a2c68194c55a87c5a1176c8c (diff)
downloademacs-2d0a3feda61186319b7c834ee08c96926dd7ab92.tar.gz
emacs-2d0a3feda61186319b7c834ee08c96926dd7ab92.zip
Further robustify cedet bootstrap to loaddefs not yet built
* lisp/cedet/semantic/util.el (semantic-something-to-tag-table): Avoid void-function error when bootstrapping and semantic/loaddefs.el does not yet exist.
-rw-r--r--lisp/cedet/semantic/util.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/cedet/semantic/util.el b/lisp/cedet/semantic/util.el
index f8f12ec56a5..31562bc16ab 100644
--- a/lisp/cedet/semantic/util.el
+++ b/lisp/cedet/semantic/util.el
@@ -110,12 +110,14 @@ buffer, or a filename. If SOMETHING is nil return nil."
110 (semantic-file-tag-table something)) 110 (semantic-file-tag-table something))
111 ;; A Semanticdb table 111 ;; A Semanticdb table
112 ((and (featurep 'semantic/db) 112 ((and (featurep 'semantic/db)
113 (require 'semantic/db-mode)
113 (semanticdb-minor-mode-p) 114 (semanticdb-minor-mode-p)
114 (semanticdb-abstract-table-child-p something)) 115 (semanticdb-abstract-table-child-p something))
115 (semanticdb-refresh-table something) 116 (semanticdb-refresh-table something)
116 (semanticdb-get-tags something)) 117 (semanticdb-get-tags something))
117 ;; Semanticdb find-results 118 ;; Semanticdb find-results
118 ((and (featurep 'semantic/db) 119 ((and (featurep 'semantic/db)
120 (require 'semantic/db-mode)
119 (semanticdb-minor-mode-p) 121 (semanticdb-minor-mode-p)
120 (require 'semantic/db-find) 122 (require 'semantic/db-find)
121 (semanticdb-find-results-p something)) 123 (semanticdb-find-results-p something))