[elpa] externals/auctex 33a01b6928 59/77: Extend test for filling

[Tassilo Horn]

branch: externals/auctex
commit 33a01b692832fc32e43fbfcd6d8c1c984c1ba05b
Author: Arash Esbati <arash@gnu.org>
Commit: Arash Esbati <arash@gnu.org>

    Extend test for filling
    
    * tests/latex/latex-filling-in.tex:
    * tests/latex/latex-filling-out.tex: Add an additional test for
    bug#56160 which also checks for filling with shortcuts defined
    in `LaTeX-shortvrb-chars'.
    
    * tests/latex/latex-test.el (LaTeX-filling): Let-bind the variable
    `LaTeX-shortvrb-chars' for the test.
    Use `TeX-forward-comment-skip' to skip over multiline comments.
---
 tests/latex/latex-filling-in.tex  | 18 +++++++++++++++++-
 tests/latex/latex-filling-out.tex | 19 ++++++++++++++++++-
 tests/latex/latex-test.el         |  8 ++++++--
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/tests/latex/latex-filling-in.tex b/tests/latex/latex-filling-in.tex
index 72f8bcd0db..16c314f95b 100644
--- a/tests/latex/latex-filling-in.tex
+++ b/tests/latex/latex-filling-in.tex
@@ -1,3 +1,7 @@
+\documentclass{article}
+\usepackage{shortvrb}
+\begin{document}
+
 Lorem ipsum dolor sit amet, consectetur adipisci elit, sed eiusmod \(0 = 1\) 
tempor incidunt ut $a^{2} + b^{2} = c^{2}$ labore et dolore magna aliqua.  Ut 
enim ad minim veniam, quis nostrum exercitationem ullam corporis suscipit 
laboriosam, nisi ut aliquid ex ea commodi consequatur.
 
 \begin{tabular}{| l | l | l | l |}
@@ -69,5 +73,17 @@ Mauris ac felis vel velit tristique imperdiet.  Vestibulum 
convallis, lorem a
 tempus semper, dui dui euismod elit, vitae placerat urna tortor vitae lacus.\\
   Fusce sagittis, libero non molestie mollis, magna orci ultrices dolor, at 
vulputate neque nulla lacinia eros.  Aliquam posuere.  Cum sociis natoque 
penatibus et magnis dis parturient montes, nascetur ridiculus mus.%  
 
-% bug#56160 Line break should be suppressed inside \verb|...|.
+% bug#56160-1 Line break should be suppressed inside \verb|...|.
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, \verb|sed do|eiusmod 
tempor
+
+% bug#56160-2 Line break should be suppressed inside shortcuts defined
+% in `LaTeX-shortvrb-chars'.  The variable itself is let-bound to
+% '(?\") in the function `LaTeX-filling' in latex-test.el.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, "sed do"eiusmod tempor
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff --git a/tests/latex/latex-filling-out.tex 
b/tests/latex/latex-filling-out.tex
index f538d39435..18dec27ccc 100644
--- a/tests/latex/latex-filling-out.tex
+++ b/tests/latex/latex-filling-out.tex
@@ -1,3 +1,7 @@
+\documentclass{article}
+\usepackage{shortvrb}
+\begin{document}
+
 Lorem ipsum dolor sit amet, consectetur adipisci elit, sed eiusmod
 \(0 = 1\) tempor incidunt ut $a^{2} + b^{2} = c^{2}$ labore et dolore
 magna aliqua.  Ut enim ad minim veniam, quis nostrum exercitationem
@@ -77,6 +81,19 @@ at vulputate neque nulla lacinia eros.  Aliquam posuere.  
Cum sociis
 natoque penatibus et magnis dis parturient montes, nascetur ridiculus
 mus.%
 
-% bug#56160 Line break should be suppressed inside \verb|...|.
+% bug#56160-1 Line break should be suppressed inside \verb|...|.
 Lorem ipsum dolor sit amet, consectetur adipiscing elit,
 \verb|sed do|eiusmod tempor
+
+% bug#56160-2 Line break should be suppressed inside shortcuts defined
+% in `LaTeX-shortvrb-chars'.  The variable itself is let-bound to
+% '(?\") in the function `LaTeX-filling' in latex-test.el.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit,
+"sed do"eiusmod tempor
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff --git a/tests/latex/latex-test.el b/tests/latex/latex-test.el
index d5f267e418..c82b240fcd 100644
--- a/tests/latex/latex-test.el
+++ b/tests/latex/latex-test.el
@@ -154,7 +154,11 @@
            (with-temp-buffer
              (insert-file-contents LaTeX-filling/in)
              (LaTeX-mode)
-             (let ((fill-column 70))
+             (let ((fill-column 70)
+                   (LaTeX-shortvrb-chars '(?\"))
+                   (TeX-parse-self t))
+               (TeX-update-style t)
+               (search-forward "Lorem")
                (fill-paragraph)
 
                (let ((cmds '("captionsetup" "caption"
@@ -166,7 +170,7 @@
                      (fill-paragraph))))
 
                (while (search-forward "% bug#" nil t)
-                 (forward-line 1)
+                 (TeX-forward-comment-skip 1)
                  (fill-paragraph)))
              (buffer-string))
            (with-temp-buffer