From 68528bf77da2ffee35f229221ded7289b1fa50720bb4ae6b2b555114a435674f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 16 May 2024 09:30:23 +0000 Subject: [PATCH] Refresh auctex-13.3-auto-TL-2024.tar.xz OBS-URL: https://build.opensuse.org/package/show/editors/emacs-auctex?expand=0&rev=66 --- auctex-13.3-auto-TL-2024.tar.xz | 4 +-- emacs-auctex.changes | 8 ++++++ emacs-auctex.spec | 5 ++-- ignore-errors.patch | 48 --------------------------------- 4 files changed, 13 insertions(+), 52 deletions(-) delete mode 100644 ignore-errors.patch diff --git a/auctex-13.3-auto-TL-2024.tar.xz b/auctex-13.3-auto-TL-2024.tar.xz index 3b78e58..ff2184f 100644 --- a/auctex-13.3-auto-TL-2024.tar.xz +++ b/auctex-13.3-auto-TL-2024.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:775721294c75e480e3ba191f7181d4477f0e2c7e8b3f56d59faa85d21adad0c6 -size 4572516 +oid sha256:ebbe400f0e3463ed5c7a0446b9baabc4fe86b4f873a6446abbf48a7491b89552 +size 4928620 diff --git a/emacs-auctex.changes b/emacs-auctex.changes index ae50c68..60d5145 100644 --- a/emacs-auctex.changes +++ b/emacs-auctex.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 16 09:27:02 UTC 2024 - Dr. Werner Fink + +- Remove patch ignore-errors.patch + * After discussion with AUCTeX upstream avoid now those errors + by ignoring font-lock TeX macros as well as lwarp.sty +- Refresh auctex-13.3-auto-TL-2024.tar.xz with that above + ------------------------------------------------------------------- Tue May 7 07:38:33 UTC 2024 - Dr. Werner Fink diff --git a/emacs-auctex.spec b/emacs-auctex.spec index 1aee02b..bf933a2 100644 --- a/emacs-auctex.spec +++ b/emacs-auctex.spec @@ -56,7 +56,6 @@ URL: https://www.gnu.org/software/auctex # PATCH-FEATURE-UPSTREAM dvips.patch Patch0: dvips.patch Patch1: auctex-13.1-expand.patch -Patch2: ignore-errors.patch Patch3: initial-reset.patch Patch4: dinbrief.patch BuildArch: noarch @@ -83,7 +82,6 @@ you cannot use this package for XEmacs. %setup -n auctex-%{version} %patch -P0 %patch -P1 -%patch -P2 %patch -P3 %patch -P4 @@ -118,8 +116,11 @@ you cannot use this package for XEmacs. %if %{with tex4auto} pwd echo "Run the command TeX-auto-generate-global in mini buffer" + ignore="$(sed -rn '/^\(defcustom TeX-ignore-file/,+1{ s@^\s+@@;s@(\\\\)(\)\$)@\1|lwarp\\.sty\\\\\2@p }' < ../tex.el)" emacs-gtk -batch -Q -L %{buildroot}%{_sitedir}/auctex \ --eval '(setq TeX-lisp-directory "%{buildroot}%{_aucdir}")' \ + --eval "(setq TeX-install-font-lock #'ignore)" \ + --eval "(setq TeX-ignore-file ${ignore})" \ --eval '(setq TeX-auto-global "%{buildroot}%{_aucdir}/auto")' \ -l %{buildroot}%{_sitedir}/tex-site.el -f TeX-auto-generate-global exit 1 diff --git a/ignore-errors.patch b/ignore-errors.patch deleted file mode 100644 index 0a5d190..0000000 --- a/ignore-errors.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- - latex.el | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- latex.el -+++ latex.el 2024-03-27 10:36:50.635375638 +0000 -@@ -2022,7 +2022,7 @@ TYPE is one of the symbols mac or env." - ;; over [>=] and a balanced {} - ((looking-at-p "[>=]") - (forward-char 1) -- (with-syntax-table syntax (forward-sexp))) -+ (with-syntax-table syntax (ignore-errors (forward-sexp)))) - ;; Mandatory arguments: - ;; m: Ask for input with "Text" as prompt - ((looking-at-p "m") -@@ -2038,7 +2038,7 @@ TYPE is one of the symbols mac or env." - ;; R{default} - ((looking-at-p "R") - (re-search-forward "R\\(.\\)\\(.\\)" (+ (point) 3) t) -- (with-syntax-table syntax (forward-sexp)) -+ (with-syntax-table syntax (ignore-errors (forward-sexp))) - (push `(TeX-arg-string nil nil nil nil - ,(match-string-no-properties 1) - ,(match-string-no-properties 2)) -@@ -2062,12 +2062,12 @@ TYPE is one of the symbols mac or env." - ;; O{default} - ((looking-at-p "O") - (forward-char 1) -- (with-syntax-table syntax (forward-sexp)) -+ (with-syntax-table syntax (ignore-errors (forward-sexp))) - (push (vector "Text") args)) - ;; D{default} - ((looking-at-p "D") - (re-search-forward "D\\(.\\)\\(.\\)" (+ (point) 3) t) -- (with-syntax-table syntax (forward-sexp)) -+ (with-syntax-table syntax (ignore-errors (forward-sexp))) - (push (vector #'TeX-arg-string nil nil nil nil - (match-string-no-properties 1) - (match-string-no-properties 2)) -@@ -2099,7 +2099,7 @@ TYPE is one of the symbols mac or env." - ,(match-string-no-properties 1)) - args) - (when (looking-at-p TeX-grop) -- (with-syntax-table syntax (forward-sexp)))) -+ (with-syntax-table syntax (ignore-errors (forward-sexp))))) - ;; Finished: - (t nil)))) - (if (eq type 'env)