mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Prefer HTTPS to HTTP for gnu.org

Browse source 
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.
This commit is contained in:
Paul Eggert 2017-09-13 15:46:16 -07:00
parent e7d6c62209
commit 5da53a0191
6 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.dir-locals.el
View file

@ -8,7 +8,7 @@
(log-edit-setup-add-author . t))) (log-edit-setup-add-author . t)))
(change-log-mode . ((add-log-time-zone-rule . t) (change-log-mode . ((add-log-time-zone-rule . t)
(fill-column . 74) (fill-column . 74)
(bug-reference-url-format . "http://debbugs.gnu.org/%s") (bug-reference-url-format . "https://debbugs.gnu.org/%s")
(mode . bug-reference))) (mode . bug-reference)))
(diff-mode . ((mode . whitespace))) (diff-mode . ((mode . whitespace)))
(emacs-lisp-mode . ((indent-tabs-mode . nil)))) (emacs-lisp-mode . ((indent-tabs-mode . nil))))

10
lisp/org/org-info.el
View file

@ -19,7 +19,7 @@
;; GNU General Public License for more details. ;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License ;; 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: ;;; Commentary:
@ -92,11 +92,11 @@
"smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper" "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper"
"widget" "wisent" "woman") "widget" "wisent" "woman")
"List of emacs documents available. "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 (defconst org-info-other-documents
'(("libc" . "http://www.gnu.org/software/libc/manual/html_mono/libc.html") '(("libc" . "https://www.gnu.org/software/libc/manual/html_mono/libc.html")
("make" . "http://www.gnu.org/software/make/manual/make.html")) ("make" . "https://www.gnu.org/software/make/manual/make.html"))
"Alist of documents generated from Texinfo source. "Alist of documents generated from Texinfo source.
When converting info links to HTML, links to any one of these manuals are When converting info links to HTML, links to any one of these manuals are
converted to use these URL.") 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. related documents. Otherwise, append \".html\" extension to FILENAME.
See `org-info-emacs-documents' and `org-info-other-documents' for details." See `org-info-emacs-documents' and `org-info-other-documents' for details."
(cond ((member filename org-info-emacs-documents) (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)) filename))
((cdr (assoc filename org-info-other-documents))) ((cdr (assoc filename org-info-other-documents)))
(t (concat filename ".html")))) (t (concat filename ".html"))))

4
lisp/org/ox-html.el
View file

@ -19,7 +19,7 @@
;; GNU General Public License for more details. ;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License ;; 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: ;;; Commentary:
@ -1318,7 +1318,7 @@ like that: \"%%\"."
:type 'string) :type 'string)
(defcustom org-html-creator-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 emacs-version
(if (fboundp 'org-version) (org-version) "unknown version")) (if (fboundp 'org-version) (org-version) "unknown version"))
"Information about the creator of the HTML document. "Information about the creator of the HTML document.

34
lisp/startup.el
View file

@ -20,7 +20,7 @@
;; GNU General Public License for more details. ;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License ;; 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: ;;; Commentary:
@ -1463,18 +1463,18 @@ If this is nil, no message will be displayed."
`((:face (variable-pitch font-lock-comment-face) `((:face (variable-pitch font-lock-comment-face)
"Welcome to " "Welcome to "
:link ("GNU Emacs" :link ("GNU Emacs"
,(lambda (_button) (browse-url "http://www.gnu.org/software/emacs/")) ,(lambda (_button) (browse-url "https://www.gnu.org/software/emacs/"))
"Browse http://www.gnu.org/software/emacs/") "Browse https://www.gnu.org/software/emacs/")
", one component of the " ", one component of the "
:link :link
,(lambda () ,(lambda ()
(if (eq system-type 'gnu/linux) (if (eq system-type 'gnu/linux)
`("GNU/Linux" `("GNU/Linux"
,(lambda (_button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html")) ,(lambda (_button) (browse-url "https://www.gnu.org/gnu/linux-and-gnu.html"))
"Browse http://www.gnu.org/gnu/linux-and-gnu.html") "Browse https://www.gnu.org/gnu/linux-and-gnu.html")
`("GNU" ,(lambda (_button) `("GNU" ,(lambda (_button)
(browse-url "http://www.gnu.org/gnu/thegnuproject.html")) (browse-url "https://www.gnu.org/gnu/thegnuproject.html"))
"Browse http://www.gnu.org/gnu/thegnuproject.html"))) "Browse https://www.gnu.org/gnu/thegnuproject.html")))
" operating system.\n\n" " operating system.\n\n"
:face variable-pitch :face variable-pitch
:link ("Emacs Tutorial" ,(lambda (_button) (help-with-tutorial))) :link ("Emacs Tutorial" ,(lambda (_button) (help-with-tutorial)))
@ -1506,8 +1506,8 @@ If this is nil, no message will be displayed."
"\n" "\n"
:link ("Emacs Guided Tour" :link ("Emacs Guided Tour"
,(lambda (_button) ,(lambda (_button)
(browse-url "http://www.gnu.org/software/emacs/tour/")) (browse-url "https://www.gnu.org/software/emacs/tour/"))
"Browse http://www.gnu.org/software/emacs/tour/") "Browse https://www.gnu.org/software/emacs/tour/")
"\tOverview of Emacs features at gnu.org\n" "\tOverview of Emacs features at gnu.org\n"
:link ("View Emacs Manual" ,(lambda (_button) (info-emacs-manual))) :link ("View Emacs Manual" ,(lambda (_button) (info-emacs-manual)))
"\tView the Emacs manual using Info\n" "\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) `((:face (variable-pitch font-lock-comment-face)
"This is " "This is "
:link ("GNU Emacs" :link ("GNU Emacs"
,(lambda (_button) (browse-url "http://www.gnu.org/software/emacs/")) ,(lambda (_button) (browse-url "https://www.gnu.org/software/emacs/"))
"Browse http://www.gnu.org/software/emacs/") "Browse https://www.gnu.org/software/emacs/")
", one component of the " ", one component of the "
:link :link
,(lambda () ,(lambda ()
(if (eq system-type 'gnu/linux) (if (eq system-type 'gnu/linux)
`("GNU/Linux" `("GNU/Linux"
,(lambda (_button) ,(lambda (_button)
(browse-url "http://www.gnu.org/gnu/linux-and-gnu.html")) (browse-url "https://www.gnu.org/gnu/linux-and-gnu.html"))
"Browse http://www.gnu.org/gnu/linux-and-gnu.html") "Browse https://www.gnu.org/gnu/linux-and-gnu.html")
`("GNU" ,(lambda (_button) (describe-gnu-project)) `("GNU" ,(lambda (_button) (describe-gnu-project))
"Display info on the GNU project."))) "Display info on the GNU project.")))
" operating system.\n" " operating system.\n"
@ -1597,8 +1597,8 @@ Each element in the list should be a list of strings or pairs
"\n" "\n"
:link ("Emacs Guided Tour" :link ("Emacs Guided Tour"
,(lambda (_button) ,(lambda (_button)
(browse-url "http://www.gnu.org/software/emacs/tour/")) (browse-url "https://www.gnu.org/software/emacs/tour/"))
"Browse http://www.gnu.org/software/emacs/tour/") "Browse https://www.gnu.org/software/emacs/tour/")
"\tSee an overview of Emacs features at gnu.org")) "\tSee an overview of Emacs features at gnu.org"))
"A list of texts to show in the middle part of the About screen. "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 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. ;; Insert the image with a help-echo and a link.
(make-button (prog1 (point) (insert-image img)) (point) (make-button (prog1 (point) (insert-image img)) (point)
'face 'default 'face 'default
'help-echo "mouse-2, RET: Browse http://www.gnu.org/" 'help-echo "mouse-2, RET: Browse https://www.gnu.org/"
'action (lambda (_button) (browse-url "http://www.gnu.org/")) 'action (lambda (_button) (browse-url "https://www.gnu.org/"))
'follow-link t) 'follow-link t)
(insert "\n\n"))))) (insert "\n\n")))))

