* riece-commands.el (riece-command-next-channel): Circularly

[riece] / lisp / riece-commands.el

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 004490f..28b0d39 100644 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -73,21 +73,41 @@
   "Select the next channel."
   (interactive)
   (when (> (length riece-current-channels) 1)
-    (let ((channels (copy-sequence riece-current-channels)))
-      (setcdr (last channels) channels)        ;make a circular link
-      (riece-command-switch-to-channel
-       (nth 1 (string-list-member-ignore-case
-              riece-current-channel channels))))))
+    (let ((pointer (cdr (string-list-member-ignore-case
+                        riece-current-channel
+                        riece-current-channels))))
+      (while (and pointer
+                 (null (car pointer)))
+       (setq pointer (cdr pointer)))
+      (when (null pointer)
+       (setq pointer riece-current-channels)
+       (while (and pointer
+                   (null (car pointer)))
+         (setq pointer (cdr pointer))))
+      (if (car pointer)
+         (riece-command-switch-to-channel (car pointer))
+       (error "No such channel!")))))
 
 (defun riece-command-previous-channel ()
   "Select the previous channel."
   (interactive)
   (when (> (length riece-current-channels) 1)
-    (let ((channels (nreverse (copy-sequence riece-current-channels))))
-      (setcdr (last channels) channels)        ;make a circular link
-      (riece-command-switch-to-channel
-       (nth 1 (string-list-member-ignore-case
-              riece-current-channel channels))))))
+    (let ((pointer (string-list-member-ignore-case
+                   riece-current-channel
+                   riece-current-channels))
+         (start riece-current-channels)
+         channel)
+      (while (and start (not (eq start pointer)))
+       (setq channel (car start))
+       (setq start (cdr start)))
+      (when (null channel)
+       (setq start (copy-sequence riece-current-channels))
+       (setq start (delq nil start))
+       (and (> (length start) 1)
+            (setq channel (nth (1- (length start)) start))))
+      (if channel
+         (riece-command-switch-to-channel channel)
+       (error "No such channel!")))))
 
 (defun riece-command-select-command-buffer ()
   "Select the command buffer."
@@ -103,19 +123,22 @@
 (defun riece-command-toggle-channel-buffer-mode ()
   (interactive)
   (setq riece-channel-buffer-mode
-       (not riece-channel-buffer-mode))
+       (not riece-channel-buffer-mode)
+       riece-save-variables-are-dirty t)
   (riece-command-configure-windows))
 
 (defun riece-command-toggle-user-list-buffer-mode ()
   (interactive)
   (setq riece-user-list-buffer-mode
-       (not riece-user-list-buffer-mode))
+       (not riece-user-list-buffer-mode)
+       riece-save-variables-are-dirty t)
   (riece-command-configure-windows))
 
 (defun riece-command-toggle-channel-list-buffer-mode ()
   (interactive)
   (setq riece-channel-list-buffer-mode
-       (not riece-channel-list-buffer-mode))
+       (not riece-channel-list-buffer-mode)
+       riece-save-variables-are-dirty t)
   (riece-command-configure-windows))
 
 (defun riece-command-finger (user &optional recurse)
@@ -477,7 +500,9 @@
 (defun riece-command-toggle-away (&optional message)
   "Mark yourself as being away."
   (interactive
-   (if current-prefix-arg
+   (if (and (not (riece-user-get-away (riece-current-nickname)))
+           (or (null riece-away-message)
+               current-prefix-arg))
        (let ((message (read-string "Away message: ")))
         (list message))))
   (if message
@@ -542,14 +567,11 @@ If prefix argument ARG is non-nil, toggle frozen status."
 (defun riece-command-open-server (server-name)
   (interactive
    (list (completing-read "Server: " riece-server-alist)))
-  (let ((process (riece-start-server
-                 (riece-server-name-to-server server-name)
-                 server-name)))
-    (with-current-buffer (process-buffer process)
-      (setq riece-server-name server-name))
-    (setq riece-server-process-alist
-         (cons (cons server-name process)
-               riece-server-process-alist))))
+  (if (assoc server-name riece-server-process-alist)
+      (error "%s is already opened" server-name)
+    (riece-open-server
+     (riece-server-name-to-server server-name)
+     server-name)))
 
 (defun riece-command-close-server (server-name &optional message)
   (interactive