* net/tramp.el (tramp-read-passwd): Suspend the timers while reading

[bpt/emacs.git] / lisp / erc / ChangeLog.04

diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index 7db040f..07f2fa9 100644 (file)
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -136,7 +136,7 @@
 2004-12-14  Diane Murray  <disumu@x3y2z1.net>
 
        * erc.el: The last change to `erc-mode-line-format' introduced a
 2004-12-14  Diane Murray  <disumu@x3y2z1.net>
 
        * erc.el: The last change to `erc-mode-line-format' introduced a

-       bug in Xemacs - it can't handle the #(" "...) strings at all.  The
+       bug in XEmacs - it can't handle the #(" "...) strings at all.  The

        following changes fix the bug and simplify the mode-line handling
        considerably.  (erc-mode-line-format): Now defined as a string
        which will be formatted using `format-spec' and take the place of
        following changes fix the bug and simplify the mode-line handling
        considerably.  (erc-mode-line-format): Now defined as a string
        which will be formatted using `format-spec' and take the place of


@@ -491,7 +491,7 @@
        members has been made some time ago.  Clean up the various tries to
        do this in the past.
 
        members has been made some time ago.  Clean up the various tries to
        do this in the past.
 

-       erc-macs.el: Removed.  erc-members.el: Removed.
+       * erc-macs.el, erc-members.el: Removed.

 
 2004-08-10  Jorgen Schaefer  <forcer@users.sourceforge.net>
 
 
 2004-08-10  Jorgen Schaefer  <forcer@users.sourceforge.net>
 


@@ -1926,7 +1926,7 @@
 
        * erc.el: erc-send-whitespace-lines: New variable.
        (erc-send-current-line): Use erc-send-whitespace-lines.  Also,
 
        * erc.el: erc-send-whitespace-lines: New variable.
        (erc-send-current-line): Use erc-send-whitespace-lines.  Also,

-       removed superflous test for empty line in the mapc, since the
+       removed superfluous test for empty line in the mapc, since the

        blank line test should find all.  I do like to be able to send an
        empty line when i want to!
        (erc-send-current-line): Check for point being in input line
        blank line test should find all.  I do like to be able to send an
        empty line when i want to!
        (erc-send-current-line): Check for point being in input line


@@ -2072,7 +2072,7 @@
 
 See ChangeLog.03 for earlier changes.
 
 
 See ChangeLog.03 for earlier changes.
 

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

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


@@ -2092,4 +2092,3 @@ See ChangeLog.03 for earlier changes.
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:

-