aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS1
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/erc/erc.el9
3 files changed, 9 insertions, 5 deletions
diff --git a/etc/NEWS b/etc/NEWS
index dfba6da980c..230b94e2fe9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -512,6 +512,7 @@ that means: when one of the recipients of the message being encrypted
512is `foo@bar.com', ignore that name as regards encryption. 512is `foo@bar.com', ignore that name as regards encryption.
513This is useful to avoid a query when you have no key for that name. 513This is useful to avoid a query when you have no key for that name.
514 514
515---
515** New ERC option `erc-accidental-paste-threshold-seconds'. 516** New ERC option `erc-accidental-paste-threshold-seconds'.
516If set to a number, this can be used to avoid accidentally pasting large 517If set to a number, this can be used to avoid accidentally pasting large
517amounts of data into the ERC input. 518amounts of data into the ERC input.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 39c749838e5..8d0fc723f14 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
12014-01-31 Glenn Morris <rgm@gnu.org>
2
3 * erc.el (erc-accidental-paste-threshold-seconds): Doc tweak.
4
12014-01-25 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de> 52014-01-25 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de>
2 6
3 * erc.el (erc): Link to info manual. 7 * erc.el (erc): Link to info manual.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index c19b8c9a48e..102818c18b5 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5190,11 +5190,10 @@ If that function has never been called, the value is 0.")
5190 5190
5191(defcustom erc-accidental-paste-threshold-seconds nil 5191(defcustom erc-accidental-paste-threshold-seconds nil
5192 "Minimum time, in seconds, before sending new lines via IRC. 5192 "Minimum time, in seconds, before sending new lines via IRC.
5193If the value is a number, `erc-send-current-line' signals an 5193If the value is a number, `erc-send-current-line' signals an error
5194error if its previous invocation was less than this much time 5194if its previous invocation was fewer than this many seconds ago.
5195ago. This is useful so that if you accidentally enter large 5195This is useful so that if you accidentally enter large amounts of text
5196amounts of text into the ERC buffer, that text is not sent to the 5196into the ERC buffer, that text is not sent to the IRC server.
5197IRC server.
5198 5197
5199If the value is nil, `erc-send-current-line' always considers any 5198If the value is nil, `erc-send-current-line' always considers any
5200submitted line to be intentional." 5199submitted line to be intentional."