[TMP] enable load_prefer_newer

[bpt/emacs.git] / etc / ERC-NEWS

diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 17bf4fc..dbd4811 100644 (file)
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,8 +1,10 @@
 ERC NEWS                                                       -*- outline -*-
 
 ERC NEWS                                                       -*- outline -*-
 

-Copyright (C) 2006-2011  Free Software Foundation, Inc.
+Copyright (C) 2006-2014 Free Software Foundation, Inc.

 See the end of the file for license conditions.
 
 See the end of the file for license conditions.
 

+* For changes after ERC 5.3, see the main Emacs NEWS file
+

 * Changes in ERC 5.3
 
 ** New function `erc-tls' is to be used for connecting to a server via TLS.
 * Changes in ERC 5.3
 
 ** New function `erc-tls' is to be used for connecting to a server via TLS.


@@ -852,7 +854,7 @@ Only the macros in cl-macs.el are used.
 ** If possible, re-use channel buffers when reconnecting to a server.
 
 ** Text in ERC buffers is now read-only by default.
 ** If possible, re-use channel buffers when reconnecting to a server.
 
 ** Text in ERC buffers is now read-only by default.

-To get the previous behavior, 
+To get the previous behavior,

 
 ** Changes and additions to modules
 
 
 ** Changes and additions to modules
 


@@ -1279,8 +1281,8 @@ in XEmacs.
 ** The module system has again changed a lot.  You can now customize
   the variable `erc-modules' and define once and for all which
   extension modules you want to use.  This unfortunately may require
 ** The module system has again changed a lot.  You can now customize
   the variable `erc-modules' and define once and for all which
   extension modules you want to use.  This unfortunately may require

-  you to change your current erc initialisation code a bit, if you
-  have some existing customsations.  On the other hand, this change
+  you to change your current erc initialization code a bit, if you
+  have some existing customizations.  On the other hand, this change

   makes the configuration of extension modules a lot easier for new
   users.  In theory, you should be able to configure all aspects of
   ERC by using the customize interface, you should no longer really
   makes the configuration of extension modules a lot easier for new
   users.  In theory, you should be able to configure all aspects of
   ERC by using the customize interface, you should no longer really


@@ -1342,4 +1344,3 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

-