[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/auctex 05d28dfe06 12/30: Improve check for verbatim con
From: |
Tassilo Horn |
Subject: |
[elpa] externals/auctex 05d28dfe06 12/30: Improve check for verbatim content |
Date: |
Thu, 7 Dec 2023 03:51:07 -0500 (EST) |
branch: externals/auctex
commit 05d28dfe06a54c27fd889d3f0c0e43f27fcc514e
Author: Arash Esbati <arash@gnu.org>
Commit: Arash Esbati <arash@gnu.org>
Improve check for verbatim content
* tex.el (TeX-brace-count-line): Take into account the return
value of the function `TeX-verbatim-p' depending on the last
detected character.
---
tex.el | 46 ++++++++++++++++++++++++++++++----------------
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git a/tex.el b/tex.el
index 6ab2181654..7c3c17ea16 100644
--- a/tex.el
+++ b/tex.el
@@ -5491,22 +5491,36 @@ additional characters."
'(?\{ ?\} ?\\))
(TeX-in-comment))))
(forward-char)
- ;; If inside a verbatim construct, just return t and
- ;; proceed, otherwise start counting:
- (if (TeX-verbatim-p)
- t
- (cond ((memq char (append
- TeX-indent-open-delimiters
- '(?\{)))
- (setq count (+ count TeX-brace-indent-level)))
- ((memq char (append
- TeX-indent-close-delimiters
- '(?\})))
- (setq count (- count TeX-brace-indent-level)))
- ((eq char ?\\)
- (when (< (point) limit)
- (forward-char)
- t)))))))
+ ;; We have to cater for verb-macros with braces and
+ ;; what the function `TeX-verbatim-p' returns dep. on
+ ;; the position of point:
+ ;; \Verb{\ or { or } are not special}.
+ ;; ^-> nil ^-> t
+ (cond ((memq char (append
+ TeX-indent-open-delimiters
+ '(?\{)))
+ ;; Point is one char after `{', so check if
+ ;; we're inside a verb macro and return t,
+ ;; otherwise increase `count':
+ (if (TeX-verbatim-p)
+ t
+ (setq count (+ count TeX-brace-indent-level))))
+ ((memq char (append
+ TeX-indent-close-delimiters
+ '(?\})))
+ ;; Point if one char after `}', so check if the
+ ;; char before point is inside a verb macro:
+ (if (TeX-verbatim-p (1- (point)))
+ t
+ (setq count (- count TeX-brace-indent-level))))
+ ((eq char ?\\)
+ ;; Point is one char-after after `\', so check
+ ;; if the char before point is inside a verb
+ ;; macro:
+ (when (< (point) limit)
+ (unless (TeX-verbatim-p (1- (point)))
+ (forward-char))
+ t))))))
count)))
;;; Navigation
- [elpa] externals/auctex 24023ba246 30/30: Merge remote-tracking branch 'origin/master' into externals/auctex, (continued)
- [elpa] externals/auctex 24023ba246 30/30: Merge remote-tracking branch 'origin/master' into externals/auctex, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex 46f49aad81 02/30: Fix previous commit, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex f3bbff59ed 08/30: ; * style/fvextra.el ("fvextra"): Add missing macro., Tassilo Horn, 2023/12/07
- [elpa] externals/auctex 2a959a1d43 13/30: Fix regexp, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex ecc0059120 05/30: ; * admin/release-process.org: Fix typos, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex acacdc09a6 25/30: ; * tex.el (TeX-brace-count-line): Fix check order., Tassilo Horn, 2023/12/07
- [elpa] externals/auctex 217b46b2cf 03/30: Allow `preview-scale-function' as a file-local variable, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex ebe0ef11d1 06/30: ; Revert "; * latex.el (LaTeX-completion-parse-args): Use `cl-flet'.", Tassilo Horn, 2023/12/07
- [elpa] externals/auctex 8282b83210 04/30: ; Mention bumping Emacs version for ELPA, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex 5d0f020b81 28/30: Add support for the refcount package, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex 05d28dfe06 12/30: Improve check for verbatim content,
Tassilo Horn <=
- [elpa] externals/auctex b94c773c5d 19/30: ; Delete remainder, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex ed2f62ef80 21/30: * style/splitidx.el ("splitidx"): Replace `TeX-arg-eval'., Tassilo Horn, 2023/12/07
- [elpa] externals/auctex a82eb1690a 10/30: Restore point in `LaTeX-verbatim-p', Tassilo Horn, 2023/12/07
- [elpa] externals/auctex 26d64689d3 22/30: * style/titleps.el ("titleps"): Replace `TeX-arg-eval'., Tassilo Horn, 2023/12/07
- [elpa] externals/auctex a5599695b0 15/30: Save regexp groups, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex d231ecdfcc 16/30: ; * font-latex.el (font-latex-built-in-keyword-classes): Add "par"., Tassilo Horn, 2023/12/07
- [elpa] externals/auctex a28f1d4ccb 27/30: Add completion support for \DeclareGraphicsExtensions, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex 88467618ad 11/30: ; * style/minted.el (LaTeX-fontenc-package-options): Pacify warning., Tassilo Horn, 2023/12/07
- [elpa] externals/auctex c196c69207 09/30: Update style/minted to package version 2.8, Tassilo Horn, 2023/12/07
- [elpa] externals/auctex 8ae405b919 14/30: Save regexp groups, Tassilo Horn, 2023/12/07