* lisp/erc/erc.el (erc-accidental-paste-threshold-seconds): Doc tweak.

* etc/NEWS: Related markup.

diff --git a/etc/NEWS b/etc/NEWS
index dfba6da980cfe657cb1be302131325011f5eb97d..230b94e2fe9c6443b2ada399d8d985c7ae438727 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -512,6 +512,7 @@ that means: when one of the recipients of the message being encrypted
 is `foo@bar.com', ignore that name as regards encryption.
 This is useful to avoid a query when you have no key for that name.
 
+---
 ** New ERC option `erc-accidental-paste-threshold-seconds'.
 If set to a number, this can be used to avoid accidentally pasting large
 amounts of data into the ERC input.

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 39c749838e579ad2f4430fb00fcda0aa579ec0d2..8d0fc723f14c9b4a9de30754170b5ca5be21a05a 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-31  Glenn Morris  <rgm@gnu.org>
+
+       * erc.el (erc-accidental-paste-threshold-seconds): Doc tweak.
+
 2014-01-25  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
        * erc.el (erc): Link to info manual.

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index c19b8c9a48e999b37f24e5b03fca8a1b85d2b81e..102818c18b5a0724dc1c11dc5dcf5e2ba5b72b22 100644 (file)
--- 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.")
 
 (defcustom erc-accidental-paste-threshold-seconds nil
   "Minimum time, in seconds, before sending new lines via IRC.
-If the value is a number, `erc-send-current-line' signals an
-error if its previous invocation was less than this much time
-ago.  This is useful so that if you accidentally enter large
-amounts of text into the ERC buffer, that text is not sent to the
-IRC server.
+If the value is a number, `erc-send-current-line' signals an error
+if its previous invocation was fewer than this many seconds ago.
+This is useful so that if you accidentally enter large amounts of text
+into the ERC buffer, that text is not sent to the IRC server.
 
 If the value is nil, `erc-send-current-line' always considers any
 submitted line to be intentional."