From 4a21c95c01f08ba5b0bd8950ca11a9a50894dec2 Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Wed, 11 Jun 2008 12:48:03 +0000
Subject: [PATCH] * riece-options.el (riece-use-full-window): Abolish unused
 option. * riece-layout.el (riece-layout-alist): New layout
 "one-window". (riece-configure-windows-one-window): New
 function.

---
 lisp/ChangeLog        |    6 ++++++
 lisp/riece-layout.el  |    8 ++++++++
 lisp/riece-options.el |    5 -----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2d074c..617d755 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-11  Daiki Ueno  <ueno@unixuser.org>
+
+	* riece-options.el (riece-use-full-window): Abolish unused option.
+	* riece-layout.el (riece-layout-alist): New layout "one-window".
+	(riece-configure-windows-one-window): New function.
+
 2008-06-07  Daiki Ueno  <ueno@unixuser.org>
 
 	* riece-options.el (riece-server-alist): Accept an integer for
diff --git a/lisp/riece-layout.el b/lisp/riece-layout.el
index 33467ae..f7c5539 100644
--- a/lisp/riece-layout.el
+++ b/lisp/riece-layout.el
@@ -46,6 +46,7 @@
     ("bottom-left" riece-configure-windows left bottom)
     ("top" riece-configure-windows-top)
     ("spiral" riece-configure-windows-spiral)
+    ("one-window" riece-configure-windows-one-window)
     ("default" . "middle-right"))
   "An alist mapping the names to layout functions.
 An element of this alist is either in the following forms:
@@ -301,6 +302,13 @@ PLIST accept :command-height, :user-list-width, and :channel-list-width."
     (select-window (or (get-buffer-window buffer)
                        (get-buffer-window riece-command-buffer)))))
 
+(defun riece-configure-windows-one-window ()
+  ;; Can't expand minibuffer to full frame.
+  (if (eq (selected-window) (minibuffer-window))
+      (other-window 1))
+  (delete-other-windows)
+  (set-window-buffer (selected-window) riece-dialogue-buffer))
+
 (provide 'riece-layout)
 
 ;;; riece-layout.el ends here
diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index 69d22ca..af50da7 100644
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -65,11 +65,6 @@
   :prefix "riece-"
   :group 'riece)
 
-(defcustom riece-use-full-window t
-  "If non-nil, whole Emacs window is used to display dialogue."
-  :type 'boolean
-  :group 'riece-looks)
-
 (defcustom riece-window-center-line -2
   "Line number of center point in window when scrolling.
 If nil, erases the entire frame and then redraws with point in the
-- 
1.7.10.4