From ece365e673e721259865ae47273614bb5b92493c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 6 May 2015 16:02:32 -0400 Subject: [PATCH] Quieten cedet compilation * lisp/cedet/semantic/db-el.el (semanticdb-elisp-sym->tag): Invert fboundp test to quieten on current Emacs. * lisp/cedet/ede/config.el (ede-shell-run-something) (semanticdb-file-table-object, semanticdb-needs-refresh-p) (semanticdb-refresh-table): Declare. (ede-preprocessor-map): Require semantic/db. --- lisp/cedet/ede/config.el | 8 ++++++++ lisp/cedet/semantic/db-el.el | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lisp/cedet/ede/config.el b/lisp/cedet/ede/config.el index f91a6c1751c..f5578a21883 100644 --- a/lisp/cedet/ede/config.el +++ b/lisp/cedet/ede/config.el @@ -268,6 +268,8 @@ programs from a project.") (cmdsym (intern-soft (car cmdsplit)))) (call-interactively cmdsym t))) +(declare-function ede-shell-run-something "ede/shell") + (cl-defmethod project-run-target ((target ede-target-with-config-program)) "Run the current project derived from TARGET." (let* ((proj (ede-target-parent target)) @@ -358,8 +360,14 @@ parsed again.")) This target brings in methods used by Semantic to query the preprocessor map, and include paths.") +(declare-function semanticdb-file-table-object "semantic/db" + (file &optional dontload)) +(declare-function semanticdb-needs-refresh-p "semantic/db" (arg &rest args)) +(declare-function semanticdb-refresh-table "semantic/db" (arg &rest args)) + (cl-defmethod ede-preprocessor-map ((this ede-target-with-config-c)) "Get the pre-processor map for some generic C code." + (require 'semantic/sb) (let* ((proj (ede-target-parent this)) (root (ede-project-root proj)) (config (ede-config-get-configuration proj)) diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el index b20a756f6b7..432f638475a 100644 --- a/lisp/cedet/semantic/db-el.el +++ b/lisp/cedet/semantic/db-el.el @@ -223,11 +223,11 @@ TOKTYPE is a hint to the type of tag desired." (symbol-name sym) "class" (semantic-elisp-desymbolify - (let ((class (find-class sym))) - (if (fboundp 'eieio-slot-descriptor-name) - (mapcar #'eieio-slot-descriptor-name - (eieio-class-slots class)) - (eieio--class-public-a class)))) + (let ((class (find-class sym))) + (if (fboundp 'eieio--class-public-a) ; Emacs < 25.1 + (eieio--class-public-a class) + (mapcar #'eieio-slot-descriptor-name + (eieio-class-slots class))))) (semantic-elisp-desymbolify (eieio-class-parents sym)) ;; parents )) ((not toktype) -- 2.39.2