* lisp/vc/diff-mode.el (diff-refine-changed): Rename from

[gnu-emacs] / lisp / erc / erc.el

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 15ff0e5737e14d1a9bbad3dc586260a9820b75f9..d93e9e02156b3b444f76f45e27431a3aca9ed743 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1,6 +1,6 @@
 ;; erc.el --- An Emacs Internet Relay Chat client  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 ;; Author: Alexander L. Belikoff (alexander@belikoff.net)
 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),
@@ -9,7 +9,7 @@
 ;;               Andreas Fuchs (afs@void.at)
 ;;               Gergely Nagy (algernon@midgard.debian.net)
 ;;               David Edmondson (dme@dme.org)
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, chat, client, Internet
 ;; Version: 5.3
 
@@ -81,6 +81,7 @@
 (defgroup erc nil
   "Emacs Internet Relay Chat client."
   :link '(url-link "http://www.emacswiki.org/cgi-bin/wiki/ERC")
+  :link '(custom-manual "(erc) Top")
   :prefix "erc-"
   :group 'applications)
 
@@ -5189,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."