summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2006-08-07 07:43:37 +0000
committerMiles Bader <miles@gnu.org>2006-08-07 07:43:37 +0000
commit26cced449af1c57c8a674aaafdbc6d57ef28cf57 (patch)
treebaef5f4ccb0077faf5c80b88f56c83396908b6ef /lisp/erc
parentb5bc193f309eadf04e02e5b1c9596fb07a456baf (diff)
downloademacs-26cced449af1c57c8a674aaafdbc6d57ef28cf57.tar.gz
Fix ERC bug introduced in last patch
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-387 Creator: Michael Olson <mwolson@gnu.org>
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog1
-rw-r--r--lisp/erc/erc.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index cd5b825b71e..b495eda20f1 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -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 --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index bd31ee3d3b7..726d02ed613 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5244,7 +5244,7 @@ If FILE is found, return the path to it."
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)))))