diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 9 |
2 files changed, 8 insertions, 5 deletions
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 @@ +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 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.") (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." |