summaryrefslogtreecommitdiff
path: root/lisp/cedet/semantic
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2022-05-14 21:35:43 +0800
committerPo Lu <luangruo@yahoo.com>2022-05-14 21:35:43 +0800
commitdbfbae8708d1ccf1015c4aafc151f96ec1caeb0e (patch)
treef0c67f9c593578bcf210083c303c93eba7a0cf00 /lisp/cedet/semantic
parent2c4e9985922b106389abf659d63d8dd721f2a9bc (diff)
parent725251094b37727d3acebed22abfb4aa7b9b6592 (diff)
downloademacs-dbfbae8708d1ccf1015c4aafc151f96ec1caeb0e.tar.gz
emacs-dbfbae8708d1ccf1015c4aafc151f96ec1caeb0e.tar.bz2
emacs-dbfbae8708d1ccf1015c4aafc151f96ec1caeb0e.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/cedet/semantic')
-rw-r--r--lisp/cedet/semantic/complete.el3
-rw-r--r--lisp/cedet/semantic/imenu.el3
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 2c608fca38a..6a09adca32d 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1761,7 +1761,8 @@ Return a cons cell (X . Y)."
(defvar tooltip-frame-parameters)
-(declare-function tooltip-show "tooltip" (text &optional use-echo-area))
+(declare-function tooltip-show "tooltip" (text &optional use-echo-area
+ text-face default-face))
(defun semantic-displayer-tooltip-show (text)
"Display a tooltip with TEXT near cursor."
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 235965a9955..37dc9632729 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -39,7 +39,8 @@
(require 'semantic/sort)
(require 'imenu)
-(declare-function pulse-momentary-highlight-one-line "pulse" (o &optional face))
+(declare-function pulse-momentary-highlight-one-line "pulse"
+ (&optional point face))
(declare-function semanticdb-semantic-init-hook-fcn "db-mode")
;; Because semantic imenu tags will hose the current imenu handling