From 5da53a01912c2f5d46f5df4ef8cc13a34b5017d4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 13 Sep 2017 15:46:16 -0700 Subject: [PATCH] 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. --- .dir-locals.el | 2 +- lisp/org/org-info.el | 10 +++++----- lisp/org/ox-html.el | 4 ++-- lisp/startup.el | 34 +++++++++++++++++----------------- test/lisp/ffap-tests.el | 8 ++++---- test/lisp/thingatpt-tests.el | 32 ++++++++++++++++---------------- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 8a4a348ebd4..a3705f4d93c 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -8,7 +8,7 @@ (log-edit-setup-add-author . t))) (change-log-mode . ((add-log-time-zone-rule . t) (fill-column . 74) - (bug-reference-url-format . "http://debbugs.gnu.org/%s") + (bug-reference-url-format . "https://debbugs.gnu.org/%s") (mode . bug-reference))) (diff-mode . ((mode . whitespace))) (emacs-lisp-mode . ((indent-tabs-mode . nil)))) 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 @@ ;; 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 . +;; along with GNU Emacs. If not, see . ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;; Commentary: @@ -92,11 +92,11 @@ "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper" "widget" "wisent" "woman") "List of emacs documents available. -Taken from ") +Taken from ") (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/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 @@ ;; 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 . +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -1318,7 +1318,7 @@ like that: \"%%\"." :type 'string) (defcustom org-html-creator-string - (format "Emacs %s (Org mode %s)" + (format "Emacs %s (Org mode %s)" emacs-version (if (fboundp 'org-version) (org-version) "unknown version")) "Information about the creator of the HTML document. diff --git a/lisp/startup.el b/lisp/startup.el index 0fbba1bea23..7cf6fee4252 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -20,7 +20,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 . +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -1463,18 +1463,18 @@ If this is nil, no message will be displayed." `((:face (variable-pitch font-lock-comment-face) "Welcome to " :link ("GNU Emacs" - ,(lambda (_button) (browse-url "http://www.gnu.org/software/emacs/")) - "Browse http://www.gnu.org/software/emacs/") + ,(lambda (_button) (browse-url "https://www.gnu.org/software/emacs/")) + "Browse https://www.gnu.org/software/emacs/") ", one component of the " :link ,(lambda () (if (eq system-type 'gnu/linux) `("GNU/Linux" - ,(lambda (_button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html")) - "Browse http://www.gnu.org/gnu/linux-and-gnu.html") + ,(lambda (_button) (browse-url "https://www.gnu.org/gnu/linux-and-gnu.html")) + "Browse https://www.gnu.org/gnu/linux-and-gnu.html") `("GNU" ,(lambda (_button) - (browse-url "http://www.gnu.org/gnu/thegnuproject.html")) - "Browse http://www.gnu.org/gnu/thegnuproject.html"))) + (browse-url "https://www.gnu.org/gnu/thegnuproject.html")) + "Browse https://www.gnu.org/gnu/thegnuproject.html"))) " operating system.\n\n" :face variable-pitch :link ("Emacs Tutorial" ,(lambda (_button) (help-with-tutorial))) @@ -1506,8 +1506,8 @@ If this is nil, no message will be displayed." "\n" :link ("Emacs Guided Tour" ,(lambda (_button) - (browse-url "http://www.gnu.org/software/emacs/tour/")) - "Browse http://www.gnu.org/software/emacs/tour/") + (browse-url "https://www.gnu.org/software/emacs/tour/")) + "Browse https://www.gnu.org/software/emacs/tour/") "\tOverview of Emacs features at gnu.org\n" :link ("View Emacs Manual" ,(lambda (_button) (info-emacs-manual))) "\tView the Emacs manual using Info\n" @@ -1529,16 +1529,16 @@ Each element in the list should be a list of strings or pairs `((:face (variable-pitch font-lock-comment-face) "This is " :link ("GNU Emacs" - ,(lambda (_button) (browse-url "http://www.gnu.org/software/emacs/")) - "Browse http://www.gnu.org/software/emacs/") + ,(lambda (_button) (browse-url "https://www.gnu.org/software/emacs/")) + "Browse https://www.gnu.org/software/emacs/") ", one component of the " :link ,(lambda () (if (eq system-type 'gnu/linux) `("GNU/Linux" ,(lambda (_button) - (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html")) - "Browse http://www.gnu.org/gnu/linux-and-gnu.html") + (browse-url "https://www.gnu.org/gnu/linux-and-gnu.html")) + "Browse https://www.gnu.org/gnu/linux-and-gnu.html") `("GNU" ,(lambda (_button) (describe-gnu-project)) "Display info on the GNU project."))) " operating system.\n" @@ -1597,8 +1597,8 @@ Each element in the list should be a list of strings or pairs "\n" :link ("Emacs Guided Tour" ,(lambda (_button) - (browse-url "http://www.gnu.org/software/emacs/tour/")) - "Browse http://www.gnu.org/software/emacs/tour/") + (browse-url "https://www.gnu.org/software/emacs/tour/")) + "Browse https://www.gnu.org/software/emacs/tour/") "\tSee an overview of Emacs features at gnu.org")) "A list of texts to show in the middle part of the About screen. Each element in the list should be a list of strings or pairs @@ -1706,8 +1706,8 @@ a face or button specification." ;; Insert the image with a help-echo and a link. (make-button (prog1 (point) (insert-image img)) (point) 'face 'default - 'help-echo "mouse-2, RET: Browse http://www.gnu.org/" - 'action (lambda (_button) (browse-url "http://www.gnu.org/")) + 'help-echo "mouse-2, RET: Browse https://www.gnu.org/" + 'action (lambda (_button) (browse-url "https://www.gnu.org/")) 'follow-link t) (insert "\n\n"))))) diff --git a/test/lisp/ffap-tests.el b/test/lisp/ffap-tests.el index 1862c6c3277..0b90d640364 100644 --- a/test/lisp/ffap-tests.el +++ b/test/lisp/ffap-tests.el @@ -17,7 +17,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 . +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -28,7 +28,7 @@ (require 'ffap) (ert-deftest ffap-tests-25243 () - "Test for http://debbugs.gnu.org/25243 ." + "Test for https://debbugs.gnu.org/25243 ." (let ((file (make-temp-file "test-Bug#25243"))) (unwind-protect (with-temp-file file @@ -72,12 +72,12 @@ Host = example.com\n") left alone when opening a URL in an external browser." (cl-letf* ((old (current-window-configuration)) ((symbol-function 'ffap-prompter) - (lambda () "http://www.gnu.org")) + (lambda () "https://www.gnu.org")) (urls nil) (ffap-url-fetcher (lambda (url) (push url urls) nil))) (should-not (ffap-other-window)) (should (equal (current-window-configuration) old)) - (should (equal urls '("http://www.gnu.org"))))) + (should (equal urls '("https://www.gnu.org"))))) (provide 'ffap-tests) diff --git a/test/lisp/thingatpt-tests.el b/test/lisp/thingatpt-tests.el index 128534264e5..aeee3b52de9 100644 --- a/test/lisp/thingatpt-tests.el +++ b/test/lisp/thingatpt-tests.el @@ -15,23 +15,23 @@ ;; 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 . +;; along with GNU Emacs. If not, see . ;;; Code: (require 'ert) (defvar thing-at-point-test-data - '(("http://1.gnu.org" 1 url "http://1.gnu.org") - ("http://2.gnu.org" 6 url "http://2.gnu.org") - ("http://3.gnu.org" 19 url "http://3.gnu.org") + '(("https://1.gnu.org" 1 url "https://1.gnu.org") + ("https://2.gnu.org" 6 url "https://2.gnu.org") + ("https://3.gnu.org" 19 url "https://3.gnu.org") ("https://4.gnu.org" 1 url "https://4.gnu.org") ("A geo URI (geo:3.14159,-2.71828)." 12 url "geo:3.14159,-2.71828") - ("Visit http://5.gnu.org now." 5 url nil) - ("Visit http://6.gnu.org now." 7 url "http://6.gnu.org") - ("Visit http://7.gnu.org now." 22 url "http://7.gnu.org") - ("Visit http://8.gnu.org now." 22 url "http://8.gnu.org") - ("Visit http://9.gnu.org now." 24 url nil) + ("Visit https://5.gnu.org now." 5 url nil) + ("Visit https://6.gnu.org now." 7 url "https://6.gnu.org") + ("Visit https://7.gnu.org now." 22 url "https://7.gnu.org") + ("Visit https://8.gnu.org now." 22 url "https://8.gnu.org") + ("Visit https://9.gnu.org now." 25 url nil) ;; Invalid URIs ("<<<<" 2 url nil) ("<>" 1 url nil) @@ -48,13 +48,13 @@ ("Url: ..." 30 url "foo://2.example.com") ("Url: ..." 20 url "foo://www.gnu.org/a bc") ;; Hack used by thing-at-point: drop punctuation at end of URI. - ("Go to http://www.gnu.org, for details" 7 url "http://www.gnu.org") - ("Go to http://www.gnu.org." 24 url "http://www.gnu.org") + ("Go to https://www.gnu.org, for details" 7 url "https://www.gnu.org") + ("Go to https://www.gnu.org." 24 url "https://www.gnu.org") ;; Standard URI delimiters - ("Go to \"http://10.gnu.org\"." 8 url "http://10.gnu.org") - ("Go to \"http://11.gnu.org/\"." 26 url "http://11.gnu.org/") - ("Go to now." 8 url "http://12.gnu.org") - ("Go to now." 24 url "http://13.gnu.org") + ("Go to \"https://10.gnu.org\"." 8 url "https://10.gnu.org") + ("Go to \"https://11.gnu.org/\"." 26 url "https://11.gnu.org/") + ("Go to now." 8 url "https://12.gnu.org") + ("Go to now." 24 url "https://13.gnu.org") ;; Parenthesis handling (non-standard) ("http://example.com/a(b)c" 21 url "http://example.com/a(b)c") ("http://example.com/a(b)" 21 url "http://example.com/a(b)") @@ -87,7 +87,7 @@ position to retrieve THING.") ;; These tests reflect the actual behavior of ;; `thing-at-point-bounds-of-list-at-point'. (ert-deftest thing-at-point-bug24627 () - "Test for http://debbugs.gnu.org/24627 ." + "Test for https://debbugs.gnu.org/24627 ." (let ((string-result '(("(a \"b\" c)" . (a "b" c)) (";(a \"b\" c)") ("(a \"b\" c\n)" . (a "b" c)) -- 2.11.4.GIT