# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1154936617 0
# Node ID ddc702799326a5861f22f1fa0e347d8829ad7f5a
# Parent  0bacf06559e2870e126e40d776638a677681f623
Fix ERC bug introduced in last patch

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-387
Creator:  Michael Olson <mwolson@gnu.org>

diff -r 0bacf06559e2 -r ddc702799326 lisp/erc/ChangeLog
--- a/lisp/erc/ChangeLog	Mon Aug 07 07:43:25 2006 +0000
+++ b/lisp/erc/ChangeLog	Mon Aug 07 07:43:37 2006 +0000
@@ -2,6 +2,7 @@
 
 	* 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>
 
diff -r 0bacf06559e2 -r ddc702799326 lisp/erc/erc.el
--- a/lisp/erc/erc.el	Mon Aug 07 07:43:25 2006 +0000
+++ b/lisp/erc/erc.el	Mon Aug 07 07:43:37 2006 +0000
@@ -5244,7 +5244,7 @@
 See also `erc-startup-file-list'."
   (catch 'found
     (dolist (f erc-startup-file-list)
-      (setq f (convert-standard-file-name f))
+      (setq f (convert-standard-filename f))
       (when (file-readable-p f)
 	(throw 'found f)))))