* riece-server.el (riece-open-server): Record errors for debug.

* riece-irc.el (riece-irc-open-server): Fixed the commit on 2008-04-04.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44f630c..c9b6ea0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-04-15  Daiki Ueno  <ueno@unixuser.org>
 
 2008-04-15  Daiki Ueno  <ueno@unixuser.org>
 

+       * riece-server.el (riece-open-server): Record errors for debug.
+

        * riece-irc.el (riece-irc-open-server): Send NICK before USER,
        following the recommendation in "3.1 Connection Registration" of
        RFC2812.
        * riece-irc.el (riece-irc-open-server): Send NICK before USER,
        following the recommendation in "3.1 Connection Registration" of
        RFC2812.

diff --git a/lisp/riece-irc.el b/lisp/riece-irc.el
index b79dea1..004f0bc 100644 (file)
--- a/lisp/riece-irc.el
+++ b/lisp/riece-irc.el
@@ -83,14 +83,15 @@
            (riece-process-send-string process
                                       (format "PASS %s\r\n" password)))
        (riece-process-send-string process (format "NICK %s\r\n" nickname))
            (riece-process-send-string process
                                       (format "PASS %s\r\n" password)))
        (riece-process-send-string process (format "NICK %s\r\n" nickname))

+       (unless realname
+         (setq realname (riece-mcat "No information given")))
+       (if coding
+           (setq realname (encode-coding-string realname coding)))

        (riece-process-send-string process
                                   (format "USER %s * * :%s\r\n"
                                           (or username
                                               (user-real-login-name))
        (riece-process-send-string process
                                   (format "USER %s * * :%s\r\n"
                                           (or username
                                               (user-real-login-name))

-                                          (encode-coding-string
-                                           (or realname
-                                               "No information given")
-                                           coding)))
+                                          realname))

        (with-current-buffer (process-buffer process)
          (setq riece-last-nickname riece-real-nickname
                riece-nick-accepted 'sent
        (with-current-buffer (process-buffer process)
          (setq riece-last-nickname riece-real-nickname
                riece-nick-accepted 'sent

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 5a0db11..b68c5a0 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -30,6 +30,7 @@
 (require 'riece-identity)
 (require 'riece-compat)
 (require 'riece-cache)
 (require 'riece-identity)
 (require 'riece-compat)
 (require 'riece-cache)

+(require 'riece-debug)

 
 (eval-and-compile
   (defvar riece-server-keyword-map
 
 (eval-and-compile
   (defvar riece-server-keyword-map

@@ -222,9 +223,8 @@ the `riece-server-keyword-map' variable."
                                        "-open-server")))
     (unless function
       (error "\"%S\" is not supported" protocol))
                                        "-open-server")))
     (unless function
       (error "\"%S\" is not supported" protocol))

-    (condition-case nil
-       (setq process (funcall function server server-name))
-      (error))
+    (setq process (riece-funcall-ignore-errors (symbol-name function)
+                                              function server server-name))

     (when process
       (with-current-buffer (process-buffer process)
        (make-local-variable 'riece-protocol)
     (when process
       (with-current-buffer (process-buffer process)
        (make-local-variable 'riece-protocol)