From: ueno <ueno>
Date: Sat, 5 Feb 2005 13:22:02 +0000 (+0000)
Subject: * riece.el (riece-exit): Clear riece-window-configuration frame
X-Git-Tag: riece-1_0_7a
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=685b2c02a88230e7e70c3f672ef3431a174a99b2;p=elisp%2Friece.git

* riece.el (riece-exit): Clear riece-window-configuration frame
parameter.
* riece-commands.el (riece-command-suspend-resume): Don't attempt
to restore window-configuration if the cdr of
riece-window-configuration frame parameter is nil.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34e7807..7e93b8c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2005-02-05  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece.el (riece-exit): Clear riece-window-configuration frame
+	parameter.
+	* riece-commands.el (riece-command-suspend-resume): Don't attempt
+	to restore window-configuration if the cdr of
+	riece-window-configuration frame parameter is nil.
+
 	* riece-filter.el (riece-chomp-string): New function.
 	(riece-filter): Use it.
 
diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index e65173a..2fd4d8b 100644
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -122,7 +122,7 @@
     (modify-frame-parameters (selected-frame)
 			     (list (cons 'riece-window-configuration
 					 (current-window-configuration))))
-    (if entry
+    (if (cdr entry)
 	(set-window-configuration (cdr entry))
       (delete-other-windows))
     (message
diff --git a/lisp/riece.el b/lisp/riece.el
index c736b4b..8b00907 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -375,11 +375,9 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
 	riece-operator-indicator "-"
 	riece-channel-status-indicator "-"
 	riece-freeze-indicator "-")
-  (let ((window-configuration
-	 (cdr (assq 'riece-window-configuration (frame-parameters)))))
-    (if window-configuration
-	(set-window-configuration window-configuration)
-      (delete-other-windows)))
+  (modify-frame-parameters (selected-frame)
+			   (list (list 'riece-window-configuration)))
+  (delete-other-windows)
   (run-hooks 'riece-exit-hook))
 
 (defun riece-command-mode ()