branch: externals/auctex
commit 63bcbcd1f6aae29b8c53d7a703fb0e5f92be0701
Author: Tassilo Horn <t...@gnu.org>
Commit: Tassilo Horn <t...@gnu.org>
Obsolete LaTeX-verbatim-regexp defcustom
* latex.el (LaTeX-verbatim-regexp): Make variable obsolete.
(LaTeX-verbatim-regexp): New function which computes a regexp of
verbatim environments from LaTeX-verbatim-environments.
(LaTeX-indent-calculate, LaTeX-indent-calculate-last): Use the
function LaTeX-verbatim-regexp instead of the variable.
* style/listings.el ("listings"): Don't modify the now obsolete
LaTeX-verbatim-regexp.
* style/fancyvrb.el ("fancyvrb"): Don't modify the now obsolete
LaTeX-verbatim-regexp.
* style/beamer.el ("beamer"): Don't modify the now obsolete
LaTeX-verbatim-regexp.
* style/alltt.el ("alltt"): Don't modify the now obsolete
LaTeX-verbatim-regexp.
---
ChangeLog | 17 +++++++++++++++++
latex.el | 14 ++++++++++----
style/alltt.el | 2 --
style/beamer.el | 4 +---
style/fancyvrb.el | 6 +-----
style/listings.el | 4 +---
6 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9bd0dae..735d8d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,23 @@
* latex.el (LaTeX-env-args): Bind exit-mark if its not bound
already.
+ (LaTeX-verbatim-regexp): Make variable obsolete.
+ (LaTeX-verbatim-regexp): New function which computes a regexp of
+ verbatim environments from LaTeX-verbatim-environments.
+ (LaTeX-indent-calculate, LaTeX-indent-calculate-last): Use the
+ function LaTeX-verbatim-regexp instead of the variable.
+
+ * style/listings.el ("listings"): Don't modify the now obsolete
+ LaTeX-verbatim-regexp.
+
+ * style/fancyvrb.el ("fancyvrb"): Don't modify the now obsolete
+ LaTeX-verbatim-regexp.
+
+ * style/beamer.el ("beamer"): Don't modify the now obsolete
+ LaTeX-verbatim-regexp.
+
+ * style/alltt.el ("alltt"): Don't modify the now obsolete
+ LaTeX-verbatim-regexp.
2014-12-18 Tassilo Horn <t...@gnu.org>
diff --git a/latex.el b/latex.el
index 1098601..8b19c8b 100644
--- a/latex.el
+++ b/latex.el
@@ -2914,6 +2914,8 @@ indentation level in columns."
"*Regexp matching environments with indentation at col 0 for begin/end."
:group 'LaTeX-indentation
:type 'regexp)
+(make-obsolete-variable 'LaTeX-verbatim-regexp
'LaTeX-verbatim-environments-local
+ "2014-12-19")
(defcustom LaTeX-begin-regexp "begin\\b"
"*Regexp matching macros considered begins."
@@ -3045,6 +3047,10 @@ Lines starting with an item is given an extra
indentation of
(delete-region (line-beginning-position) (point))
(indent-to outer-indent))
+(defun LaTeX-verbatim-regexp ()
+ "Calculate the verbatim env regex from `LaTeX-verbatim-environments'."
+ (regexp-opt (LaTeX-verbatim-environments)))
+
(defun LaTeX-indent-calculate (&optional force-type)
"Return the indentation of a line of LaTeX source.
FORCE-TYPE can be used to force the calculation of an inner or
@@ -3076,7 +3082,7 @@ outer indentation in case of a commented line. The
symbols
(nth 1 entry)))
((looking-at (concat (regexp-quote TeX-esc)
"\\(begin\\|end\\){\\("
- LaTeX-verbatim-regexp
+ (LaTeX-verbatim-regexp)
"\\)}"))
;; \end{verbatim} must be flush left, otherwise an unwanted
;; empty line appears in LaTeX's output.
@@ -3208,19 +3214,19 @@ outer indentation in case of a commented line. The
symbols
0)
((looking-at (concat (regexp-quote TeX-esc)
"begin *{\\("
- LaTeX-verbatim-regexp
+ (LaTeX-verbatim-regexp)
"\\)}"))
0)
((looking-at (concat (regexp-quote TeX-esc)
"end *{\\("
- LaTeX-verbatim-regexp
+ (LaTeX-verbatim-regexp)
"\\)}"))
;; If I see an \end{verbatim} in the previous line I skip
;; back to the preceding \begin{verbatim}.
(save-excursion
(if (re-search-backward (concat (regexp-quote TeX-esc)
"begin *{\\("
- LaTeX-verbatim-regexp
+ (LaTeX-verbatim-regexp)
"\\)}") 0 t)
(LaTeX-indent-calculate-last force-type)
0)))
diff --git a/style/alltt.el b/style/alltt.el
index e5c5684..86b4993 100644
--- a/style/alltt.el
+++ b/style/alltt.el
@@ -37,8 +37,6 @@
(make-local-variable 'LaTeX-indent-environment-list)
(add-to-list 'LaTeX-indent-environment-list
'("alltt" current-indentation))
- (make-local-variable 'LaTeX-verbatim-regexp)
- (setq LaTeX-verbatim-regexp (concat LaTeX-verbatim-regexp "\\|alltt"))
(add-to-list 'LaTeX-verbatim-environments-local "alltt")
;; Fontification
(when (and (featurep 'font-latex)
diff --git a/style/beamer.el b/style/beamer.el
index 16c1f4b..58bef38 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -137,7 +137,7 @@
'("exampleblock" 1)
'("frame" (lambda (env &rest ignore)
(let ((title (TeX-read-string "(Optional) Title: " nil
- 'LaTeX-beamer-frametitle-history)))
+
'LaTeX-beamer-frametitle-history)))
(LaTeX-insert-environment env)
(unless (zerop (length title))
(save-excursion
@@ -172,8 +172,6 @@
(make-local-variable 'LaTeX-indent-environment-list)
(add-to-list 'LaTeX-indent-environment-list
'("semiverbatim" current-indentation))
- (make-local-variable 'LaTeX-verbatim-regexp)
- (setq LaTeX-verbatim-regexp (concat LaTeX-verbatim-regexp
"\\|semiverbatim"))
(add-to-list 'LaTeX-verbatim-environments-local "semiverbatim")
;; Fontification
diff --git a/style/fancyvrb.el b/style/fancyvrb.el
index 92718b4..8334708 100644
--- a/style/fancyvrb.el
+++ b/style/fancyvrb.el
@@ -159,10 +159,6 @@
"FancyVerbLine")
;; Filling
- (set (make-local-variable 'LaTeX-verbatim-regexp)
- (concat
- LaTeX-verbatim-regexp
- "\\|Verbatim\\|BVerbatim\\|LVerbatim\\|SaveVerbatim\\|VerbatimOut"))
(add-to-list 'LaTeX-verbatim-environments-local "Verbatim")
(add-to-list 'LaTeX-verbatim-environments-local "BVerbatim")
(add-to-list 'LaTeX-verbatim-environments-local "LVerbatim")
@@ -190,7 +186,7 @@
("LVerbatimInput" "[{"))
'reference)
(font-latex-add-keywords '(("Verb" "[")) ; The second argument should
- ; actually be verbatim.
+ ; actually be verbatim.
'textual)
(font-latex-add-keywords '(("fvset" "{")) 'variable)
;; For syntactic fontification, e.g. verbatim constructs.
diff --git a/style/listings.el b/style/listings.el
index 534de62..ace5c97 100644
--- a/style/listings.el
+++ b/style/listings.el
@@ -248,8 +248,6 @@
(make-local-variable 'LaTeX-indent-environment-list)
(add-to-list 'LaTeX-indent-environment-list
'("lstlisting" current-indentation))
- (make-local-variable 'LaTeX-verbatim-regexp)
- (setq LaTeX-verbatim-regexp (concat LaTeX-verbatim-regexp "\\|lstlisting"))
(add-to-list 'LaTeX-verbatim-environments-local "lstlisting")
(add-to-list 'LaTeX-verbatim-macros-with-delims-local "lstinline")
(add-to-list 'LaTeX-verbatim-macros-with-braces-local "lstinline")
@@ -260,7 +258,7 @@
(font-latex-add-keywords '(("lstnewenvironment" "{[[{{")) 'function)
(font-latex-add-keywords '(("lstinputlisting" "[{")) 'reference)
(font-latex-add-keywords '(("lstinline" "[{") ; The second argument should
- ; actually be verbatim.
+ ; actually be verbatim.
("lstlistoflistings" ""))
'textual)
(font-latex-add-keywords '(("lstalias" "{{")
