* riece-signal.el (riece-connect-signal): Fixed doc.

[riece] / lisp / riece-server.el

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index c3ab69e..c552180 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -37,7 +37,7 @@
       (:nickname riece-nickname)
       (:username riece-username)
       (:password)
-      (:function #'open-network-stream)
+      (:function riece-default-open-connection-function)
       (:coding riece-default-coding-system))
     "Mapping from keywords to default values.
 All keywords that can be used must be listed here."))
@@ -155,7 +155,11 @@ the `riece-server-keyword-map' variable."
          (unwind-protect
              ;; XEmacs signals an error when the keyboard cannot be grabbed.
              (condition-case nil
-                 (setq password (riece-read-passwd "Password: "))
+                 (setq password
+                       (if (equal server-name "")
+                           (riece-read-passwd "Password: ")
+                         (riece-read-passwd (format "Password for %s: "
+                                                    server-name))))
                (error))
            (setq riece-reconnect-with-password nil)))
       (if password