* riece-options.el (riece-use-full-window): Abolish unused option.

[elisp/riece.git] / lisp / riece-server.el

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 1d09c38..b68c5a0 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -30,12 +30,14 @@
 (require 'riece-identity)
 (require 'riece-compat)
 (require 'riece-cache)
+(require 'riece-debug)
 
 (eval-and-compile
   (defvar riece-server-keyword-map
     '((:host)
       (:service 6667)
       (:nickname riece-nickname)
+      (:realname riece-realname)
       (:username riece-username)
       (:password)
       (:function riece-default-open-connection-function)
@@ -221,9 +223,8 @@ the `riece-server-keyword-map' variable."
                                        "-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)
@@ -260,6 +261,7 @@ the `riece-server-keyword-map' variable."
     (make-local-variable 'riece-server-name)
     (make-local-variable 'riece-read-point)
     (setq riece-read-point (point-min))
+    (make-local-variable 'riece-filter-running)
     (make-local-variable 'riece-send-queue)
     (setq riece-send-queue (riece-make-queue))
     (make-local-variable 'riece-send-size)