X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-misc.el;h=2ab9f07385222048f6c931a9bdfb3574f212ab24;hp=12013e4531b123f2a3d0c170443c0c119fd9e060;hb=b6697e33d7a0def19a85c874907092d505946333;hpb=4a4b0b7ff3b62f77e956dfd4d1d6d32f6c2fdbb7

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index 12013e4..2ab9f07 100644
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -69,12 +69,20 @@
       (set-buffer (car buffers))
       (let ((inhibit-read-only t)
 	    buffer-read-only
-	    (start (goto-char (point-max))))
+	    (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)))
-		 (get-buffer-window (current-buffer)))
-	    (set-window-point (get-buffer-window (current-buffer))
-			      (point)))
+		 (setq window (get-buffer-window (current-buffer))))
+	    (save-excursion		;save-selected-window changes
+					;current buffer
+	      (save-selected-window
+		(select-window window)
+		(goto-char point)	;select-window changes current point
+		(recenter -2))))
 	(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