X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-irc.el;h=caecdc75ef554268896c749b0e159726ce111acf;hp=f44e199b6689c7ba59dfa34754b9ec314861a808;hb=0724798ff204508cec1e0965389c3b2d32066a3e;hpb=625aafd1d2928e4c74d15c0a1d776097aed8bb3c

diff --git a/lisp/riece-irc.el b/lisp/riece-irc.el
index f44e199..caecdc7 100644
--- 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)