aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2006-08-07 07:43:37 +0000
committerMiles Bader2006-08-07 07:43:37 +0000
commit26cced449af1c57c8a674aaafdbc6d57ef28cf57 (patch)
treebaef5f4ccb0077faf5c80b88f56c83396908b6ef
parentb5bc193f309eadf04e02e5b1c9596fb07a456baf (diff)
downloademacs-26cced449af1c57c8a674aaafdbc6d57ef28cf57.tar.gz
emacs-26cced449af1c57c8a674aaafdbc6d57ef28cf57.zip
Fix ERC bug introduced in last patch
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-387 Creator: Michael Olson <mwolson@gnu.org>
-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 @@
2 2
3 * erc.el (erc-arrange-session-in-multiple-windows): Fix bug with 3 * erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
4 multi-tty Emacs. 4 multi-tty Emacs.
5 (erc-select-startup-file): Fix bug introduced by recent change.
5 6
62006-08-05 Michael Olson <mwolson@gnu.org> 72006-08-05 Michael Olson <mwolson@gnu.org>
7 8
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."
5244See also `erc-startup-file-list'." 5244See also `erc-startup-file-list'."
5245 (catch 'found 5245 (catch 'found
5246 (dolist (f erc-startup-file-list) 5246 (dolist (f erc-startup-file-list)
5247 (setq f (convert-standard-file-name f)) 5247 (setq f (convert-standard-filename f))
5248 (when (file-readable-p f) 5248 (when (file-readable-p f)
5249 (throw 'found f))))) 5249 (throw 'found f)))))
5250 5250