* riece-misc.el (riece-insert): Suppress byte-compile warnings;

[riece] / lisp / riece-misc.el

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index 12013e4..2aa1286 100644 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -32,6 +32,7 @@
 (require 'riece-server)
 (require 'riece-user)
 (require 'riece-mode)
+(require 'riece-cache)
 
 (defun riece-get-buffer-create (name &optional init-major-mode)
   (let ((buffer (get-buffer name)))
@@ -65,16 +66,23 @@
     (setq buffers (list buffers)))
   (while buffers
     (run-hooks 'riece-before-insert-functions)
-    (save-excursion
-      (set-buffer (car buffers))
+    (with-current-buffer (car buffers)
       (let ((inhibit-read-only t)
            buffer-read-only
-           (start (goto-char (point-max))))
+           (start (goto-char (point-max)))
+           window
+           point)
        (insert (format-time-string "%H:%M") " " string)
+       (setq point (point))
        (if (and (not (riece-frozen (current-buffer)))
-                (get-buffer-window (current-buffer)))
-           (set-window-point (get-buffer-window (current-buffer))
-                             (point)))
+                (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 riece-window-center-line))))
        (run-hook-with-args 'riece-after-insert-functions start (point))))
     (setq buffers (cdr buffers))))
 
@@ -166,7 +174,11 @@
 (defun riece-concat-server-name (string)
   (if (equal riece-server-name "")
       string
-    (concat string " (from " riece-server-name ")")))
+    (let ((server-name (concat " (from " riece-server-name ")")))
+      (put-text-property 0 (length server-name)
+                        'riece-server-name riece-server-name
+                        server-name)
+      (concat string server-name))))
 
 (defun riece-concat-user-status (status string)
   (if status
@@ -202,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-cache-hash-obarray riece-user-cache))
+      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-cache-hash-obarray riece-channel-cache))
       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