(report-emacs-bug): Fix previous change.

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index c4a52299d9ae2f853107d5f50ea267271a479077..e93f76c3042607fdc18a772e4fe683df5224b134 100644 (file)
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -79,6 +79,7 @@ Prompts for bug subject.  Leaves you in a mail buffer."
   ;; If there are four numbers in emacs-version, this is a pretest
   ;; version.
   (let ((pretest-p (string-match "\\..*\\..*\\." emacs-version))
+       (from-buffer (current-buffer))
        user-point prompt-beg-point message-end-point)
     (setq message-end-point
          (with-current-buffer (get-buffer-create "*Messages*")
@@ -141,12 +142,14 @@ usually do not have translators to read other languages for them.\n\n")
     (insert (format "  default-enable-multibyte-characters: %s\n"
                    default-enable-multibyte-characters))
     (insert "\n")
-    (insert (format "Major mode: %s\n" mode-name))
+    (insert (format "Major mode: %s\n"
+                   (buffer-local-value 'mode-name from-buffer)))
     (insert "\n")
     (insert "Minor modes in effect:\n")
     (dolist (mode minor-mode-list)
-      (and (boundp mode) (symbol-value mode)
-          (insert (format "  %s: %s\n" mode (symbol-value mode)))))
+      (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)))