X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece.el;h=aece64551b76fabfe60ba2db8658957c8e4a7999;hp=86c1d624c14399beb9e188a9cdc15c422bbe9a42;hb=523b5ffede8f461129d8de225aaffb968a5043be;hpb=3276fa825b97be2c62eb6fe0691b706fd5344ed9

diff --git a/lisp/riece.el b/lisp/riece.el
index 86c1d62..aece645 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -294,11 +294,13 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
 	       (lambda ()
 		 (let ((buffers riece-buffer-list))
 		   (while buffers
-		     (if (eq (derived-mode-class
-			      (with-current-buffer (car buffers)
-				major-mode))
-			     'riece-dialogue-mode)
-			 (riece-shrink-buffer (car buffers)))
+		     (if (buffer-live-p (car buffers))
+			 (if (eq (derived-mode-class
+				  (with-current-buffer (car buffers)
+				    major-mode))
+				 'riece-dialogue-mode)
+			     (riece-shrink-buffer (car buffers)))
+		       (delq (car buffers) riece-buffer-list))
 		     (setq buffers (cdr buffers))))))))
     (switch-to-buffer riece-command-buffer)
     (riece-display-connect-signals)
@@ -335,13 +337,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 2) (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
@@ -536,6 +540,7 @@ Instead, these commands are available:
 	  (funcall (nth 2 (car alist))))
 	(setq alist (cdr alist))))))
 
+(defvar reporter-prompt-for-summary-p)
 (defun riece-submit-bug-report (&optional recent-messages recent-keys)
   "Submit via mail a bug report on Riece."
   ;; This strange form ensures that (recent-keys) is the value before
@@ -545,16 +550,14 @@ Instead, these commands are available:
   (let ((pointer riece-server-process-alist)
 	nickname)
     (while pointer
-      (if (and (riece-server-process-opened (cdr (car pointer)))
-	       (setq nickname
-		     (with-current-buffer (process-buffer (cdr (car pointer)))
-		     riece-real-nickname)))
-	  (process-send-string
-	   (cdr (car pointer))
-	   "VERSION")
-	  (process-send-string
-	   (cdr (car pointer))
-	   (format "PRIVMSG %s :\1VERSION\1\r\n" nickname)))
+      (when (riece-server-process-opened (cdr (car pointer)))
+	(process-send-string (cdr (car pointer)) "VERSION\r\n")
+	(if (setq nickname
+		  (with-current-buffer (process-buffer (cdr (car pointer)))
+		    riece-real-nickname))
+	    (process-send-string
+	     (cdr (car pointer))
+	     (format "PRIVMSG %s :\1VERSION\1\r\n" nickname))))
       (setq pointer (cdr pointer))))
   (sit-for 3)
   (message "Querying server version...done")
@@ -583,38 +586,39 @@ Also include a reliable recipe for triggering the bug, as well as
 any lisp back-traces that you may have.
 \(setq stack-trace-on-error t\), or \(setq debug-on-error t\) if you
 are familiar with the debugger, to get a lisp back-trace.")
-      (save-excursion
-	(goto-char (point-max))
-	(insert
-	 "\nAdd-on state:\n"
-	 "------------\n"
-	 (save-window-excursion
-	   (save-excursion
-	     (riece-command-list-addons)
-	     (search-forward "\n\n")
-	     (buffer-substring (point-min) (point)))))
-	(insert "Recent messages from servers:\n"
-		"--------------------------")
-	(let ((pointer riece-server-process-alist))
-	  (while pointer
-	    (insert "\n- \"" (car (car pointer)) "\", \n"
-		    (format "%S" (if (equal (car (car pointer)) "")
-				     riece-server
-				   (cdr (assoc (car (car pointer))
-					       riece-server-alist))))
-		    "\n"
-		    (if (riece-server-process-opened (cdr (car pointer)))
-			(save-excursion
-			  (set-buffer (process-buffer (cdr (car pointer))))
-			  (goto-char (point-max))
-			  (beginning-of-line -60)
-			  (buffer-substring (point) (point-max)))
-		      "(closed server)"))
-	    (setq pointer (cdr pointer))))
-	;; Insert recent keystrokes.
-	(insert "\n\nRecent keystrokes:\n"
-		"-----------------\n\n")
-	(let ((before-keys (point)))
+    (delete-other-windows)
+    (save-excursion
+      (goto-char (point-max))
+      (insert
+       "\nAdd-on state:\n"
+       "------------\n"
+       (save-window-excursion
+	 (save-excursion
+	   (riece-command-list-addons)
+	   (search-forward "\n\n")
+	   (buffer-substring (point-min) (point)))))
+      (insert "Recent messages from servers:\n"
+	      "--------------------------")
+      (let ((pointer riece-server-process-alist))
+	(while pointer
+	  (insert "\n- \"" (car (car pointer)) "\", \n"
+		  (format "%S" (if (equal (car (car pointer)) "")
+				   riece-server
+				 (cdr (assoc (car (car pointer))
+					     riece-server-alist))))
+		  "\n"
+		  (if (riece-server-process-opened (cdr (car pointer)))
+		      (save-excursion
+			(set-buffer (process-buffer (cdr (car pointer))))
+			(goto-char (point-max))
+			(beginning-of-line -60)
+			(buffer-substring (point) (point-max)))
+		    "(closed server)"))
+	  (setq pointer (cdr pointer))))
+      ;; Insert recent keystrokes.
+      (insert "\n\nRecent keystrokes:\n"
+	      "-----------------\n\n")
+      (let ((before-keys (point)))
 	(insert (key-description recent-keys))
 	(save-restriction
 	  (narrow-to-region before-keys (point))
@@ -622,10 +626,10 @@ are familiar with the debugger, to get a lisp back-trace.")
 	  (while (progn (move-to-column 50) (not (eobp)))
 	    (search-forward " " nil t)
 	    (insert "\n"))))
-	;; Insert recent minibuffer messages.
-	(insert "\n\nRecent messages (most recent first):\n"
-		"-----------------------------------\n"
-		recent-messages))))
+      ;; Insert recent minibuffer messages.
+      (insert "\n\nRecent messages (most recent first):\n"
+	      "-----------------------------------\n"
+	      recent-messages))))
 
 (provide 'riece)