[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/auctex 3b5cea2 56/67: Improve completion for \url betwe
From: |
Tassilo Horn |
Subject: |
[elpa] externals/auctex 3b5cea2 56/67: Improve completion for \url between url.el and hyperref.el |
Date: |
Fri, 8 Feb 2019 11:40:40 -0500 (EST) |
branch: externals/auctex
commit 3b5cea28deb31ec53182d80cccadd40b103457a2
Author: Arash Esbati <address@hidden>
Commit: Arash Esbati <address@hidden>
Improve completion for \url between url.el and hyperref.el
* style/hyperref.el ("hyperref"): Comment the entry for "url"
since the completion is provided via url.el.
* style/url.el ("url"): Add a conditional to "url" in order to
check if hyperref.el is loaded and then supply the argument in
braces.
Also check for hyperref.el. before adding "url" to
`LaTeX-verbatim-macros-with-delims-local'.
---
style/hyperref.el | 5 +++--
style/url.el | 12 ++++++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/style/hyperref.el b/style/hyperref.el
index ade5494..5ee8b31 100644
--- a/style/hyperref.el
+++ b/style/hyperref.el
@@ -226,8 +226,9 @@
(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)
+ ;; Completion for \url is provided via url.el. Hence the entry in
+ ;; this style is commented:
+ ;; '("url" "URL" ignore)
'("nolinkurl" t)
'("hyperbaseurl" t)
'("hyperimage" "Image URL" "Text")
diff --git a/style/url.el b/style/url.el
index 24d9441..1f856af 100644
--- a/style/url.el
+++ b/style/url.el
@@ -56,12 +56,20 @@
"UrlRight"
"UrlSpecials"
'("path" (TeX-arg-verb-delim-or-brace "Path"))
- '("url" (TeX-arg-verb-delim-or-brace "Url"))
+ ;; "hyperref" redefines \url so that the argument is only in
+ ;; braces. We check here if hyperref is loaded:
+ '("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")
- [elpa] externals/auctex 993326c 40/67: ; Silence the compiler in styles for `font-latex-syntactic-keywords-extra', (continued)
- [elpa] externals/auctex 993326c 40/67: ; Silence the compiler in styles for `font-latex-syntactic-keywords-extra', Tassilo Horn, 2019/02/08
- [elpa] externals/auctex a4576a1 49/67: ; * tex.el (TeX-math-toggle-off-input-method): Fix doc string., Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 9c42b43 52/67: Use ASCII apostrophe in code expample, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 49c71f9 44/67: ; Silence the compiler in styles for `LaTeX-x?color-definecolor-list', Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 4fed4a7 64/67: Remove combatibility code for older emasen, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex de3b5f7 47/67: ; * doc/preview-latex.texi (preview-cache-preamble): Use @url{}., Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 449ec06 43/67: ; Silence the compiler in styles for `reftex-compile-variables', Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 761ffc3 27/67: Remove compatibility code for older emacsen, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 33329c3 57/67: ; * doc/auctex.texi (Completion): Fix typo., Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 2c73857 51/67: ; * style/pst-plot.el (LaTeX-pstplot-cleanup): Fix typo., Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 3b5cea2 56/67: Improve completion for \url between url.el and hyperref.el,
Tassilo Horn <=
- [elpa] externals/auctex bbe53ed 53/67: Fix document, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 6e8aa67 41/67: ; Silence the compiler in styles for `font-latex-add-quotes', Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 5147a27 48/67: Revise description about CJK support, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex f319b9f 60/67: Override some bindings in `TeX-mode-map' in Texinfo mode, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex ca16d88 59/67: Update style/enumitem.el to package version 3.6, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 38d39a6 31/67: Remove compatibility face, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 9ae66cd 33/67: Remove TeX-replace-regexp-in-string, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 9d8369a 39/67: ; Silence the compiler in styles for `font-latex-update-font-lock', Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 5827aeb 34/67: Remove TeX-mark-active, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex c893152 50/67: Redefine support for \url in hyperref, Tassilo Horn, 2019/02/08