[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1f1ce5b 1/2: Remove more XEmacs compat code from CEDET
From: |
Stefan Kangas |
Subject: |
master 1f1ce5b 1/2: Remove more XEmacs compat code from CEDET |
Date: |
Mon, 28 Oct 2019 11:18:43 -0400 (EDT) |
branch: master
commit 1f1ce5b3118abed0248f4a0bddd3f7538256dcac
Author: Stefan Kangas <address@hidden>
Commit: Stefan Kangas <address@hidden>
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.
---
lisp/cedet/mode-local.el | 24 +++++++-----------------
lisp/cedet/semantic/idle.el | 3 +--
lisp/cedet/semantic/imenu.el | 7 +------
lisp/cedet/semantic/texi.el | 7 +------
4 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index c4e5280..9477f1b 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -877,23 +877,13 @@ META-NAME is a cons (OVERLOADABLE-SYMBOL . MAJOR-MODE)."
"Display mode local bindings active in BUFFER-OR-MODE.
Optional argument INTERACTIVE-P is non-nil if the calling command was
invoked interactively."
- (if (fboundp 'with-displaying-help-buffer)
- ;; XEmacs
- (with-displaying-help-buffer
- #'(lambda ()
- (with-current-buffer standard-output
- (mode-local-describe-bindings-2 buffer-or-mode)
- (when (fboundp 'frob-help-extents)
- (goto-char (point-min))
- (frob-help-extents standard-output)))))
- ;; GNU Emacs
- (when (fboundp 'help-setup-xref)
- (help-setup-xref
- (list 'mode-local-describe-bindings-1 buffer-or-mode)
- interactive-p))
- (with-output-to-temp-buffer (help-buffer) ; "*Help*"
- (with-current-buffer standard-output
- (mode-local-describe-bindings-2 buffer-or-mode)))))
+ (when (fboundp 'help-setup-xref)
+ (help-setup-xref
+ (list 'mode-local-describe-bindings-1 buffer-or-mode)
+ interactive-p))
+ (with-output-to-temp-buffer (help-buffer) ; "*Help*"
+ (with-current-buffer standard-output
+ (mode-local-describe-bindings-2 buffer-or-mode))))
(defun describe-mode-local-bindings (buffer)
"Display mode local bindings active in BUFFER."
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 35ec930..78fd669 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 7dcf75f..81efffa 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 73f0e73..d0e6ad8 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"