Synch up with riece-0.0.4.

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

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index cafdf3c..2c8cb1a 100644 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -37,8 +37,9 @@
 (defun riece-command-switch-to-channel (channel)
   (interactive (list (riece-completing-read-identity
                      "Channel/User: " riece-current-channels nil t)))
-  (riece-switch-to-channel channel)
-  (riece-redisplay-buffers))
+  (unless (equal channel riece-current-channels)
+    (riece-switch-to-channel channel)
+    (riece-redisplay-buffers)))
 
 (defun riece-command-switch-to-channel-by-number (number)
   (interactive
@@ -145,7 +146,8 @@
 (defun riece-command-topic (topic)
   (interactive
    (list (read-from-minibuffer
-         "Topic: " (cons (or (riece-with-identity-buffer riece-current-channel
+         "Topic: " (cons (or (riece-with-server-buffer
+                                 (riece-identity-server riece-current-channel)
                                (riece-channel-get-topic
                                 (riece-identity-prefix
                                  riece-current-channel)))
@@ -199,7 +201,7 @@
            (if (and riece-current-channel
                     (riece-channel-p (riece-identity-prefix
                                       riece-current-channel)))
-               (cons (riece-decode-identity riece-current-channel t)
+               (cons (riece-format-identity riece-current-channel t)
                      0))))))
   (if (or (not (equal pattern ""))
          (yes-or-no-p "Really want to query NAMES without argument? "))
@@ -213,7 +215,7 @@
            (if (and riece-current-channel
                     (riece-channel-p (riece-identity-prefix
                                       riece-current-channel)))
-               (cons (riece-decode-identity riece-current-channel t)
+               (cons (riece-format-identity riece-current-channel t)
                      0))))))
   (if (or (not (equal pattern ""))
          (yes-or-no-p "Really want to query WHO without argument? "))
@@ -227,7 +229,7 @@
            (if (and riece-current-channel
                     (riece-channel-p (riece-identity-prefix
                                       riece-current-channel)))
-               (cons (riece-decode-identity riece-current-channel t)
+               (cons (riece-format-identity riece-current-channel t)
                      0))))))
   (if (or (not (equal pattern ""))
          (yes-or-no-p "Really want to query LIST without argument? "))
@@ -262,7 +264,8 @@
 (defun riece-command-set-operators (users &optional arg)
   (interactive
    (let ((operators
-         (riece-with-identity-buffer riece-current-channel
+         (riece-with-server-buffer
+             (riece-identity-server riece-current-channel)
            (riece-channel-get-operators
             (riece-identity-prefix riece-current-channel))))
         (completion-ignore-case t)
@@ -277,8 +280,9 @@
                               (lambda (user)
                                 (unless (member user operators)
                                   (list user)))
-                              (riece-with-identity-buffer
-                                  riece-current-channel
+                              (riece-with-server-buffer
+                                  (riece-identity-server
+                                   riece-current-channel)
                                 (riece-channel-get-users
                                  (riece-identity-prefix
                                   riece-current-channel))))))))
@@ -301,7 +305,8 @@
 (defun riece-command-set-speakers (users &optional arg)
   (interactive
    (let ((speakers
-         (riece-with-identity-buffer riece-current-channel
+         (riece-with-server-buffer
+             (riece-identity-server riece-current-channel)
            (riece-channel-get-speakers
             (riece-identity-prefix riece-current-channel))))
         (completion-ignore-case t)
@@ -316,8 +321,9 @@
                               (lambda (user)
                                 (unless (member user speakers)
                                   (list user)))
-                              (riece-with-identity-buffer
-                                  riece-current-channel
+                              (riece-with-server-buffer
+                                  (riece-identity-server
+                                   riece-current-channel)
                                 (riece-channel-get-users
                                  (riece-identity-prefix
                                   riece-current-channel))))))))
@@ -404,11 +410,11 @@
 
 (defun riece-command-join (target &optional key)
   (interactive
-   (let ((completion-ignore-case t)
-        (target
-         (riece-completing-read-identity
-          "Channel/User: " riece-current-channels))
-        key)
+   (let* ((completion-ignore-case t)
+         (target
+          (riece-completing-read-identity
+           "Channel/User: " riece-current-channels))
+         key)
      (if (and current-prefix-arg
              (riece-channel-p target))
         (setq key
@@ -436,10 +442,11 @@
 
 (defun riece-command-part (target &optional message)
   (interactive
-   (let ((completion-ignore-case t)
+   (let* ((completion-ignore-case t)
         (target
          (riece-completing-read-identity
-          "Channel/User: " riece-current-channels))
+          "Channel/User: " riece-current-channels nil nil
+          (cons (riece-format-identity riece-current-channel) 0)))
         message)
      (if (and current-prefix-arg
              (riece-channel-p (riece-identity-prefix target)))