Merge from emacs-24; up to 117669

[gnu-emacs] / lisp / mail / emacsbug.el

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 91451504cab29fdc0f15a277c2c13df2ada60de3..4e3eb324e59f7961100c721386fb86684a6697fe 100644 (file)
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -138,12 +138,11 @@ This requires either the OS X \"open\" command, or the freedesktop
        (error "Subject, To or body not found")))))
 
 ;;;###autoload
-(defun report-emacs-bug (topic &optional recent-keys)
+(defun report-emacs-bug (topic &optional unused)
   "Report a bug in GNU Emacs.
 Prompts for bug subject.  Leaves you in a mail buffer."
-  ;; 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: "))))
+  (declare (advertised-calling-convention (topic) "24.5"))
+  (interactive "sBug Subject: ")
   ;; The syntax `version;' is preferred to `[version]' because the
   ;; latter could be mistakenly stripped by mailing software.
   (if (eq system-type 'ms-dos)
@@ -273,23 +272,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)))))
-    (insert "\n")
-    (insert "Recent input:\n")
-    (let ((before-keys (point)))
-      (insert (mapconcat (lambda (key)
-                          (if (or (integerp key)
-                                  (symbolp key)
-                                  (listp key))
-                              (single-key-description key)
-                            (prin1-to-string key nil)))
-                        (or recent-keys (recent-keys))
-                        " "))
-      (save-restriction
-       (narrow-to-region before-keys (point))
-       (goto-char before-keys)
-       (while (progn (move-to-column 50) (not (eobp)))
-         (search-forward " " nil t)
-         (insert "\n"))))
     (let ((message-buf (get-buffer "*Messages*")))
       (if message-buf
          (let (beg-pos
@@ -298,7 +280,7 @@ usually do not have translators for other languages.\n\n")))
              (goto-char end-pos)
              (forward-line -10)
              (setq beg-pos (point)))
-           (insert "\n\nRecent messages:\n")
+           (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.