aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
authorStefan Kangas2020-10-24 20:22:33 +0200
committerStefan Kangas2020-10-24 20:23:27 +0200
commitdd16e46bb9d0099baea06d780ad8f62728addc2e (patch)
tree11cdd1aa9078700dab40855d90e690ca292fa16f /lisp/erc
parent10e7c76ee3e263a7691745d9384bae475c2f5c86 (diff)
downloademacs-dd16e46bb9d0099baea06d780ad8f62728addc2e.tar.gz
emacs-dd16e46bb9d0099baea06d780ad8f62728addc2e.zip
; Prefer https to http in more URLs
These were all tested and confirmed working.
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog.12
-rw-r--r--lisp/erc/erc-backend.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1
index 90bd8bd09ee..fdf51954684 100644
--- a/lisp/erc/ChangeLog.1
+++ b/lisp/erc/ChangeLog.1
@@ -9116,7 +9116,7 @@
91162002-11-10 Alex Schroeder <alex@gnu.org> 91162002-11-10 Alex Schroeder <alex@gnu.org>
9117 9117
9118 * TODO: 9118 * TODO:
9119 TODO: moved it to http://www.emacswiki.org/cgi-bin/wiki.pl?ErcTODO 9119 TODO: moved it to https://www.emacswiki.org/cgi-bin/wiki.pl?ErcTODO
9120 9120
9121 * erc.el(with-erc-channel-buffer): Rudimentary doc string. 9121 * erc.el(with-erc-channel-buffer): Rudimentary doc string.
9122 9122
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 1cf0bb49217..f99088d4c78 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -408,7 +408,7 @@ This string is processed using `format-time-string'."
408;;; Flood-related 408;;; Flood-related
409 409
410;; Most of this is courtesy of Jorgen Schaefer and Circe 410;; Most of this is courtesy of Jorgen Schaefer and Circe
411;; (http://www.nongnu.org/circe) 411;; (https://www.nongnu.org/circe)
412 412
413(defcustom erc-server-flood-margin 10 413(defcustom erc-server-flood-margin 10
414 "A margin on how much excess data we send. 414 "A margin on how much excess data we send.