[AUCTeX-devel] [gmane.emacs.auctex.diffs] GNU AUCTeX branch, master, updated. bbe53ede992fda3046c74daf16f22b93e944b749

[Arash Esbati]

Hi Keita,

Reg. this patch:

--8<---------------cut here---------------start------------->8---
commit c893152ae30fe4330a79e430fee1f41bbaba3e96
Author: Ikumi Keita <address@hidden>
Date:   Sat Dec 8 23:23:23 2018 +0900

    Redefine support for \url in hyperref
    
    * style/hyperref.el ("hyperref"): Override the entry for \url macro in
    url.el because hyperref.sty redefines the macro.

diff --git a/style/hyperref.el b/style/hyperref.el
index 6361a9b..ade5494 100644
--- a/style/hyperref.el
+++ b/style/hyperref.el
@@ -226,6 +226,8 @@
    (TeX-add-symbols
     '("hypersetup" (TeX-arg-key-val LaTeX-hyperref-package-options-list))
     '("href" [ (TeX-arg-key-val LaTeX-hyperref-href-options) ] "URL" "Text")
+    ;; Supply dummy arg `ignore' to override the entry in url.el.
+    '("url" "URL" ignore)
     '("nolinkurl" t)
     '("hyperbaseurl" t)
     '("hyperimage" "Image URL" "Text")
--8<---------------cut here---------------end--------------->8---

What do think if we change url.el to take care of this entirely?  On
LaTeX side, hyperref.sty loads url.sty and redefines the macro.  This
can be reflected in the 2 styles like this:

--8<---------------cut here---------------start------------->8---
diff --git a/style/hyperref.el b/style/hyperref.el
index ade54945..0b124ff2 100644
--- a/style/hyperref.el
+++ b/style/hyperref.el
@@ -227,7 +227,7 @@
     '("hypersetup" (TeX-arg-key-val LaTeX-hyperref-package-options-list))
     '("href" [ (TeX-arg-key-val LaTeX-hyperref-href-options) ] "URL" "Text")
     ;; Supply dummy arg `ignore' to override the entry in url.el.
-    '("url" "URL" ignore)
+    ;; '("url" "URL" ignore)
     '("nolinkurl" t)
     '("hyperbaseurl" t)
     '("hyperimage" "Image URL" "Text")
diff --git a/style/url.el b/style/url.el
index 24d94417..55a733d0 100644
--- a/style/url.el
+++ b/style/url.el
@@ -56,12 +56,18 @@
     "UrlRight"
     "UrlSpecials"
     '("path" (TeX-arg-verb-delim-or-brace "Path"))
-    '("url" (TeX-arg-verb-delim-or-brace "Url"))
+    '("url" (TeX-arg-conditional (member "hyperref" (TeX-style-list))
+                                ("Url")
+                              ((TeX-arg-verb-delim-or-brace "Url"))))
     "urldef"
     '("urlstyle" TeX-arg-urlstyle))

    (add-to-list 'LaTeX-verbatim-macros-with-delims-local "path")
-   (add-to-list 'LaTeX-verbatim-macros-with-delims-local "url")
+   ;; hyperref.el has some code to remove "url" from
+   ;; `LaTeX-verbatim-macros-with-delims-local', but we check here as
+   ;; well if "hyperref" is already loaded:
+   (unless (member "hyperref" (TeX-style-list))
+     (add-to-list 'LaTeX-verbatim-macros-with-delims-local "url"))
    (add-to-list 'LaTeX-verbatim-macros-with-braces-local "path")
    (add-to-list 'LaTeX-verbatim-macros-with-braces-local "url")
--8<---------------cut here---------------end--------------->8---

Best, Arash