From: ueno <ueno>
Date: Sat, 8 Nov 2003 04:31:02 +0000 (+0000)
Subject: * riece-layout.el (riece-set-window-points): Check whether the end
X-Git-Tag: riece-0_1_6~4
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c81e7af12f3156939d2a0cbad638a032843c22;p=elisp%2Friece.git

* riece-layout.el (riece-set-window-points): Check whether the end
of buffer is visible.

* riece-ctcp.el (riece-command-ctcp-action): Display channel names
in "*Others*" buffer.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index daadc9c..e2327b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-08  Daiki Ueno  <ueno@unixuser.org>
+
+	* riece-layout.el (riece-set-window-points): Check whether the end
+	of buffer is visible.
+
+	* riece-ctcp.el (riece-command-ctcp-action): Display channel names
+	in "*Others*" buffer.
+
 2003-11-05  OHASHI Akira  <bg66@koka-in.org>
 
 	* riece-unread.el (riece-unread-switch-to-channel): Protect
diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 99266cd..8c8ba1c 100644
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -337,9 +337,11 @@
 	 (list riece-dialogue-buffer riece-others-buffer)
        riece-dialogue-buffer)
      (concat
-      (riece-concat-server-name
-       (concat riece-ctcp-action-prefix
-	       (riece-identity-prefix (riece-current-nickname)) " " action))
+      (riece-with-server-buffer (riece-identity-server target)
+	(riece-concat-server-name
+	 (concat riece-ctcp-action-prefix
+		 (riece-identity-prefix (riece-current-nickname)) " " action
+		 " (in " (riece-format-identity target t) ")")))
       "\n"))))
 
 (provide 'riece-ctcp)
diff --git a/lisp/riece-layout.el b/lisp/riece-layout.el
index e1c6908..5fe234a 100644
--- a/lisp/riece-layout.el
+++ b/lisp/riece-layout.el
@@ -87,17 +87,23 @@ happen unconditionally."
   (if (and riece-channel-buffer
 	   (get-buffer-window riece-channel-buffer))
       (with-current-buffer riece-channel-buffer
-	(unless (riece-frozen riece-channel-buffer)
+	(unless (or (riece-frozen riece-channel-buffer)
+		    (pos-visible-in-window-p
+		     (point-max) (get-buffer-window riece-channel-buffer)))
 	  (set-window-point (get-buffer-window riece-channel-buffer)
 			    (point-max)))))
   (if (get-buffer-window riece-others-buffer)
       (with-current-buffer riece-others-buffer
-	(unless (riece-frozen riece-others-buffer)
+	(unless (or (riece-frozen riece-others-buffer)
+		    (pos-visible-in-window-p
+		     (point-max) (get-buffer-window riece-others-buffer)))
 	  (set-window-point (get-buffer-window riece-others-buffer)
 			    (point-max)))))
   (if (get-buffer-window riece-dialogue-buffer)
       (with-current-buffer riece-dialogue-buffer
-	(unless (riece-frozen riece-dialogue-buffer)
+	(unless (or (riece-frozen riece-dialogue-buffer)
+		    (pos-visible-in-window-p
+		     (point-max) (get-buffer-window riece-dialogue-buffer)))
 	  (set-window-point (get-buffer-window riece-dialogue-buffer)
 			    (point-max))))))