Move "Recent messages" earlier in report-emacs-bug

* lisp/mail/emacsbug.el (report-emacs-bug): Move the "Recent
messages" part earlier so that users can see it and remove it
if they want.

1 files changed, 13 insertions, 15 deletions

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index ce3c50bce2b..18eaa22b34c 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -242,7 +242,7 @@ usually do not have translators for other languages.\n\n")))
     (let ((txt (delete-and-extract-region (1+ user-point) (point))))
       (insert (propertize "\n" 'display txt)))
 
-    (insert "\n\nIn " (emacs-version))
+    (insert "\nIn " (emacs-version))
     (if emacs-build-system
         (insert " built on " emacs-build-system))
     (insert "\n")
@@ -263,6 +263,18 @@ usually do not have translators for other languages.\n\n")))
                      (buffer-string)))))
       (if (stringp lsb)
           (insert "System " lsb "\n")))
+    (let ((message-buf (get-buffer "*Messages*")))
+      (if message-buf
+          (let (beg-pos
+                (end-pos message-end-point))
+            (with-current-buffer message-buf
+              (goto-char end-pos)
+              (forward-line -10)
+              (setq beg-pos (point)))
+            (terpri (current-buffer) t)
+            (insert "Recent messages:\n")
+            (insert-buffer-substring message-buf beg-pos end-pos))))
+    (insert "\n")
     (when (and system-configuration-options
                (not (equal system-configuration-options "")))
       (insert "Configured using:\n 'configure "
@@ -295,20 +307,6 @@ usually do not have translators for other languages.\n\n")))
       (and (boundp mode) (buffer-local-value mode from-buffer)
            (insert (format "  %s: %s\n" mode
                            (buffer-local-value mode from-buffer)))))
-    (let ((message-buf (get-buffer "*Messages*")))
-      (if message-buf
-          (let (beg-pos
-                (end-pos message-end-point))
-            (with-current-buffer message-buf
-              (goto-char end-pos)
-              (forward-line -10)
-              (setq beg-pos (point)))
-            (insert "\nRecent messages:\n")
-            (insert-buffer-substring message-buf beg-pos end-pos))))
-    ;; After Recent messages, to avoid the messages produced by
-    ;; list-load-path-shadows.
-    (unless (looking-back "\n" (1- (point)))
-      (insert "\n"))
     (insert "\n")
     (insert "Load-path shadows:\n")
     (let* ((msg "Checking for load-path shadows...")