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, 27 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 99a74f942f2..9c11e18fb69 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-03  Kelvin White  <kwhite@gnu.org>
+
+        * NEWS: Add section to include ERC changes
+
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 2015-03-02  Daniel Colascione  <dancol@dancol.org>
 
         * NEWS: Mention finalizers.
diff --git a/etc/NEWS b/etc/NEWS
index a94c4caac64..8509cc0030f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -25,8 +25,11 @@ otherwise leave it unmarked.
 * Installation Changes in Emacs 25.1
 
 +++
+
 ** Building Emacs now requires C99 or later.
 
+** The variable `redisplay-dont-pause' is obsolete.
+
 ** Building Emacs now requires GNU make, version 3.81 or later.
 
 +++
@@ -40,9 +43,28 @@ should be able to work around the problem either by porting the Emacs
 undumping code to GCC under IRIX, or by configuring --with-wide-int,
 or by sticking with Emacs 24.4.
 
+** ERC
+
 ** 'configure' now prefers gnustep-config when configuring GNUstep.
 If gnustep-config is not available, the old heuristics are used.
 
++++
+*** New option `erc-rename-buffers'.
+
+---
+*** New faces `erc-my-nick-prefix-face' and `erc-nick-prefix-face'.
+
++++
+*** `erc-format-@nick' displays all user modes instead of only op and voice.
+
+---
+*** The display of irc commands in the current buffer has been disabled.
+
+---
+*** `erc-version' now follows the Emacs version.
+
+** Obsolete packages
+
 ---
 *** cc-compat.el