- (riece-configure-windows)
- (switch-to-buffer (riece-get-buffer-create riece-command-buffer))
- (unless (eq major-mode 'riece-command-mode)
- (riece-command-mode))
- (let ((server-name
- (if (or confirm (null riece-server))
- (completing-read "Server: " riece-server-alist)
- riece-server)))
- (setq riece-server-process (riece-start-server
- (riece-server-name-to-server server-name))))
- (riece-create-buffers)
- (riece-configure-windows)
- (let ((channel-list riece-startup-channel-list))
- (while channel-list
- (if (listp (car channel-list))
- (riece-command-join (car (car channel-list))
- (cadr (car channel-list)))
- (riece-command-join (car channel-list)))
- (setq channel-list (cdr channel-list))))
- (run-hooks 'riece-startup-hook)
- (message "%s" (substitute-command-keys
- "Type \\[describe-mode] for help"))))
+ (error "Already running"))
+ (if (or confirm (null riece-server))
+ (setq riece-server (completing-read "Server: " riece-server-alist)))
+ (if (stringp riece-server)
+ (setq riece-server (riece-server-name-to-server riece-server)))
+ (riece-create-buffers)
+ (switch-to-buffer riece-command-buffer)
+ (riece-redisplay-buffers)
+ (riece-open-server riece-server "")
+ (run-hooks 'riece-startup-hook)
+ (message "%s" (substitute-command-keys "Type \\[describe-mode] for help")))