aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2021-03-20 07:48:51 +0100
committerStefan Kangas2021-03-20 10:00:28 +0100
commit990e748cd0354dc905bc27b7f0052850002ef98b (patch)
tree48275c1964af7d9f0a1d58eddb18cffb3f678995
parentf6d7e2e8f9a28ae545f4d8a48df103488b297226 (diff)
downloademacs-990e748cd0354dc905bc27b7f0052850002ef98b.tar.gz
emacs-990e748cd0354dc905bc27b7f0052850002ef98b.zip
Prefer https and fix broken links in ERC
* lisp/erc/erc-button.el (erc-button-rfc-url) (erc-button-search-url): Prefer https. * lisp/erc/erc-capab.el: * lisp/erc/erc.el (erc-cmd-MODE): Fix broken links.
-rw-r--r--lisp/erc/erc-button.el11
-rw-r--r--lisp/erc/erc-capab.el4
-rw-r--r--lisp/erc/erc.el2
3 files changed, 9 insertions, 8 deletions
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 8b13d1cf49c..044776c2363 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -105,18 +105,19 @@ longer than `erc-fill-column'."
105 "Flag indicating whether nicks should be buttonized or not." 105 "Flag indicating whether nicks should be buttonized or not."
106 :type 'boolean) 106 :type 'boolean)
107 107
108(defcustom erc-button-rfc-url "http://www.faqs.org/rfcs/rfc%s.html" 108(defcustom erc-button-rfc-url "https://tools.ietf.org/html/rfc%s"
109 "URL used to browse rfc references. 109 "URL used to browse RFC references.
110%s is replaced by the number." 110%s is replaced by the number."
111 :type 'string) 111 :type 'string
112 :version "28.1")
112 113
113(define-obsolete-variable-alias 'erc-button-google-url 114(define-obsolete-variable-alias 'erc-button-google-url
114 'erc-button-search-url "27.1") 115 'erc-button-search-url "27.1")
115 116
116(defcustom erc-button-search-url "http://duckduckgo.com/?q=%s" 117(defcustom erc-button-search-url "https://duckduckgo.com/?q=%s"
117 "URL used to search for a term. 118 "URL used to search for a term.
118%s is replaced by the search string." 119%s is replaced by the search string."
119 :version "27.1" 120 :version "28.1"
120 :type 'string) 121 :type 'string)
121 122
122(defcustom erc-button-alist 123(defcustom erc-button-alist
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index 2028917da0c..19bc2dbb8ec 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -40,8 +40,8 @@
40;; disable this module, it will continue removing message flags, but the 40;; disable this module, it will continue removing message flags, but the
41;; unidentified nickname prefix will not be added to messages. 41;; unidentified nickname prefix will not be added to messages.
42 42
43;; Visit <http://freenode.net/faq.shtml#spoofing> and 43;; Visit <https://freenode.net/kb/answer/cloaks> and
44;; <http://freenode.net/faq.shtml#registering> to find further 44;; <https://freenode.net/kb/answer/registration> to find further
45;; explanations of this capability. 45;; explanations of this capability.
46 46
47;; From freenode.net's web site (not there anymore) on how to mark 47;; From freenode.net's web site (not there anymore) on how to mark
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index bdb1914d7bf..b6dea95bb2b 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3389,7 +3389,7 @@ to send.
3389If only one word is given, display the mode of that target. 3389If only one word is given, display the mode of that target.
3390 3390
3391A list of valid mode strings for Freenode may be found at 3391A list of valid mode strings for Freenode may be found at
3392URL `http://freenode.net/using_the_network.shtml'." 3392URL `https://freenode.net/kb/all'."
3393 (cond 3393 (cond
3394 ((string-match "^\\s-\\(.*\\)$" line) 3394 ((string-match "^\\s-\\(.*\\)$" line)
3395 (let ((s (match-string 1 line))) 3395 (let ((s (match-string 1 line)))