aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org
diff options
context:
space:
mode:
authorPaul Eggert2017-09-13 15:46:16 -0700
committerPaul Eggert2017-09-13 15:54:25 -0700
commit5da53a01912c2f5d46f5df4ef8cc13a34b5017d4 (patch)
tree63f91a55c570c93b20c9362019ada9241a677d7e /lisp/org
parente7d6c622090dd2f4c77fbd04aba89c30a75514dd (diff)
downloademacs-5da53a01912c2f5d46f5df4ef8cc13a34b5017d4.tar.gz
emacs-5da53a01912c2f5d46f5df4ef8cc13a34b5017d4.zip
Prefer HTTPS to HTTP for gnu.org
This patch just changes code files; a followup companion patch (much larger) will affect the commentary. This part is separated out to make it easier to review. * .dir-locals.el (change-log-mode): * lisp/org/org-info.el (org-info-other-documents) (org-info-map-html-url): * lisp/org/ox-html.el (org-html-creator-string): * lisp/startup.el (fancy-startup-text, fancy-about-text) (fancy-splash-head): * test/lisp/ffap-tests.el (ffap-other-window--bug-25352): * test/lisp/thingatpt-tests.el (thing-at-point-test-data): Use HTTPS instead of HTTP.
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/org-info.el10
-rw-r--r--lisp/org/ox-html.el4
2 files changed, 7 insertions, 7 deletions
diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index 79b9bcc3d96..088e0c7aa73 100644
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -19,7 +19,7 @@
19;; GNU General Public License for more details. 19;; GNU General Public License for more details.
20 20
21;; You should have received a copy of the GNU General Public License 21;; You should have received a copy of the GNU General Public License
22;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 22;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
23;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 23;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
24;; 24;;
25;;; Commentary: 25;;; Commentary:
@@ -92,11 +92,11 @@
92 "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper" 92 "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper"
93 "widget" "wisent" "woman") 93 "widget" "wisent" "woman")
94 "List of emacs documents available. 94 "List of emacs documents available.
95Taken from <http://www.gnu.org/software/emacs/manual/html_mono/.>") 95Taken from <https://www.gnu.org/software/emacs/manual/html_mono/.>")
96 96
97(defconst org-info-other-documents 97(defconst org-info-other-documents
98 '(("libc" . "http://www.gnu.org/software/libc/manual/html_mono/libc.html") 98 '(("libc" . "https://www.gnu.org/software/libc/manual/html_mono/libc.html")
99 ("make" . "http://www.gnu.org/software/make/manual/make.html")) 99 ("make" . "https://www.gnu.org/software/make/manual/make.html"))
100 "Alist of documents generated from Texinfo source. 100 "Alist of documents generated from Texinfo source.
101When converting info links to HTML, links to any one of these manuals are 101When converting info links to HTML, links to any one of these manuals are
102converted to use these URL.") 102converted to use these URL.")
@@ -108,7 +108,7 @@ the official page for that document, e.g., use \"gnu.org\" for all Emacs
108related documents. Otherwise, append \".html\" extension to FILENAME. 108related documents. Otherwise, append \".html\" extension to FILENAME.
109See `org-info-emacs-documents' and `org-info-other-documents' for details." 109See `org-info-emacs-documents' and `org-info-other-documents' for details."
110 (cond ((member filename org-info-emacs-documents) 110 (cond ((member filename org-info-emacs-documents)
111 (format "http://www.gnu.org/software/emacs/manual/html_mono/%s.html" 111 (format "https://www.gnu.org/software/emacs/manual/html_mono/%s.html"
112 filename)) 112 filename))
113 ((cdr (assoc filename org-info-other-documents))) 113 ((cdr (assoc filename org-info-other-documents)))
114 (t (concat filename ".html")))) 114 (t (concat filename ".html"))))
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index aeb38ebc102..aec4efc4ca6 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -19,7 +19,7 @@
19;; GNU General Public License for more details. 19;; GNU General Public License for more details.
20 20
21;; You should have received a copy of the GNU General Public License 21;; You should have received a copy of the GNU General Public License
22;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 22;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
23 23
24;;; Commentary: 24;;; Commentary:
25 25
@@ -1318,7 +1318,7 @@ like that: \"%%\"."
1318 :type 'string) 1318 :type 'string)
1319 1319
1320(defcustom org-html-creator-string 1320(defcustom org-html-creator-string
1321 (format "<a href=\"http://www.gnu.org/software/emacs/\">Emacs</a> %s (<a href=\"http://orgmode.org\">Org</a> mode %s)" 1321 (format "<a href=\"https://www.gnu.org/software/emacs/\">Emacs</a> %s (<a href=\"http://orgmode.org\">Org</a> mode %s)"
1322 emacs-version 1322 emacs-version
1323 (if (fboundp 'org-version) (org-version) "unknown version")) 1323 (if (fboundp 'org-version) (org-version) "unknown version"))
1324 "Information about the creator of the HTML document. 1324 "Information about the creator of the HTML document.