Merge from origin/emacs-24

0077b36 # NEWS copyedits
3ca2ff3 * lisp/erc/erc.el (erc-rename-buffers): Doc fix.  Add :version.
b85523f * lisp/textmodes/flyspell.el (flyspell-duplicate-distance):
decb48d Augment text-mode syntax table for a few special characters
8b3ba7a Improve docs of transient-mark-mode  (Bug#19841)
72fd047 NEWS: Add section to include ERC changes
a7254bb Improve string search in `flyspell-word-search-*`. (Bug#16800)

Conflicts:
	etc/ChangeLog
	etc/NEWS
	lisp/ChangeLog
	lisp/erc/ChangeLog
	src/ChangeLog

2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 4c1c8432733..f89d5a2d043 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-03  Glenn Morris  <rgm@gnu.org>
+
+        * erc.el (erc-rename-buffers): Doc fix.  Add :version.
+
+2015-03-03  Dima Kogan  <dima@secretsauce.net>
+
+        * erc-backend.el (define-erc-response-handler): Give hook-name
+        default value of nil and add-to-list (bug#19363).
 2015-02-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * erc-spelling.el (erc-spelling-init):
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 7b9a3eb8620..e2366a1b58f 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -197,7 +197,8 @@ parameters and authentication."
          (set sym (if (functionp val) (funcall val) val))))
 
 (defcustom erc-rename-buffers nil
-  "When this is set to t, buffers will be renamed to network name if available"
+  "Non-nil means rename buffers with network name, if available."
+  :version "24.5"
   :group 'erc
   :type 'boolean)
 
@@ -1148,6 +1149,7 @@ which the local user typed."
   "Faces for ERC."
   :group 'erc)
 
+;; FIXME faces should not end in "-face".
 (defface erc-default-face '((t))
   "ERC default face."
   :group 'erc-faces)