branch: externals/auctex
commit 5827aeb3aff59fd5988b4037931c4d7cc441bbd9
Author: Ikumi Keita <[email protected]>
Commit: Ikumi Keita <[email protected]>
Remove TeX-mark-active
* tex.el (TeX-mark-active): Remove.
(TeX-mode-specific-command-menu-entries):
* style/dinbrief.el (LaTeX-dinbrief-insert)
(LaTeX-dinbrief-env-recipient):
Use the variable `mark-active' directly instead of the function
`TeX-mark-active'.
---
style/dinbrief.el | 6 +++---
tex.el | 12 +-----------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/style/dinbrief.el b/style/dinbrief.el
index 2ec5611..8c08b66 100644
--- a/style/dinbrief.el
+++ b/style/dinbrief.el
@@ -1,6 +1,6 @@
;;; dinbrief.el --- Special code for LaTeX-Style dinbrief.
-;; Copyright (C) 1994, 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2013, 2014, 2018 Free Software Foundation, Inc.
;; Author: Werner Fink <[email protected]>
;; Maintainer: [email protected]
@@ -67,7 +67,7 @@
(defmacro LaTeX-dinbrief-insert (&rest args)
"Insert text ignoring active markers."
- `(progn (if (TeX-mark-active) (deactivate-mark))
+ `(progn (if mark-active (deactivate-mark))
(insert ,@args)))
(defun LaTeX-dinbrief-style ()
@@ -123,7 +123,7 @@
(newline-and-indent)
(if (not (zerop (length retouradr)))
(progn
- (if (TeX-mark-active) (deactivate-mark))
+ (if mark-active (deactivate-mark))
(LaTeX-dinbrief-insert TeX-esc "backaddress" TeX-grop retouradr
TeX-grcl)
(newline-and-indent)))))
(LaTeX-dinbrief-insert TeX-esc "enabledraftstandard")
diff --git a/tex.el b/tex.el
index e211c85..bb34660 100644
--- a/tex.el
+++ b/tex.el
@@ -711,12 +711,6 @@ overlays between two existing ones.")
(wrong-number-of-arguments
(read-string prompt initial-input history default-value))))
- (defun TeX-mark-active ()
- ;; In Lucid (mark) returns nil when not active.
- (if zmacs-regions
- (mark)
- (mark t)))
-
(defun TeX-active-mark ()
(and zmacs-regions (mark)))
@@ -829,10 +823,6 @@ Ensures that empty input results in nil across different
emacs versions."
(defun TeX-read-string (prompt &optional initial-input history default-value)
(read-string prompt initial-input history default-value t))
- (defun TeX-mark-active ()
- ;; In FSF 19 mark-active indicates if mark is active.
- mark-active)
-
(defun TeX-active-mark ()
(and transient-mark-mode mark-active))
@@ -5039,7 +5029,7 @@ Brace insertion is only done if point is in a math
construct and
(<= (prefix-numeric-value prefix-arg) 0)
(and (boundp 'TeX-command-region-begin)
(markerp TeX-command-region-begin)))
- (TeX-mark-active))
+ mark-active)
;;:visible (eq TeX-command-current 'TeX-command-region)
:style toggle
:selected (and (boundp 'TeX-command-region-begin)
