(if (equal server-name "")
(message "Logging in to IRC server...")
(message "Logging in to %s..." server-name))
- (if (or password
- riece-reconnect-with-password)
+ (if riece-reconnect-with-password ;password incorrect or not set.
+ (unwind-protect
+ (setq password (riece-read-passwd "Password: "))
+ (setq riece-reconnect-with-password nil)))
+ (if password
(riece-process-send-string process
- (format "PASS %s\r\n"
- (or password
- (riece-read-passwd
- "Password: ")))))
+ (format "PASS %s\r\n" password)))
(riece-process-send-string process
(format "USER %s * * :%s\r\n"
(user-real-login-name)
(if riece-debug
(delete-process process)
(kill-buffer (process-buffer process)))
- (setq riece-process-list (delq process riece-process-list)))
+ (setq riece-process-list (delq process riece-process-list))
+ ;; If no server process is available, exit.
+ (unless riece-process-list
+ (riece-exit)))
(defun riece-server-opened (&optional server-name)
(let ((process-list riece-process-list))
(run-at-time riece-quit-timeout nil
(lambda (process)
(if (memq process riece-process-list)
- (kill-process (process-buffer process))))
+ (riece-close-server-process process)))
process)
(riece-process-send-string process
(if message