Undo the last change.

[riece] / lisp / riece-irc.el

diff --git a/lisp/riece-irc.el b/lisp/riece-irc.el
index f44e199..caecdc7 100644 (file)
--- a/lisp/riece-irc.el
+++ b/lisp/riece-irc.el
@@ -36,10 +36,16 @@
       (if (equal server-name "")
          (message "Connecting to IRC server...")
        (message "Connecting to %s..." server-name))
-      (setq process
-           (funcall function (riece-server-process-name server-name)
-                    (concat " *IRC*" server-name)
-                    host service))
+      (condition-case error
+         (setq process
+               (funcall function (riece-server-process-name server-name)
+                        (concat " *IRC*" server-name)
+                        host service))
+       (error
+        (if (equal server-name "")
+            (message "Connecting to IRC server...failed: %S" error)
+          (message "Connecting to %s...failed: %S" server-name error))
+        (signal (car error) (cdr error))))
       (if (equal server-name "")
          (message "Connecting to IRC server...done")
        (message "Connecting to %s...done" server-name))
@@ -63,8 +69,7 @@
                      (quit
                       (if (equal server-name "")
                           (message "Password: Quit")
-                        (message (format "Password for %s: Quit"
-                                         server-name)))
+                        (message "Password for %s: " server-name))
                       'quit)))
            (setq riece-reconnect-with-password nil)))
       (if (eq password 'quit)