[Emacs-diffs] trunk r116217: * lisp/erc/erc.el (erc-accidental-paste-threshold-seconds): Doc tweak.

[Glenn Morris]

------------------------------------------------------------
revno: 116217
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2014-01-30 22:39:51 -0800
message:
  * lisp/erc/erc.el (erc-accidental-paste-threshold-seconds): Doc tweak.
  
  * etc/NEWS: Related markup.
modified:
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/erc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-4305
  lisp/erc/erc.el                erc.el-20091113204419-o5vbwnq5f7feedwu-4346

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-01-31 06:34:44 +0000
+++ b/etc/NEWS  2014-01-31 06:39:51 +0000
@@ -512,6 +512,7 @@
 is address@hidden', 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.

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2014-01-25 19:15:42 +0000
+++ b/lisp/erc/ChangeLog        2014-01-31 06:39:51 +0000
@@ -1,3 +1,7 @@
+2014-01-31  Glenn Morris  <address@hidden>
+
+       * erc.el (erc-accidental-paste-threshold-seconds): Doc tweak.
+
 2014-01-25  Rüdiger Sonderfeld  <address@hidden>
 
        * erc.el (erc): Link to info manual.

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-01-25 19:15:42 +0000
+++ b/lisp/erc/erc.el   2014-01-31 06:39:51 +0000
@@ -5190,11 +5190,10 @@
 
 (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."