X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece.el;h=1a10069cf70d052d0effe89cc42b10d08f80855b;hb=d879dde79debe966faabb49315faedb1bbf016a8;hp=412bfbc54ccde13ff97f8cca264c4a9ddc08eb6e;hpb=2350118dd5bc874caba79f174533cd198d986b69;p=riece

diff --git a/lisp/riece.el b/lisp/riece.el
index 412bfbc..1a10069 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -58,14 +58,13 @@
     (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.")
 
-(defvar riece-addons-insinuated nil
-  "Non nil if add-ons are already insinuated.")
-
 (defvar riece-select-keys
   `("#" riece-command-switch-to-channel-by-number
     "1" riece-command-switch-to-channel-by-number-1
@@ -164,6 +163,7 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "f" riece-command-finger
     "\C-tf" riece-command-toggle-freeze
     "\C-to" riece-command-toggle-own-freeze
+    "\C-tO" riece-command-toggle-others-buffer-mode
     "\C-tu" riece-command-toggle-user-list-buffer-mode
     "\C-tc" riece-command-toggle-channel-buffer-mode
     "\C-tC" riece-command-toggle-channel-list-buffer-mode
@@ -184,7 +184,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,13 +276,15 @@ 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)
-    (unless riece-addons-insinuated
-      (setq riece-addons (riece-resolve-addons riece-addons))
-      (let ((pointer riece-addons))
-	(while pointer
-	  (riece-insinuate-addon (car pointer) riece-debug)
-	  (setq pointer (cdr pointer))))
-      (setq riece-addons-insinuated t))
+    (modify-frame-parameters (selected-frame)
+			     (list (cons 'riece-window-configuration
+					 (current-window-configuration))))
+    (setq riece-addon-dependencies (riece-resolve-addons
+				    (copy-sequence riece-addons)))
+    (let ((pointer riece-addon-dependencies))
+      (while pointer
+	(riece-insinuate-addon (car (car pointer)) riece-debug)
+	(setq pointer (cdr pointer))))
     (if (or confirm (null riece-server))
 	(setq riece-server (completing-read "Server: " riece-server-alist)))
     (if (stringp riece-server)
@@ -300,7 +303,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)
@@ -321,10 +324,10 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
 	  (unless (riece-server-opened server)
 	    (riece-command-open-server server))
 	  (setq channel-list (cdr channel-list))))
-      (let ((pointer riece-addons))
+      (let ((pointer riece-addon-dependencies))
 	(while pointer
-	  (unless (get (car pointer) 'riece-addon-default-disabled)
-	    (riece-enable-addon (car pointer) riece-debug))
+	  (unless (get (car (car pointer)) 'riece-addon-default-disabled)
+	    (riece-enable-addon (car (car pointer)) riece-debug))
 	  (setq pointer (cdr pointer))))
       (run-hooks 'riece-startup-hook)
       (message "%s" (substitute-command-keys
@@ -337,15 +340,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 +373,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 +620,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")