* riece-identity.el (riece-format-identity): Return copied strings.

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index 301510c..ca0c1b9 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -259,17 +259,18 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
   (riece-insinuate-addons riece-addons)
   (run-hooks 'riece-after-load-startup-hook)
   (if (riece-server-opened)
-      (error "Already running"))
-  (if (or confirm (null riece-server))
-      (setq riece-server (completing-read "Server: " riece-server-alist)))
-  (if (stringp riece-server)
-      (setq riece-server (riece-server-name-to-server riece-server)))
-  (riece-create-buffers)
-  (switch-to-buffer riece-command-buffer)
-  (riece-redisplay-buffers)
-  (riece-open-server riece-server "")
-  (run-hooks 'riece-startup-hook)
-  (message "%s" (substitute-command-keys "Type \\[describe-mode] for help")))
+      (riece-command-configure-windows)
+    (if (or confirm (null riece-server))
+       (setq riece-server (completing-read "Server: " riece-server-alist)))
+    (if (stringp riece-server)
+       (setq riece-server (riece-server-name-to-server riece-server)))
+    (riece-create-buffers)
+    (switch-to-buffer riece-command-buffer)
+    (riece-redisplay-buffers)
+    (riece-open-server riece-server "")
+    (run-hooks 'riece-startup-hook)
+    (message "%s" (substitute-command-keys
+                  "Type \\[describe-mode] for help"))))
 
 (defun riece-exit ()
   (if riece-save-variables-are-dirty
@@ -401,7 +402,7 @@ Instead, these commands are available:
   (kill-all-local-variables)
   (buffer-disable-undo)
   (setq major-mode 'riece-user-list-mode
-        mode-name "User list"
+        mode-name "Users"
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: " riece-long-channel-indicator " "))