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

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index 1cf4769..ca0c1b9 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -166,6 +166,7 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "O" riece-command-open-server
     "C" riece-command-close-server
     "M" riece-command-universal-server-name-argument
+    "p" riece-command-enter-message-to-user
     "q" riece-command-quit
     "r" riece-command-configure-windows
     "x" riece-command-copy-region
@@ -192,7 +193,8 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "o" riece-command-set-operators
     "\C-p" riece-command-part
     "r" riece-command-configure-windows
-    "v" riece-command-set-speakers)
+    "v" riece-command-set-speakers
+    "V" riece-version)
   (set-keymap-parent riece-command-map riece-dialogue-mode-map)
 
   (riece-define-keys riece-user-list-mode-map
@@ -257,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
@@ -399,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 " "))