Commit 5da53a01 authored by Paul Eggert's avatar Paul Eggert

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.
parent e7d6c622
......@@ -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))))
......@@ -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"))))
......
......@@ -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:
......@@ -1318,7 +1318,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.
......
......@@ -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 <http://www.gnu.org/licenses/>.
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; 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")))))
......
......@@ -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 <http://www.gnu.org/licenses/>.
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; 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)
......
......@@ -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 <http://www.gnu.org/licenses/>.
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; 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: <url:foo://2.example.com>..." 30 url "foo://2.example.com")
("Url: <url:foo://www.gnu.org/a bc>..." 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 <http://12.gnu.org> now." 8 url "http://12.gnu.org")
("Go to <http://13.gnu.org> 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 <https://12.gnu.org> now." 8 url "https://12.gnu.org")
("Go to <https://13.gnu.org> 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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment