mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Update from erc--emacs--22

Browse source 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-386
Creator:  Michael Olson <mwolson@gnu.org>
This commit is contained in:
Miles Bader 2006-08-07 07:43:25 +00:00
parent 2f057fa7c1
commit b5bc193f30
3 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/erc/erc.el
View file

@ -822,7 +822,8 @@ See `erc-server-flood-margin' for other flood-related parameters.")
;; Script parameters
(defcustom erc-startup-file-list
'("~/.ercrc.el" "~/.ercrc" ".ercrc.el" ".ercrc")
'("~/.emacs.d/.ercrc.el" "~/.emacs.d/.ercrc"
"~/.ercrc.el" "~/.ercrc" ".ercrc.el" ".ercrc")
"List of files to try for a startup script.
The first existent and readable one will get executed.
@ -5241,13 +5242,11 @@ If FILE is found, return the path to it."
(defun erc-select-startup-file ()
"Select an ERC startup file.
See also `erc-startup-file-list'."
(let ((l erc-startup-file-list)
(f nil))
(while (and (not f) l)
(if (file-readable-p (car l))
(setq f (car l)))
(setq l (cdr l)))
f))
(catch 'found
(dolist (f erc-startup-file-list)
(setq f (convert-standard-file-name f))
(when (file-readable-p f)
(throw 'found f)))))
(defun erc-find-script-file (file)
"Search for FILE in `default-directory', and any in `erc-script-path'."
@ -5894,7 +5893,8 @@ All windows are opened in the current frame."
(setq bufs (cdr bufs))
(while bufs
(split-window)
(switch-to-buffer-other-window (car bufs))
(other-window 1)
(switch-to-buffer (car bufs))
(setq bufs (cdr bufs))
(balance-windows)))))