# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1256422148 0
# Node ID 56b02500dbd13f5d89155fe81ff6c2fc6d696117
# Parent  aea3ed6946e4b3064349ad4a68b4f7ad1e6871eb
* mail/emacsbug.el (report-emacs-bug): Clarify that the
keybindings apply to the mail buffer (Bug#4003).  Shrink help
window to buffer.

diff -r aea3ed6946e4 -r 56b02500dbd1 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 24 21:51:03 2009 +0000
+++ b/lisp/ChangeLog	Sat Oct 24 22:09:08 2009 +0000
@@ -1,5 +1,9 @@
 2009-10-24  Chong Yidong  <cyd@stupidchicken.com>
 
+	* mail/emacsbug.el (report-emacs-bug): Clarify that the
+	keybindings apply to the mail buffer (Bug#4003).  Shrink help
+	window to buffer.
+
 	* whitespace.el (whitespace-mode, whitespace-newline-mode)
 	(global-whitespace-mode, global-whitespace-newline-mode)
 	(whitespace-toggle-options, global-whitespace-toggle-options): Doc
diff -r aea3ed6946e4 -r 56b02500dbd1 lisp/mail/emacsbug.el
--- a/lisp/mail/emacsbug.el	Sat Oct 24 21:51:03 2009 +0000
+++ b/lisp/mail/emacsbug.el	Sat Oct 24 22:09:08 2009 +0000
@@ -225,17 +225,18 @@
     (define-key (current-local-map) "\C-c\C-i" 'report-emacs-bug-info)
     (unless report-emacs-bug-no-explanations
       (with-output-to-temp-buffer "*Bug Help*"
+	(princ "While in the mail buffer:\n\n")
 	(if (eq mail-user-agent 'sendmail-user-agent)
 	    (princ (substitute-command-keys
-		    "Type \\[mail-send-and-exit] to send the bug report.\n")))
+		    "  Type \\[mail-send-and-exit] to send the bug report.\n")))
 	(princ (substitute-command-keys
-		"Type \\[kill-buffer] RET to cancel (don't send it).\n"))
+		"  Type \\[kill-buffer] RET to cancel (don't send it).\n"))
 	(terpri)
 	(princ (substitute-command-keys
-		"Type \\[report-emacs-bug-info] to visit in Info the Emacs Manual section
-about when and how to write a bug report,
-and what information to supply so that the bug can be fixed.
-Type SPC to scroll through this section and its subsections."))))
+		"  Type \\[report-emacs-bug-info] to visit in Info the Emacs Manual section
+    about when and how to write a bug report, and what
+    information you should include to help fix the bug.")))
+      (shrink-window-if-larger-than-buffer (get-buffer-window "*Bug Help*")))
     ;; Make it less likely people will send empty messages.
     (make-local-variable 'mail-send-hook)
     (add-hook 'mail-send-hook 'report-emacs-bug-hook)