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.
This commit is contained in:
Stefan Kangas 2019-10-28 16:05:39 +01:00
parent c515d4eeb2
commit 1f1ce5b311
4 changed files with 10 additions and 31 deletions

View file

@ -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."

View file

@ -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.

View file

@ -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'.

View file

@ -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"