Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 382-398)

   - Update from CVS
   - Update from erc--emacs--22
   - Fix ERC bug introduced in last patch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 123-125)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-101

1 files changed, 38 insertions, 0 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 0129bd43976..72754aa1cd3 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,41 @@
+2006-08-13  Romain Francoise  <romain@orebokech.com>
+
+        * erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p'
+        prompt with a space.
+
+2006-08-07  Michael Olson  <mwolson@gnu.org>
+
+        * erc-backend.el (erc-process-sentinel-1): Use erc-display-message
+        in several places instead of inserting text.
+        (erc-process-sentinel): Move to the input-marker before removing
+        the prompt.
+
+        * erc.el (erc-port): Fix customization options.
+        (erc-display-message): Handle null type explicitly.  Previously,
+        this was relying on a chance side-effect.  Cosmetic indentation
+        tweak.
+        (english): Add 'finished and 'terminated entries to the catalog.
+        Add initial and terminal newlines to 'disconnected and
+        'disconnected-noreconnect entries.  Avoid long lines.
+
+2006-08-06  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
+        multi-tty Emacs.
+        (erc-select-startup-file): Fix bug introduced by recent change.
+
+2006-08-05  Michael Olson  <mwolson@gnu.org>
+
+        * erc-log.el (erc-log-standardize-name): New function that returns
+        a filename that is safe for use for a log file.
+        (erc-current-logfile): Use it.
+
+        * erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
+        since that is a fairly standard directory.
+        (erc-select-startup-file): Re-write to use
+        convert-standard-filename, which will ensure that MS-DOS systems
+        look for the _ercrc.el file.
+
 2006-08-02  Michael Olson  <mwolson@gnu.org>
 
         * erc.el (erc-version-string): Release ERC 5.1.4.