From 23dc6d0ccdbe5d0638f9c3498bd64ffbf0606107 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 30 Jan 2014 22:39:51 -0800 Subject: [PATCH] * lisp/erc/erc.el (erc-accidental-paste-threshold-seconds): Doc tweak. * etc/NEWS: Related markup. --- etc/NEWS | 1 + lisp/erc/ChangeLog | 4 ++++ lisp/erc/erc.el | 9 ++++----- 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 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 39c749838e5..8d0fc723f14 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2014-01-31 Glenn Morris + + * erc.el (erc-accidental-paste-threshold-seconds): Doc tweak. + 2014-01-25 Rüdiger Sonderfeld * 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." -- 2.39.2