bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Arash Esbati]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

Бабушкин Максим Владимирович <maxbabushkin@gmail.com> writes:

> Arash,
>
> Your patch fixes the issue. Thank you!

Thanks for testing.

@Emacs maintainers: Please find attached a fix for ffap.el tracking the
new major-mode names introduced in AUCTeX v14.  Any comments welcome.

Best, Arash

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Recognize-new-mode-names-provided-by-AUCTeX.patch --]
[-- Type: text/x-patch, Size: 1518 bytes --]

From 746e6074bfef851615d803805af1e3b2f2d4e7d2 Mon Sep 17 00:00:00 2001
From: Arash Esbati <arash@gnu.org>
Date: Wed, 5 Jun 2024 21:37:43 +0200
Subject: [PATCH] Recognize new mode names provided by AUCTeX

* lisp/ffap.el (ffap-alist, ffap-string-at-point-mode-alist): Add
entries for mode names introduced in AUCTeX v14.  (bug#71376).
---
 lisp/ffap.el | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lisp/ffap.el b/lisp/ffap.el
index b2b681b7c44..f6d663a778b 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -753,6 +753,8 @@ ffap-alist
     ("\\.[fF]\\'" . ffap-fortran-mode)
     (tex-mode . ffap-tex-mode)		; search ffap-tex-path
     (latex-mode . ffap-latex-mode)	; similar
+    (TeX-mode . ffap-tex-mode)          ; AUCTeX v14 counterpart
+    (LaTeX-mode . ffap-latex-mode)      ; ditto
     ("\\.\\(tex\\|sty\\|doc\\|cls\\)\\'" . ffap-tex)
     ("\\.bib\\'" . ffap-bib)		; search ffap-bib-path
     ("\\`\\." . ffap-home)		; .emacs, .bashrc, .profile
@@ -1065,6 +1067,9 @@ ffap-string-at-point-mode-alist
     ;; (La)TeX: don't allow braces
     (latex-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
     (tex-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
+    ;; AUCTeX v14 counterparts:
+    (LaTeX-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
+    (TeX-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
     ;; XML: don't allow angle brackets
     (xml-mode "--:\\\\${}+@-Z_[:alpha:]~*?#" "{<@" "@>;.,!:}")
     (nxml-mode "--:\\\\${}+@-Z_[:alpha:]~*?#" "{<@" "@>;.,!:}")
-- 
2.45.2

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Ikumi Keita]

Hi Arash,

>>>>> Arash Esbati <arash@gnu.org> writes:
> Thanks for raising this issue.  I don't use `ffap', but the issue is
> that AUCTeX has changed the mode names.  Following your code, the
> following change should fix the issue, right?  Can you give it a try?  I
> can propose it for Emacs.

> --8<---------------cut here---------------start------------->8---
> diff --git a/lisp/ffap.el b/lisp/ffap.el
> index b2b681b7c44..f6d663a778b 100644
> --- a/lisp/ffap.el
> +++ b/lisp/ffap.el
> @@ -753,6 +753,8 @@ ffap-alist
>      ("\\.[fF]\\'" . ffap-fortran-mode)
>      (tex-mode . ffap-tex-mode)         ; search ffap-tex-path
>      (latex-mode . ffap-latex-mode)     ; similar
> +    (TeX-mode . ffap-tex-mode)          ; AUCTeX v14 counterpart
> +    (LaTeX-mode . ffap-latex-mode)      ; ditto
>      ("\\.\\(tex\\|sty\\|doc\\|cls\\)\\'" . ffap-tex)
>      ("\\.bib\\'" . ffap-bib)           ; search ffap-bib-path
>      ("\\`\\." . ffap-home)             ; .emacs, .bashrc, .profile
> @@ -1065,6 +1067,9 @@ ffap-string-at-point-mode-alist
>      ;; (La)TeX: don't allow braces
>      (latex-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
>      (tex-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
> +    ;; AUCTeX v14 counterparts:
> +    (LaTeX-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
> +    (TeX-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
>      ;; XML: don't allow angle brackets
>      (xml-mode "--:\\\\${}+@-Z_[:alpha:]~*?#" "{<@" "@>;.,!:}")
>      (nxml-mode "--:\\\\${}+@-Z_[:alpha:]~*?#" "{<@" "@>;.,!:}")
> --8<---------------cut here---------------end--------------->8---

It seems dubious to include `TeX-mode' here because it is used for only
a parent of other AUCTeX major modes and isn't meant for a major mode of
an actual buffer. Unless the user explicitly does M-x TeX-mode, no
buffers would be in `TeX-mode'.

Regards,
Ikumi Keita
#StandWithUkraine #StopWarInUkraine
#Gaza #StopMassiveKilling #CeasefireNOW

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Arash Esbati]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

Hi Keita,

Ikumi Keita <ikumi@ikumi.que.jp> writes:

> It seems dubious to include `TeX-mode' here because it is used for only
> a parent of other AUCTeX major modes and isn't meant for a major mode of
> an actual buffer. Unless the user explicitly does M-x TeX-mode, no
> buffers would be in `TeX-mode'.

Yes, my fault, thanks for catching this.  Next try is attached.

Best, Arash

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Recognize-new-mode-names-provided-by-AUCTeX.patch --]
[-- Type: text/x-patch, Size: 1524 bytes --]

From ae4ee831e628192e7f047c9651e3ae0e1ca89d48 Mon Sep 17 00:00:00 2001
From: Arash Esbati <arash@gnu.org>
Date: Wed, 5 Jun 2024 21:37:43 +0200
Subject: [PATCH] Recognize new mode names provided by AUCTeX

* lisp/ffap.el (ffap-alist, ffap-string-at-point-mode-alist): Add
entries for mode names introduced in AUCTeX v14.  (bug#71376).
---
 lisp/ffap.el | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lisp/ffap.el b/lisp/ffap.el
index b2b681b7c44..e8065701eec 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -753,6 +753,8 @@ ffap-alist
     ("\\.[fF]\\'" . ffap-fortran-mode)
     (tex-mode . ffap-tex-mode)		; search ffap-tex-path
     (latex-mode . ffap-latex-mode)	; similar
+    (plain-TeX-mode . ffap-tex-mode)    ; AUCTeX v14 counterpart
+    (LaTeX-mode . ffap-latex-mode)      ; ditto
     ("\\.\\(tex\\|sty\\|doc\\|cls\\)\\'" . ffap-tex)
     ("\\.bib\\'" . ffap-bib)		; search ffap-bib-path
     ("\\`\\." . ffap-home)		; .emacs, .bashrc, .profile
@@ -1065,6 +1067,9 @@ ffap-string-at-point-mode-alist
     ;; (La)TeX: don't allow braces
     (latex-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
     (tex-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
+    ;; AUCTeX v14 counterparts:
+    (LaTeX-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
+    (plain-TeX-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
     ;; XML: don't allow angle brackets
     (xml-mode "--:\\\\${}+@-Z_[:alpha:]~*?#" "{<@" "@>;.,!:}")
     (nxml-mode "--:\\\\${}+@-Z_[:alpha:]~*?#" "{<@" "@>;.,!:}")
-- 
2.45.2

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Ikumi Keita]

Hi Arash,

>>>>> Arash Esbati <arash@gnu.org> writes:
>> It seems dubious to include `TeX-mode' here because it is used for only
>> a parent of other AUCTeX major modes and isn't meant for a major mode of
>> an actual buffer. Unless the user explicitly does M-x TeX-mode, no
>> buffers would be in `TeX-mode'.

> Yes, my fault, thanks for catching this.  Next try is attached.

It looks good to me with respect to AUCTeX. (If we are looking after
built-in TeX modes as well, entries for `plain-tex-mode' should also
be included, maybe.)

Regards,
Ikumi Keita
#StandWithUkraine #StopWarInUkraine
#Gaza #StopMassiveKilling #CeasefireNOW

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Arash Esbati]

Hi Keita,

Ikumi Keita <ikumi@ikumi.que.jp> writes:

> It looks good to me with respect to AUCTeX. (If we are looking after
> built-in TeX modes as well, entries for `plain-tex-mode' should also
> be included, maybe.)

I'm not sure, I thought `tex-mode' is a bit different than AUCTeX's
`TeX-mode':

,----[ C-h f tex-mode RET ]
| tex-mode is an autoloaded interactive native-comp-function in
| ‘tex-mode.el’.
| 
| (tex-mode)
| 
| Major mode for editing files of input for TeX, LaTeX, or SliTeX.
| This is the shared parent mode of several submodes.
| Tries to determine (by looking at the beginning of the file) whether
| this file is for plain TeX, LaTeX, or SliTeX and calls ‘plain-tex-mode’,
| ‘latex-mode’, or ‘slitex-mode’, accordingly.  If it cannot be determined,
| such as if there are no commands in the file, the value of ‘tex-default-mode’
| says which mode to use.
`----

`tex-mode' redirects to submodes via `tex--redirect-to-submode'.  I
think we ask the tex-mode.el maintainer.

@Stefan: Should the entries in ffap.el for `tex-mode' be replaced by
`plain-tex-mode' as well?

Best, Arash

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors]

> | Major mode for editing files of input for TeX, LaTeX, or SliTeX.
> | This is the shared parent mode of several submodes.
> | Tries to determine (by looking at the beginning of the file) whether
> | this file is for plain TeX, LaTeX, or SliTeX and calls ‘plain-tex-mode’,
> | ‘latex-mode’, or ‘slitex-mode’, accordingly.  If it cannot be determined,
> | such as if there are no commands in the file, the value of ‘tex-default-mode’
> | says which mode to use.
> `----
>
> `tex-mode' redirects to submodes via `tex--redirect-to-submode'.  I
> think we ask the tex-mode.el maintainer.
>
> @Stefan: Should the entries in ffap.el for `tex-mode' be replaced by
> `plain-tex-mode' as well?

No buffer should be in `tex-mode` (it's an "abstract" parent mode), so
AFAICT the current entry

    (tex-mode . ffap-tex-mode)		; search ffap-tex-path

in `ffap-alist` is not very useful.
So unless/until `ffap.el` is changed to pay attention to the modes'
hierarchy rather than just the value of `major-mode`, we should use
things like `plain-tex-mode`.


        Stefan

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Arash Esbati]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> So unless/until `ffap.el` is changed to pay attention to the modes'
> hierarchy rather than just the value of `major-mode`, we should use
> things like `plain-tex-mode`.

Thanks for the clarification.  Revised patch is attached.

Best, Arash

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-names-of-TeX-related-major-modes.patch --]
[-- Type: text/x-patch, Size: 1870 bytes --]

From cf6a14a51a9302770ffeb0cb0c78ae9de60d025e Mon Sep 17 00:00:00 2001
From: Arash Esbati <arash@gnu.org>
Date: Wed, 5 Jun 2024 21:37:43 +0200
Subject: [PATCH] Fix names of TeX-related major-modes

* lisp/ffap.el (ffap-alist, ffap-string-at-point-mode-alist): Add
entries for mode names introduced in AUCTeX v14.  Use
`plain-tex-mode' for built-in mode.  (bug#71376)
---
 lisp/ffap.el | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/ffap.el b/lisp/ffap.el
index b2b681b7c44..9fd753fc0e5 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -751,8 +751,10 @@ ffap-alist
     ("\\.\\([chCH]\\|cc\\|hh\\)\\'" . ffap-c-mode) ; stdio.h
     (fortran-mode . ffap-fortran-mode)
     ("\\.[fF]\\'" . ffap-fortran-mode)
-    (tex-mode . ffap-tex-mode)		; search ffap-tex-path
+    (plain-tex-mode . ffap-tex-mode)    ; search ffap-tex-path
     (latex-mode . ffap-latex-mode)	; similar
+    (plain-TeX-mode . ffap-tex-mode)    ; AUCTeX v14 counterpart
+    (LaTeX-mode . ffap-latex-mode)      ; ditto
     ("\\.\\(tex\\|sty\\|doc\\|cls\\)\\'" . ffap-tex)
     ("\\.bib\\'" . ffap-bib)		; search ffap-bib-path
     ("\\`\\." . ffap-home)		; .emacs, .bashrc, .profile
@@ -1064,7 +1066,10 @@ ffap-string-at-point-mode-alist
     (math-mode ",-:$+<>@-Z_[:lower:]~`" "<" "@>;.,!?`:")
     ;; (La)TeX: don't allow braces
     (latex-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
-    (tex-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
+    (plain-tex-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
+    ;; AUCTeX v14 counterparts:
+    (LaTeX-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
+    (plain-TeX-mode "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
     ;; XML: don't allow angle brackets
     (xml-mode "--:\\\\${}+@-Z_[:alpha:]~*?#" "{<@" "@>;.,!:}")
     (nxml-mode "--:\\\\${}+@-Z_[:alpha:]~*?#" "{<@" "@>;.,!:}")
-- 
2.45.2

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Ikumi Keita]

Hi Arash,

>>>>> Arash Esbati <arash@gnu.org> writes:
> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> So unless/until `ffap.el` is changed to pay attention to the modes'
>> hierarchy rather than just the value of `major-mode`, we should use
>> things like `plain-tex-mode`.

> Thanks for the clarification.  Revised patch is attached.

Now it looks good for me. ffap.el doesn't cover doctex and texinfo modes
yet, but it wouldn't count as major issue since there were no complaints
over the years.

Regards,
Ikumi Keita
#StandWithUkraine #StopWarInUkraine
#Gaza #StopMassiveKilling #CeasefireNOW

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Arash Esbati]

Hi Keita,

Ikumi Keita <ikumi@ikumi.que.jp> writes:

> Now it looks good for me. ffap.el doesn't cover doctex and texinfo modes
> yet, but it wouldn't count as major issue since there were no complaints
> over the years.

Thanks for confirming.

@Maintainers: Can I install the change?

Best, Arash

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Stefan Kangas]

Arash Esbati <arash@gnu.org> writes:

> @Maintainers: Can I install the change?

LGTM.

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Eli Zaretskii]

> Cc: Stefan Monnier <monnier@iro.umontreal.ca>,
>  Бабушкин Максим Владимирович
>  <maxbabushkin@gmail.com>, 71376@debbugs.gnu.org
> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Fri, 7 Jun 2024 11:10:07 +0200
> 
> Arash Esbati <arash@gnu.org> writes:
> 
> > @Maintainers: Can I install the change?
> 
> LGTM.

Yes, please go ahead, and close the bug after installing.

Thanks.

bug#71376: 14.0.5; find-file-at-point doesn't work in LaTeX-mode

[Arash Esbati]

Eli Zaretskii <eliz@gnu.org> writes:

> Yes, please go ahead, and close the bug after installing.

Thanks, installed, and closing.

Best, Arash