aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorGlenn Morris2014-01-30 22:39:51 -0800
committerGlenn Morris2014-01-30 22:39:51 -0800
commit23dc6d0ccdbe5d0638f9c3498bd64ffbf0606107 (patch)
treef20e32155869be79e924b28663db233836d30f61 /etc
parentfbb764b8bc037b7d91b9e84d70f245d5e6daed89 (diff)
downloademacs-23dc6d0ccdbe5d0638f9c3498bd64ffbf0606107.tar.gz
emacs-23dc6d0ccdbe5d0638f9c3498bd64ffbf0606107.zip
* lisp/erc/erc.el (erc-accidental-paste-threshold-seconds): Doc tweak.
* etc/NEWS: Related markup.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS1
1 files changed, 1 insertions, 0 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.