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

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

diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index a1cbab740be95a84918ad956298875aa545081d0..0d0e17f5d4f65c9b1db7a1911a89e078565fe8f0 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
-       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
@@ -1926,7 +1926,7 @@
 
        * 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
@@ -2072,7 +2072,7 @@
 
 See ChangeLog.03 for earlier changes.
 
-    Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+       Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -2092,5 +2092,3 @@ See ChangeLog.03 for earlier changes.
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
-
-;; arch-tag: cc606d2d-635b-4b36-829b-a50e3c51e2d1