summaryrefslogtreecommitdiff
path: root/lisp/cedet/semantic
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2019-10-28 16:05:39 +0100
committerStefan Kangas <stefankangas@gmail.com>2019-10-28 16:07:10 +0100
commit1f1ce5b3118abed0248f4a0bddd3f7538256dcac (patch)
treeb73ffb7c60f1bc59cc2f7e2607748fdbcc62226e /lisp/cedet/semantic
parentc515d4eeb2fe966923f0fef0c231945b6ad1df8f (diff)
downloademacs-1f1ce5b3118abed0248f4a0bddd3f7538256dcac.tar.gz
emacs-1f1ce5b3118abed0248f4a0bddd3f7538256dcac.tar.bz2
emacs-1f1ce5b3118abed0248f4a0bddd3f7538256dcac.zip
Remove more XEmacs compat code from CEDET
* lisp/cedet/mode-local.el (mode-local-describe-bindings-1): * lisp/cedet/semantic/idle.el (semantic-idle-summary-out-of-context-faces): * lisp/cedet/semantic/imenu.el (semantic-imenu-rebuild-directory-indexes): * lisp/cedet/semantic/texi.el (semantic-texi-command-completion-list): Remove XEmacs compat code.
Diffstat (limited to 'lisp/cedet/semantic')
-rw-r--r--lisp/cedet/semantic/idle.el3
-rw-r--r--lisp/cedet/semantic/imenu.el7
-rw-r--r--lisp/cedet/semantic/texi.el7
3 files changed, 3 insertions, 14 deletions
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 35ec930469f..78fd669ef61 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -703,8 +703,7 @@ by semanticdb as a time-saving measure."
'(
font-lock-comment-face
font-lock-string-face
- font-lock-doc-string-face ; XEmacs.
- font-lock-doc-face ; Emacs 21 and later.
+ font-lock-doc-face
)
"List of font-lock faces that indicate a useless summary context.
Those are generally faces used to highlight comments.
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 7dcf75fefa6..81efffaa603 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -438,12 +438,7 @@ Optional argument PARENT is a tag parent of STREAM."
;; Rebuild the imenu
(imenu--cleanup)
(setq imenu--index-alist nil)
- (funcall
- (if (fboundp 'imenu-menu-filter)
- ;; XEmacs imenu
- 'imenu-menu-filter
- ;; Emacs imenu
- 'imenu-update-menubar))))))))
+ (imenu-update-menubar)))))))
(defun semantic-imenu-semanticdb-hook ()
"Function to be called from `semanticdb-mode-hook'.
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 73f0e734f32..d0e6ad83b2a 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -389,12 +389,7 @@ Optional argument POINT is where to look for the environment."
(defvar semantic-texi-command-completion-list
(append (mapcar (lambda (a) (car a)) texinfo-section-list)
- (condition-case nil
- texinfo-environments
- (error
- ;; XEmacs doesn't use the above. Split up its regexp
- (split-string texinfo-environment-regexp "\\\\|\\|\\^@\\\\(\\|\\\\)")
- ))
+ texinfo-environments
;; Is there a better list somewhere? Here are few
;; of the top of my head.
"anchor" "asis"