summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-09-22 23:53:39 -0700
committerKyle Meyer <kyle@kyleam.com>2019-09-29 15:47:58 -0400
commite3090573be8754e4bf9851c67e1aba2480cc3873 (patch)
tree3b73fed8c8e98b409d5eb8c6b79cf40cc179add7
parent97feee0469850f8387b91e79f104f874bcac6575 (diff)
downloadorg-mode-e3090573be8754e4bf9851c67e1aba2480cc3873.tar.gz
Backport commit 946a56a10 from Emacs
* lisp/org.el (org-doi-server-url): Prefer https: to http: un URLs. Update some URLs 946a56a10fed769646a8b7c4ebc53f53c84be896 Paul Eggert Mon Sep 23 00:12:52 2019 -0700 Notes(km): - It's not mentioned in 946a56a10's message, but that commit also drops the dx subdomain, an "earlier syntax which continues to be supported" according to https://www.doi.org/factsheets/DOI_PURL.html. - 946a56a10 replaced a link in the manual with https://api.uva.nl/ (which the previous link redirects to). Here we instead use the replacement link from master's f4083eefd (manual: Fix URL, 2019-06-01).
-rw-r--r--doc/org-manual.org2
-rw-r--r--lisp/org.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org
index d4b1aa9..50f6ad8 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -3160,7 +3160,7 @@ External links are URL-like locators. They start with a short
identifying string followed by a colon. There can be no space after
the colon. The following list shows examples for each link type.
-| =http://www.astro.uva.nl/=dominik= | on the web |
+| =https://staff.science.uva.nl/c.dominik/= | on the web |
| =doi:10.1000/182= | DOI for an electronic resource |
| =file:/home/dominik/images/jupiter.jpg= | file, absolute path |
| =/home/dominik/images/jupiter.jpg= | same as above |
diff --git a/lisp/org.el b/lisp/org.el
index e32aabe..2cea47d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -2378,7 +2378,7 @@ For more examples, see the system specific constants
(string :tag "Command")
(function :tag "Function")))))
-(defcustom org-doi-server-url "http://dx.doi.org/"
+(defcustom org-doi-server-url "https://doi.org/"
"The URL of the DOI server."
:type 'string
:version "24.3"