X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-irc.el;h=caecdc75ef554268896c749b0e159726ce111acf;hp=77de70012e65a864003f9829d8a164a68a98cd08;hb=3354b4d91c95d7b050c5e73e691ce7324406ca41;hpb=d730bd05cbedbac3bc9a0cead2dcc2e45368a797

diff --git a/lisp/riece-irc.el b/lisp/riece-irc.el
index 77de700..caecdc7 100644
--- a/lisp/riece-irc.el
+++ b/lisp/riece-irc.el
@@ -69,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)
@@ -80,14 +79,8 @@
 				       (format "PASS %s\r\n" password)))
 	(riece-process-send-string process
 				   (format "USER %s * * :%s\r\n"
-					   (if (and username
-						    (not (string-match
-							  "[\0\r\n @]"
-							  username)))
-					       username
-					     (user-real-login-name))
-					   (or realname
-					       username
+					   (user-real-login-name)
+					   (or username
 					       "No information given")))
 	(riece-process-send-string process (format "NICK %s\r\n" nickname))
 	(with-current-buffer (process-buffer process)