diff options
| -rw-r--r-- | lisp/erc/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 2 |
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 | ||
| 6 | 2006-08-05 Michael Olson <mwolson@gnu.org> | 7 | 2006-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." | |||
| 5244 | See also `erc-startup-file-list'." | 5244 | See 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 | ||