8
test/lisp/ffap-tests.el
View file

@ -17,7 +17,7 @@
;; GNU General Public License for more details. ;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License ;; 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: ;;; Commentary:
@ -28,7 +28,7 @@
(require 'ffap) (require 'ffap)
(ert-deftest ffap-tests-25243 () (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"))) (let ((file (make-temp-file "test-Bug#25243")))
(unwind-protect (unwind-protect
(with-temp-file file (with-temp-file file
@ -72,12 +72,12 @@ Host = example.com\n")
left alone when opening a URL in an external browser." left alone when opening a URL in an external browser."
(cl-letf* ((old (current-window-configuration)) (cl-letf* ((old (current-window-configuration))
((symbol-function 'ffap-prompter) ((symbol-function 'ffap-prompter)
(lambda () "http://www.gnu.org")) (lambda () "https://www.gnu.org"))
(urls nil) (urls nil)
(ffap-url-fetcher (lambda (url) (push url urls) nil))) (ffap-url-fetcher (lambda (url) (push url urls) nil)))
(should-not (ffap-other-window)) (should-not (ffap-other-window))
(should (equal (current-window-configuration) old)) (should (equal (current-window-configuration) old))
(should (equal urls '("http://www.gnu.org"))))) (should (equal urls '("https://www.gnu.org")))))
(provide 'ffap-tests) (provide 'ffap-tests)

32
test/lisp/thingatpt-tests.el
View file

@ -15,23 +15,23 @@
;; GNU General Public License for more details. ;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License ;; 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: ;;; Code:
(require 'ert) (require 'ert)
(defvar thing-at-point-test-data (defvar thing-at-point-test-data
'(("http://1.gnu.org" 1 url "http://1.gnu.org") '(("https://1.gnu.org" 1 url "https://1.gnu.org")
("http://2.gnu.org" 6 url "http://2.gnu.org") ("https://2.gnu.org" 6 url "https://2.gnu.org")
("http://3.gnu.org" 19 url "http://3.gnu.org") ("https://3.gnu.org" 19 url "https://3.gnu.org")
("https://4.gnu.org" 1 url "https://4.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") ("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 https://5.gnu.org now." 5 url nil)
("Visit http://6.gnu.org now." 7 url "http://6.gnu.org") ("Visit https://6.gnu.org now." 7 url "https://6.gnu.org")
("Visit http://7.gnu.org now." 22 url "http://7.gnu.org") ("Visit https://7.gnu.org now." 22 url "https://7.gnu.org")
("Visit http://8.gnu.org now." 22 url "http://8.gnu.org") ("Visit https://8.gnu.org now." 22 url "https://8.gnu.org")
("Visit http://9.gnu.org now." 24 url nil) ("Visit https://9.gnu.org now." 25 url nil)
;; Invalid URIs ;; Invalid URIs
("<<<<" 2 url nil) ("<<<<" 2 url nil)
("<>" 1 url nil) ("<>" 1 url nil)
@ -48,13 +48,13 @@
("Url: <url:foo://2.example.com>..." 30 url "foo://2.example.com") ("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") ("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. ;; 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 https://www.gnu.org, for details" 7 url "https://www.gnu.org")
("Go to http://www.gnu.org." 24 url "http://www.gnu.org") ("Go to https://www.gnu.org." 24 url "https://www.gnu.org")
;; Standard URI delimiters ;; Standard URI delimiters
("Go to \"http://10.gnu.org\"." 8 url "http://10.gnu.org") ("Go to \"https://10.gnu.org\"." 8 url "https://10.gnu.org")
("Go to \"http://11.gnu.org/\"." 26 url "http://11.gnu.org/") ("Go to \"https://11.gnu.org/\"." 26 url "https://11.gnu.org/")
("Go to <http://12.gnu.org> now." 8 url "http://12.gnu.org") ("Go to <https://12.gnu.org> now." 8 url "https://12.gnu.org")
("Go to <http://13.gnu.org> now." 24 url "http://13.gnu.org") ("Go to <https://13.gnu.org> now." 24 url "https://13.gnu.org")
;; Parenthesis handling (non-standard) ;; Parenthesis handling (non-standard)
("http://example.com/a(b)c" 21 url "http://example.com/a(b)c") ("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)") ("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 ;; These tests reflect the actual behavior of
;; `thing-at-point-bounds-of-list-at-point'. ;; `thing-at-point-bounds-of-list-at-point'.
(ert-deftest thing-at-point-bug24627 () (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)) (let ((string-result '(("(a \"b\" c)" . (a "b" c))
(";(a \"b\" c)") (";(a \"b\" c)")
("(a \"b\" c\n)" . (a "b" c)) ("(a \"b\" c\n)" . (a "b" c))