(report-emacs-bug): Reorder arguments.

1 files changed, 5 insertions, 4 deletions

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 3e7cae708bc..617df8968d1 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -47,11 +47,12 @@
   "The automatically-created initial text of bug report.")
 
 ;;;###autoload
-(defun report-emacs-bug (recent-keys topic)
+(defun report-emacs-bug (topic &optional recent-keys)
   "Report a bug in GNU Emacs.
 Prompts for bug subject.  Leaves you in a mail buffer."
-  (interactive (list (recent-keys)
-                     (read-string "Bug Subject: ")))
+  ;; This strange form ensures that (recent-keys) is the value before
+  ;; the bug subject string is read.
+  (interactive (reverse (list (recent-keys) (read-string "Bug Subject: "))))
   (if (mail nil
             (if (string-match "\\..*\\..*\\." emacs-version)
                 ;; If there are four numbers in emacs-version,
@@ -82,7 +83,7 @@ Prompts for bug subject.  Leaves you in a mail buffer."
                                        (listp key))
                                    (single-key-description key)
                                  (prin1-to-string key nil)))
-                             recent-keys
+                             (or recent-keys (recent-keys))
                              " "))
           (save-restriction
             (narrow-to-region before-keys (point))