Undo the last change.

[riece] / lisp / riece-irc.el

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