diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-13 15:46:16 -0700 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2017-09-17 00:09:11 -0400 |
commit | d4d7cda57f77e25e1806bf5e812caa87e8cd1462 (patch) | |
tree | f5f214aca4389e9057e20670f30f0c3c7fcc3e0a | |
parent | d3912e7f32dc2ac72dc026514fa14b33d969225a (diff) | |
download | org-mode-d4d7cda57f77e25e1806bf5e812caa87e8cd1462.tar.gz |
Backport commit 5da53a019 from Emacs
* lisp/org-info.el (org-info-other-documents)
(org-info-map-html-url):
* lisp/ox-html.el (org-html-creator-string): Use HTTPS instead of
HTTP.
Prefer HTTPS to HTTP for gnu.org
5da53a01912c2f5d46f5df4ef8cc13a34b5017d4
Paul Eggert
Wed Sep 13 15:54:25 2017 -0700
-rw-r--r-- | lisp/org-info.el | 10 | ||||
-rw-r--r-- | lisp/ox-html.el | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lisp/org-info.el b/lisp/org-info.el index a13903a..7f859f9 100644 --- a/lisp/org-info.el +++ b/lisp/org-info.el @@ -19,7 +19,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;; Commentary: @@ -92,11 +92,11 @@ "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper" "widget" "wisent" "woman") "List of emacs documents available. -Taken from <http://www.gnu.org/software/emacs/manual/html_mono/.>") +Taken from <https://www.gnu.org/software/emacs/manual/html_mono/.>") (defconst org-info-other-documents - '(("libc" . "http://www.gnu.org/software/libc/manual/html_mono/libc.html") - ("make" . "http://www.gnu.org/software/make/manual/make.html")) + '(("libc" . "https://www.gnu.org/software/libc/manual/html_mono/libc.html") + ("make" . "https://www.gnu.org/software/make/manual/make.html")) "Alist of documents generated from Texinfo source. When converting info links to HTML, links to any one of these manuals are converted to use these URL.") @@ -108,7 +108,7 @@ the official page for that document, e.g., use \"gnu.org\" for all Emacs related documents. Otherwise, append \".html\" extension to FILENAME. See `org-info-emacs-documents' and `org-info-other-documents' for details." (cond ((member filename org-info-emacs-documents) - (format "http://www.gnu.org/software/emacs/manual/html_mono/%s.html" + (format "https://www.gnu.org/software/emacs/manual/html_mono/%s.html" filename)) ((cdr (assoc filename org-info-other-documents))) (t (concat filename ".html")))) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 3f0f052..fb8c613 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -19,7 +19,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -1325,7 +1325,7 @@ like that: \"%%\"." :type 'string) (defcustom org-html-creator-string - (format "<a href=\"http://www.gnu.org/software/emacs/\">Emacs</a> %s (<a href=\"http://orgmode.org\">Org</a> mode %s)" + (format "<a href=\"https://www.gnu.org/software/emacs/\">Emacs</a> %s (<a href=\"http://orgmode.org\">Org</a> mode %s)" emacs-version (if (fboundp 'org-version) (org-version) "unknown version")) "Information about the creator of the HTML document. |