* riece-display.el (riece-update-buffers): Check existence each

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index 524f2d8..863ea8a 100644 (file)
--- 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,13 +537,29 @@ 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))
     (unless riece-debug
@@ -578,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
@@ -609,7 +625,7 @@ 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))))