aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Oteiza2017-02-17 18:38:09 -0500
committerMark Oteiza2017-02-17 18:38:09 -0500
commit071680b734f54733614e355ce4b89bd2300a632b (patch)
tree6301e52cfbf6f31fa17f1c061db4afe1af67ab09
parent9f9863e50298a3506165cc1f056ab3238f37cb9f (diff)
downloademacs-071680b734f54733614e355ce4b89bd2300a632b.tar.gz
emacs-071680b734f54733614e355ce4b89bd2300a632b.zip
Enable erc-accidental-paste-threshold-seconds by default
* lisp/erc/erc.el (erc-accidental-paste-threshold-seconds): Set default to 0.2 (Bug#25709).
-rw-r--r--lisp/erc/erc.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 751bcde7009..488404d7341 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5331,7 +5331,7 @@ Specifically, return the position of `erc-insert-marker'."
5331 "Time of last call to `erc-send-current-line'. 5331 "Time of last call to `erc-send-current-line'.
5332If that function has never been called, the value is 0.") 5332If that function has never been called, the value is 0.")
5333 5333
5334(defcustom erc-accidental-paste-threshold-seconds nil 5334(defcustom erc-accidental-paste-threshold-seconds 0.2
5335 "Minimum time, in seconds, before sending new lines via IRC. 5335 "Minimum time, in seconds, before sending new lines via IRC.
5336If the value is a number, `erc-send-current-line' signals an error 5336If the value is a number, `erc-send-current-line' signals an error
5337if its previous invocation was fewer than this many seconds ago. 5337if its previous invocation was fewer than this many seconds ago.
@@ -5341,7 +5341,7 @@ into the ERC buffer, that text is not sent to the IRC server.
5341If the value is nil, `erc-send-current-line' always considers any 5341If the value is nil, `erc-send-current-line' always considers any
5342submitted line to be intentional." 5342submitted line to be intentional."
5343 :group 'erc 5343 :group 'erc
5344 :version "24.4" 5344 :version "26.1"
5345 :type '(choice number (other :tag "disabled" nil))) 5345 :type '(choice number (other :tag "disabled" nil)))
5346 5346
5347(defun erc-send-current-line () 5347(defun erc-send-current-line ()