branch: externals/auctex
commit 70a31c5e17cf7f761e9f920c602fdbe19f9fcd2a
Author: Ikumi Keita <[email protected]>
Commit: Ikumi Keita <[email protected]>
Remove compatibility codes for older emacsen
* tex-info.el (when, TeX-texinfo-mode):
* tex.el (TeX-documentation-texdoc):
* plain-tex.el (TeX-plain-tex-mode):
* preview.el.in (preview-counter-find):
Remove compatibility codes for older emacsen.
---
plain-tex.el | 4 +---
preview.el.in | 3 ---
tex-info.el | 15 +--------------
tex.el | 7 ++-----
4 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/plain-tex.el b/plain-tex.el
index 4c26abf..b881516 100644
--- a/plain-tex.el
+++ b/plain-tex.el
@@ -137,9 +137,7 @@ of `plain-TeX-mode-hook'."
(setq TeX-command-default "TeX")
(setq TeX-sentinel-default-function 'TeX-TeX-sentinel)
(add-hook 'tool-bar-mode-on-hook 'plain-TeX-maybe-install-toolbar nil t)
- (when (if (featurep 'xemacs)
- (featurep 'toolbar)
- (and (boundp 'tool-bar-mode) tool-bar-mode))
+ (when (and (boundp 'tool-bar-mode) tool-bar-mode)
(plain-TeX-maybe-install-toolbar))
(TeX-run-mode-hooks 'text-mode-hook 'TeX-mode-hook 'plain-TeX-mode-hook)
(TeX-set-mode-name))
diff --git a/preview.el.in b/preview.el.in
index cfb3300..e6eceeb 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -2037,9 +2037,6 @@ to the close hook."
"Fetch the next preceding or next preview-counters property.
Factored out because of compatibility macros XEmacs would
not use in advice."
- ;; The following two lines are bug workaround for Emacs < 22.1.
- (if (markerp begin)
- (setq begin (marker-position begin)))
(or (car (get-char-property begin 'preview-counters))
(cdr (get-char-property (max (point-min)
(1- begin))
diff --git a/tex-info.el b/tex-info.el
index f986b3f..52d01be 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -31,11 +31,6 @@
(require 'tex)
(require 'texinfo)
-;; Make sure the Texinfo mode of AUCTeX is still used after loading
-;; texinfo.el. (This is only an issue on Emacs 21.)
-(when (and (boundp 'TeX-modes)
- (memq 'texinfo-mode TeX-modes))
- (defalias 'texinfo-mode 'TeX-texinfo-mode))
;;; Environments:
(defvar Texinfo-environment-list
@@ -657,15 +652,7 @@ value of `Texinfo-mode-hook'."
texinfo-imenu-generic-expression)
(set (make-local-variable 'font-lock-defaults)
- ;; COMPATIBILITY for Emacs 20
- (if (boundp 'texinfo-font-lock-syntactic-keywords)
- '(texinfo-font-lock-keywords
- nil nil nil backward-paragraph
- (font-lock-syntactic-keywords
- . texinfo-font-lock-syntactic-keywords))
- ;; This is for Emacs >= 23.3, when
- ;; `texinfo-font-lock-syntactic-keywords' was removed.
- '(texinfo-font-lock-keywords nil nil nil backward-paragraph)))
+ '(texinfo-font-lock-keywords nil nil nil backward-paragraph))
;; Outline settings.
(set (make-local-variable 'outline-regexp)
diff --git a/tex.el b/tex.el
index ec86213..f5493a6 100644
--- a/tex.el
+++ b/tex.el
@@ -6343,12 +6343,9 @@ the number of the file to view, anything else to skip:
") list)))
;; Exit gently if a `quit' signal is thrown.
(quit nil)))
(t (message "No documentation found for %s" pkg)))
- ;; In any case quit-and-kill the window. XXX: XEmacs doesn't have
- ;; `quit-window', just kill the buffer in that case.
+ ;; In any case quit-and-kill the window.
(when (get-buffer-window buffer)
- (if (fboundp 'quit-window)
- (quit-window t (get-buffer-window buffer))
- (kill-buffer buffer)))))
+ (quit-window t (get-buffer-window buffer)))))
;; Called without prefix argument: just run "texdoc --view <pkg>" and
;; show the output, so that the user is warned in case it doesn't find
;; the documentation or "texdoc" is not available.
