* net/tramp.el (tramp-ssh-controlmaster-template): Make it a

[gnu-emacs] / lisp / erc / ChangeLog.05

diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05
index 2236c21099d8a9f769e69be971ca4ff44fd0b659..f5f6f616f0cda6175d0cd3408db9fb26b38d6e0c 100644 (file)
--- a/lisp/erc/ChangeLog.05
+++ b/lisp/erc/ChangeLog.05
@@ -698,7 +698,7 @@
        (erc-with-all-buffers-of-server, with-erc-channel-buffer): Add
        edebug-form-spec.
 
        (erc-with-all-buffers-of-server, with-erc-channel-buffer): Add
        edebug-form-spec.
 

-       * erc-compat (erc-define-minor-mode): Ditto.
+       * erc-compat.el (erc-define-minor-mode): Ditto.

 
 2005-03-29  Jorgen Schaefer  <forcer@forcix.cx>
 
 
 2005-03-29  Jorgen Schaefer  <forcer@forcix.cx>
 


@@ -831,7 +831,7 @@
        `require-final-newline'.
 
        * erc-viper.el: New file. This is where all ERC/Viper
        `require-final-newline'.
 
        * erc-viper.el: New file. This is where all ERC/Viper

-       compatiibilty code should live. When and if ERC is bundled with
+       compatibility code should live. When and if ERC is bundled with

        Emacs, some of the hacks in this file should be merged into Viper
        itself.
 
        Emacs, some of the hacks in this file should be merged into Viper
        itself.
 


@@ -1050,7 +1050,7 @@
        XEmacs). The new function `erc-modified-channels-object' is used
        to generate updated values for the same-named variable.
 
        XEmacs). The new function `erc-modified-channels-object' is used
        to generate updated values for the same-named variable.
 

-2005-01-08  Diane Murray <disumu@x3y2z1.net>
+2005-01-08  Diane Murray  <disumu@x3y2z1.net>

 
        * ChangeLog.2002: Changed instances of my sourceforge username and
        email address to real name and email.
 
        * ChangeLog.2002: Changed instances of my sourceforge username and
        email address to real name and email.


@@ -1124,7 +1124,7 @@
        * NEWS: Use 3rd level heading instead of bullets for lists that
        contain descriptions.
 
        * NEWS: Use 3rd level heading instead of bullets for lists that
        contain descriptions.
 

-2005-01-07  Diane Murray <disumu@x3y2z1.net>
+2005-01-07  Diane Murray  <disumu@x3y2z1.net>

 
        * erc-list.el: Require 'sort.
        (erc-chanlist): Disable undo in the channel list buffer.
 
        * erc-list.el: Require 'sort.
        (erc-chanlist): Disable undo in the channel list buffer.


@@ -1180,7 +1180,7 @@
        policy toward ChangeLog entries, which is that they should be
        manually updated whenever a change is committed.
 
        policy toward ChangeLog entries, which is that they should be
        manually updated whenever a change is committed.
 

-2005-01-04  Diane Murray <disumu@x3y2z1.net>
+2005-01-04  Diane Murray  <disumu@x3y2z1.net>

 
        * erc.el (erc-connection-established, erc-login): Update the
        mode-line.
 
        * erc.el (erc-connection-established, erc-login): Update the
        mode-line.


@@ -1189,11 +1189,11 @@
        `mode-line-process' to ":connecting" while the connection is being
        established.
 
        `mode-line-process' to ":connecting" while the connection is being
        established.
 

-2005-01-04  Lawrence Mitchell <wence@gmx.li>
+2005-01-04  Lawrence Mitchell  <wence@gmx.li>

 
        * AUTHORS: Update list of authors.
 
 
        * AUTHORS: Update list of authors.
 

-2005-01-02  Diane Murray <disumu@x3y2z1.net>
+2005-01-02  Diane Murray  <disumu@x3y2z1.net>

 
        * erc-goodies.el (erc-control-characters): New customization
        group.
 
        * erc-goodies.el (erc-control-characters): New customization
        group.


@@ -1217,7 +1217,7 @@
 
 See ChangeLog.04 for earlier changes.
 
 
 See ChangeLog.04 for earlier changes.
 

-    Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+       Copyright (C) 2005-2013 Free Software Foundation, Inc.

 
   This file is part of GNU Emacs.
 
 
   This file is part of GNU Emacs.
 


@@ -1238,4 +1238,3 @@ See ChangeLog.04 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
 ;; coding: utf-8
 ;; End:
 

-;; arch-tag: 70f1733a-3e2f-43c2-91c3-d9ace93f82ba