X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-layout.el;h=584c2c02798cc9edc8ef867dd4f2e35de68a1f31;hb=1f12f5fe16ac7823e9a4fda498e0c29c4ce32753;hp=05bdabd70b897453b754b1f8deceaab2bcc0e310;hpb=953b56a014d618e194b33c18fe445dc83e7be715;p=riece

diff --git a/lisp/riece-layout.el b/lisp/riece-layout.el
index 05bdabd..584c2c0 100644
--- a/lisp/riece-layout.el
+++ b/lisp/riece-layout.el
@@ -28,7 +28,7 @@
 (require 'riece-misc)
 
 (defgroup riece-layout nil
-  "Manage window layouts"
+  "Window layouts."
   :prefix "riece-"
   :group 'riece)
 
@@ -154,11 +154,13 @@ This function is used by \"default\" layout."
 		(set-window-buffer (selected-window)
 				   riece-command-buffer)
 		(select-window rest-window)
-		(set-window-buffer (split-window rest-window)
-				   riece-others-buffer)
+		(if riece-others-buffer-mode
+		    (set-window-buffer (split-window rest-window)
+				       riece-others-buffer))
 		(set-window-buffer (selected-window)
 				   riece-channel-buffer))
-	    (if (eq vpos 'middle)
+	    (if (and (eq vpos 'middle)
+		     riece-others-buffer-mode)
 		(let ((rest-window (split-window)))
 		  (set-window-buffer (selected-window)
 				     riece-channel-buffer)
@@ -167,10 +169,14 @@ This function is used by \"default\" layout."
 		  (set-window-buffer rest-window
 				     riece-command-buffer))
 	      (let ((rest-window (split-window nil (- (window-height) 4))))
-		(set-window-buffer (selected-window)
-				   riece-others-buffer)
-		(set-window-buffer (split-window)
-				   riece-channel-buffer)
+		(if riece-others-buffer-mode
+		    (progn
+		      (set-window-buffer (selected-window)
+					 riece-others-buffer)
+		      (set-window-buffer (split-window)
+					 riece-channel-buffer))
+		  (set-window-buffer (selected-window)
+				     riece-channel-buffer))
 		(set-window-buffer rest-window
 				   riece-command-buffer)))))
       (if (eq vpos 'bottom)