X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece.el;h=863ea8a5038805ab4f8a4c40af4c4815f3cfd0c4;hp=8457cf534a05971b80028ee430589b6a7ee8ff8b;hb=7f8ef19e817a830587c4790ee06991b1cc9912cd;hpb=0058bab7a52f813282167910b2a884715aeec0ef

diff --git a/lisp/riece.el b/lisp/riece.el
index 8457cf5..863ea8a 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -294,10 +294,11 @@ 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)
+		     (if (and (buffer-live-p (car buffers))
+			      (eq (derived-mode-class
+				   (with-current-buffer (car buffers)
+				     major-mode))
+				  'riece-dialogue-mode))
 			 (riece-shrink-buffer (car buffers)))
 		     (setq buffers (cdr buffers))))))))
     (switch-to-buffer riece-command-buffer)
@@ -536,23 +537,40 @@ 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
   ;; the bug subject string is read.
-  (interactive (list (with-output-to-string
-		       (print-recent-messages 20))
-		     (recent-keys)))
+  (interactive (list (riece-recent-messages 20) (recent-keys)))
+  (message "Querying server version...")
+  (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\r\n")
+	  (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")
   (require 'reporter)
   (let ((reporter-prompt-for-summary-p t))
-    (when (y-or-n-p "Do you want to submit a report on Riece? ")
-      (reporter-submit-bug-report
-       "liece@unixuser.org"
-       (riece-version)
-       '(riece-debug)
-       nil
-       nil
-       "This bug report will be sent to the Riece Development Team,
+    (unless riece-debug
+      (error "Please turn on riece-debug and restart Riece."))
+    (reporter-submit-bug-report
+     "liece@unixuser.org"
+     (riece-version)
+     '(riece-debug)
+     nil
+     nil
+     "This bug report will be sent to the Riece Development Team,
 not to your local site managers!!
 
 Please write in Japanese or English, because the Riece maintainers do
@@ -577,28 +595,27 @@ are familiar with the debugger, to get a lisp back-trace.")
 	     (riece-command-list-addons)
 	     (search-forward "\n\n")
 	     (buffer-substring (point-min) (point)))))
-	(when riece-debug
-	  (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 (process-live-p (cdr (car pointer)))
-			  (save-excursion
-			    (set-buffer (process-buffer (cdr (car pointer))))
-			    (goto-char (point-max))
-			    (beginning-of-line -20)
-			    (buffer-substring (point) (point-max)))
-			"(closed server)"))
-	      (setq pointer (cdr pointer)))))
+	(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\n"
-	"Recent keystrokes:\n-----------------\n\n")
+	(insert "\n\nRecent keystrokes:\n"
+		"-----------------\n\n")
 	(let ((before-keys (point)))
 	(insert (key-description recent-keys))
 	(save-restriction
@@ -608,9 +625,9 @@ are familiar with the debugger, to get a lisp back-trace.")
 	    (search-forward " " nil t)
 	    (insert "\n"))))
 	;; Insert recent minibuffer messages.
-	(insert "\nRecent messages (most recent first):\n"
+	(insert "\n\nRecent messages (most recent first):\n"
 		"-----------------------------------\n"
-		recent-messages)))))
+		recent-messages))))
 
 (provide 'riece)