* riece-options.el (riece-realname): New user option.

[riece] / lisp / riece-irc.el

diff --git a/lisp/riece-irc.el b/lisp/riece-irc.el
index faa4c56..631a531 100644 (file)
--- a/lisp/riece-irc.el
+++ b/lisp/riece-irc.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -69,8 +69,7 @@
                      (quit
                       (if (equal server-name "")
                           (message "Password: Quit")
-                        (message (format "Password for %s: Quit"
-                                         server-name)))
+                        (message "Password for %s: Quit" server-name))
                       'quit)))
            (setq riece-reconnect-with-password nil)))
       (if (eq password 'quit)
@@ -80,14 +79,9 @@
                                       (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 username
+                                              (user-real-login-name))
                                           (or realname
-                                              username
                                               "No information given")))
        (riece-process-send-string process (format "NICK %s\r\n" nickname))
        (with-current-buffer (process-buffer process)
@@ -103,9 +97,19 @@
                           (if (rassq process riece-server-process-alist)
                               (delete-process process)))
                         process))
-  (riece-process-send-string process
-                            (if message
-                                (format "QUIT :%s\r\n" message)
-                              "QUIT\r\n")))
+  (let ((server-name (with-current-buffer (process-buffer process)
+                      riece-server-name)))
+    (if (equal server-name "")
+       (message "Sending QUIT...")
+      (message "Sending QUIT to \"%s\"..." server-name))
+    (riece-process-send-string process
+                              (if message
+                                  (format "QUIT :%s\r\n" message)
+                                "QUIT\r\n"))
+    (if (equal server-name "")
+       (message "Sending QUIT...done")
+      (message "Sending QUIT to \"%s\"...done" server-name))))
 
-(provide 'riece-irc)
\ No newline at end of file
+(provide 'riece-irc)
+
+;;; riece-irc.el ends here