X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece.el;h=5b0105f1833b33a95212a71f4f62f949fbb6785a;hb=8d8d198f468e46ab630b34eb9b65d012937fd296;hp=412bfbc54ccde13ff97f8cca264c4a9ddc08eb6e;hpb=0bd1b28bbfd0107011691a70e90ac29f04e2802d;p=elisp%2Friece.git

diff --git a/lisp/riece.el b/lisp/riece.el
index 412bfbc..5b0105f 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -58,7 +58,9 @@
     (riece-dialogue-buffer "*Dialogue*" riece-dialogue-mode)
     (riece-others-buffer "*Others*" riece-others-mode)
     (riece-channel-list-buffer "*Channels*" riece-channel-list-mode)
-    (riece-user-list-buffer " *Users*" riece-user-list-mode)))
+    (riece-user-list-buffer " *Users*" riece-user-list-mode)
+    (riece-temp-buffer " *Temp*")
+    (riece-debug-buffer " *Debug*")))
 
 (defvar riece-shrink-buffer-idle-timer nil
   "Timer object to periodically shrink channel buffers.")
@@ -184,7 +186,8 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "r" riece-command-configure-windows
     "x" riece-command-copy-region
     "t" riece-command-topic
-    "w" riece-command-who)
+    "w" riece-command-who
+    "z" riece-command-suspend-resume)
 
   (riece-define-keys riece-command-mode-map
     "\r" riece-command-enter-message
@@ -275,6 +278,9 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
   (run-hooks 'riece-after-load-startup-hook)
   (if (riece-server-opened)
       (riece-command-configure-windows)
+    (modify-frame-parameters (selected-frame)
+			     (list (cons 'riece-window-configuration
+					 (current-window-configuration))))
     (unless riece-addons-insinuated
       (setq riece-addons (riece-resolve-addons riece-addons))
       (let ((pointer riece-addons))
@@ -300,7 +306,7 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
 				    major-mode))
 				 'riece-dialogue-mode)
 			     (riece-shrink-buffer (car buffers)))
-		       (deql (car buffers) riece-buffer-list))
+		       (delq (car buffers) riece-buffer-list))
 		     (setq buffers (cdr buffers))))))))
     (switch-to-buffer riece-command-buffer)
     (riece-display-connect-signals)
@@ -337,15 +343,15 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
     (while (> (buffer-size) riece-max-buffer-size)
       (let* ((inhibit-read-only t)
 	     buffer-read-only
-	     (start (point))
-	     (end (progn (beginning-of-line
-			  (1+ riece-shrink-buffer-remove-lines))
-			 (point)))
-	     (overlays (riece-overlays-in start end)))
+	     (end (progn
+		    (goto-char riece-shrink-buffer-remove-chars)
+		    (beginning-of-line 2)
+		    (point)))
+	     (overlays (riece-overlays-in (point-min) end)))
 	(while overlays
 	  (riece-delete-overlay (car overlays))
 	  (setq overlays (cdr overlays)))
-	(delete-region start end)))))
+	(delete-region (point-min) end)))))
 
 (defun riece-exit ()
   (if riece-save-variables-are-dirty
@@ -370,6 +376,8 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
 	riece-operator-indicator "-"
 	riece-channel-status-indicator "-"
 	riece-freeze-indicator "-")
+  (modify-frame-parameters (selected-frame)
+			   (list (list 'riece-window-configuration)))
   (delete-other-windows)
   (run-hooks 'riece-exit-hook))
 
@@ -615,6 +623,10 @@ are familiar with the debugger, to get a lisp back-trace.")
 			(buffer-substring (point) (point-max)))
 		    "(closed server)"))
 	  (setq pointer (cdr pointer))))
+      (insert "\n\nRecent debug messages:\n"
+	      "-----------------------------------\n"
+	      (with-current-buffer riece-debug-buffer
+		(buffer-string)))
       ;; Insert recent keystrokes.
       (insert "\n\nRecent keystrokes:\n"
 	      "-----------------\n\n")