* riece-misc.el (riece-get-channels-on-server): New function.

[riece] / lisp / riece-misc.el

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index 2ab9f07..eb0de20 100644 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -70,19 +70,19 @@
       (let ((inhibit-read-only t)
            buffer-read-only
            (start (goto-char (point-max)))
-           (buffer (current-buffer))
            window
            point)
        (insert (format-time-string "%H:%M") " " string)
        (setq point (point))
        (if (and (not (riece-frozen (current-buffer)))
-                (setq window (get-buffer-window (current-buffer))))
+                (setq window (get-buffer-window (current-buffer)))
+                (not (pos-visible-in-window-p point window)))
            (save-excursion             ;save-selected-window changes
                                        ;current buffer
              (save-selected-window
                (select-window window)
                (goto-char point)       ;select-window changes current point
-               (recenter -2))))
+               (recenter riece-window-center-line))))
        (run-hook-with-args 'riece-after-insert-functions start (point))))
     (setq buffers (cdr buffers))))
 
@@ -214,22 +214,31 @@
     user-at-host))
 
 (defun riece-get-users-on-server (server-name)
-  (delq nil (mapcar (lambda (identity)
-                     (if (riece-user-p (riece-identity-prefix identity))
-                         identity))
-                   (riece-get-identities-on-server server-name))))
+  (riece-with-server-buffer server-name
+    (let (identities)
+      (mapatoms
+       (lambda (user)
+        (setq identities
+              (cons (riece-make-identity (symbol-name user) server-name)
+                    identities)))
+       riece-user-obarray)
+      identities)))
 
-(defun riece-get-identities-on-server (server-name)
+(defun riece-get-channels-on-server (server-name)
   (riece-with-server-buffer server-name
     (let (identities)
       (mapatoms
-       (lambda (atom)
+       (lambda (channel)
         (setq identities
-              (cons (riece-make-identity (symbol-name atom) server-name)
+              (cons (riece-make-identity (symbol-name channel) server-name)
                     identities)))
-       riece-obarray)
+       riece-channel-obarray)
       identities)))
 
+(defun riece-get-identities-on-server (server-name)
+  (nconc (riece-get-channels-on-server server-name)
+        (riece-get-users-on-server server-name)))
+
 (defun riece-check-channel-commands-are-usable (&optional channel)
    (unless riece-current-channel
      (error (substitute-command-keys