summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-09-13 15:46:16 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-09-13 15:54:25 -0700
commit5da53a01912c2f5d46f5df4ef8cc13a34b5017d4 (patch)
tree63f91a55c570c93b20c9362019ada9241a677d7e /lisp
parente7d6c622090dd2f4c77fbd04aba89c30a75514dd (diff)
downloademacs-5da53a01912c2f5d46f5df4ef8cc13a34b5017d4.tar.gz
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')
-rw-r--r--lisp/org/org-info.el10
-rw-r--r--lisp/org/ox-html.el4
-rw-r--r--lisp/startup.el34
3 files changed, 24 insertions, 24 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 @@
;; 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/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 <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.
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 <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")))))