diff options
| author | Paul Eggert | 2017-09-13 15:46:16 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-09-13 15:54:25 -0700 |
| commit | 5da53a01912c2f5d46f5df4ef8cc13a34b5017d4 (patch) | |
| tree | 63f91a55c570c93b20c9362019ada9241a677d7e /lisp | |
| parent | e7d6c622090dd2f4c77fbd04aba89c30a75514dd (diff) | |
| download | emacs-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')
| -rw-r--r-- | lisp/org/org-info.el | 10 | ||||
| -rw-r--r-- | lisp/org/ox-html.el | 4 | ||||
| -rw-r--r-- | lisp/startup.el | 34 |
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 @@ | |||
| 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. |
| 95 | Taken from <http://www.gnu.org/software/emacs/manual/html_mono/.>") | 95 | Taken 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. |
| 101 | When converting info links to HTML, links to any one of these manuals are | 101 | When converting info links to HTML, links to any one of these manuals are |
| 102 | converted to use these URL.") | 102 | converted to use these URL.") |
| @@ -108,7 +108,7 @@ the official page for that document, e.g., use \"gnu.org\" for all Emacs | |||
| 108 | related documents. Otherwise, append \".html\" extension to FILENAME. | 108 | related documents. Otherwise, append \".html\" extension to FILENAME. |
| 109 | See `org-info-emacs-documents' and `org-info-other-documents' for details." | 109 | See `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. |
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 @@ | |||
| 20 | ;; GNU General Public License for more details. | 20 | ;; GNU General Public License for more details. |
| 21 | 21 | ||
| 22 | ;; You should have received a copy of the GNU General Public License | 22 | ;; You should have received a copy of the GNU General Public License |
| 23 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 23 | ;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. |
| 24 | 24 | ||
| 25 | ;;; Commentary: | 25 | ;;; Commentary: |
| 26 | 26 | ||
| @@ -1463,18 +1463,18 @@ If this is nil, no message will be displayed." | |||
| 1463 | `((:face (variable-pitch font-lock-comment-face) | 1463 | `((:face (variable-pitch font-lock-comment-face) |
| 1464 | "Welcome to " | 1464 | "Welcome to " |
| 1465 | :link ("GNU Emacs" | 1465 | :link ("GNU Emacs" |
| 1466 | ,(lambda (_button) (browse-url "http://www.gnu.org/software/emacs/")) | 1466 | ,(lambda (_button) (browse-url "https://www.gnu.org/software/emacs/")) |
| 1467 | "Browse http://www.gnu.org/software/emacs/") | 1467 | "Browse https://www.gnu.org/software/emacs/") |
| 1468 | ", one component of the " | 1468 | ", one component of the " |
| 1469 | :link | 1469 | :link |
| 1470 | ,(lambda () | 1470 | ,(lambda () |
| 1471 | (if (eq system-type 'gnu/linux) | 1471 | (if (eq system-type 'gnu/linux) |
| 1472 | `("GNU/Linux" | 1472 | `("GNU/Linux" |
| 1473 | ,(lambda (_button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html")) | 1473 | ,(lambda (_button) (browse-url "https://www.gnu.org/gnu/linux-and-gnu.html")) |
| 1474 | "Browse http://www.gnu.org/gnu/linux-and-gnu.html") | 1474 | "Browse https://www.gnu.org/gnu/linux-and-gnu.html") |
| 1475 | `("GNU" ,(lambda (_button) | 1475 | `("GNU" ,(lambda (_button) |
| 1476 | (browse-url "http://www.gnu.org/gnu/thegnuproject.html")) | 1476 | (browse-url "https://www.gnu.org/gnu/thegnuproject.html")) |
| 1477 | "Browse http://www.gnu.org/gnu/thegnuproject.html"))) | 1477 | "Browse https://www.gnu.org/gnu/thegnuproject.html"))) |
| 1478 | " operating system.\n\n" | 1478 | " operating system.\n\n" |
| 1479 | :face variable-pitch | 1479 | :face variable-pitch |
| 1480 | :link ("Emacs Tutorial" ,(lambda (_button) (help-with-tutorial))) | 1480 | :link ("Emacs Tutorial" ,(lambda (_button) (help-with-tutorial))) |
| @@ -1506,8 +1506,8 @@ If this is nil, no message will be displayed." | |||
| 1506 | "\n" | 1506 | "\n" |
| 1507 | :link ("Emacs Guided Tour" | 1507 | :link ("Emacs Guided Tour" |
| 1508 | ,(lambda (_button) | 1508 | ,(lambda (_button) |
| 1509 | (browse-url "http://www.gnu.org/software/emacs/tour/")) | 1509 | (browse-url "https://www.gnu.org/software/emacs/tour/")) |
| 1510 | "Browse http://www.gnu.org/software/emacs/tour/") | 1510 | "Browse https://www.gnu.org/software/emacs/tour/") |
| 1511 | "\tOverview of Emacs features at gnu.org\n" | 1511 | "\tOverview of Emacs features at gnu.org\n" |
| 1512 | :link ("View Emacs Manual" ,(lambda (_button) (info-emacs-manual))) | 1512 | :link ("View Emacs Manual" ,(lambda (_button) (info-emacs-manual))) |
| 1513 | "\tView the Emacs manual using Info\n" | 1513 | "\tView the Emacs manual using Info\n" |
| @@ -1529,16 +1529,16 @@ Each element in the list should be a list of strings or pairs | |||
| 1529 | `((:face (variable-pitch font-lock-comment-face) | 1529 | `((:face (variable-pitch font-lock-comment-face) |
| 1530 | "This is " | 1530 | "This is " |
| 1531 | :link ("GNU Emacs" | 1531 | :link ("GNU Emacs" |
| 1532 | ,(lambda (_button) (browse-url "http://www.gnu.org/software/emacs/")) | 1532 | ,(lambda (_button) (browse-url "https://www.gnu.org/software/emacs/")) |
| 1533 | "Browse http://www.gnu.org/software/emacs/") | 1533 | "Browse https://www.gnu.org/software/emacs/") |
| 1534 | ", one component of the " | 1534 | ", one component of the " |
| 1535 | :link | 1535 | :link |
| 1536 | ,(lambda () | 1536 | ,(lambda () |
| 1537 | (if (eq system-type 'gnu/linux) | 1537 | (if (eq system-type 'gnu/linux) |
| 1538 | `("GNU/Linux" | 1538 | `("GNU/Linux" |
| 1539 | ,(lambda (_button) | 1539 | ,(lambda (_button) |
| 1540 | (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html")) | 1540 | (browse-url "https://www.gnu.org/gnu/linux-and-gnu.html")) |
| 1541 | "Browse http://www.gnu.org/gnu/linux-and-gnu.html") | 1541 | "Browse https://www.gnu.org/gnu/linux-and-gnu.html") |
| 1542 | `("GNU" ,(lambda (_button) (describe-gnu-project)) | 1542 | `("GNU" ,(lambda (_button) (describe-gnu-project)) |
| 1543 | "Display info on the GNU project."))) | 1543 | "Display info on the GNU project."))) |
| 1544 | " operating system.\n" | 1544 | " operating system.\n" |
| @@ -1597,8 +1597,8 @@ Each element in the list should be a list of strings or pairs | |||
| 1597 | "\n" | 1597 | "\n" |
| 1598 | :link ("Emacs Guided Tour" | 1598 | :link ("Emacs Guided Tour" |
| 1599 | ,(lambda (_button) | 1599 | ,(lambda (_button) |
| 1600 | (browse-url "http://www.gnu.org/software/emacs/tour/")) | 1600 | (browse-url "https://www.gnu.org/software/emacs/tour/")) |
| 1601 | "Browse http://www.gnu.org/software/emacs/tour/") | 1601 | "Browse https://www.gnu.org/software/emacs/tour/") |
| 1602 | "\tSee an overview of Emacs features at gnu.org")) | 1602 | "\tSee an overview of Emacs features at gnu.org")) |
| 1603 | "A list of texts to show in the middle part of the About screen. | 1603 | "A list of texts to show in the middle part of the About screen. |
| 1604 | Each element in the list should be a list of strings or pairs | 1604 | Each element in the list should be a list of strings or pairs |
| @@ -1706,8 +1706,8 @@ a face or button specification." | |||
| 1706 | ;; Insert the image with a help-echo and a link. | 1706 | ;; Insert the image with a help-echo and a link. |
| 1707 | (make-button (prog1 (point) (insert-image img)) (point) | 1707 | (make-button (prog1 (point) (insert-image img)) (point) |
| 1708 | 'face 'default | 1708 | 'face 'default |
| 1709 | 'help-echo "mouse-2, RET: Browse http://www.gnu.org/" | 1709 | 'help-echo "mouse-2, RET: Browse https://www.gnu.org/" |
| 1710 | 'action (lambda (_button) (browse-url "http://www.gnu.org/")) | 1710 | 'action (lambda (_button) (browse-url "https://www.gnu.org/")) |
| 1711 | 'follow-link t) | 1711 | 'follow-link t) |
| 1712 | (insert "\n\n"))))) | 1712 | (insert "\n\n"))))) |
| 1713 | 1713 | ||