[Emacs-diffs] emacs/lisp ChangeLog mail/emacsbug.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/10/24 22:09:11

Modified files:
        lisp           : ChangeLog 
        lisp/mail      : emacsbug.el 

Log message:
        * mail/emacsbug.el (report-emacs-bug): Clarify that the
        keybindings apply to the mail buffer (Bug#4003).  Shrink help
        window to buffer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16505&r2=1.16506
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/emacsbug.el?cvsroot=emacs&r1=1.91&r2=1.92

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16505
retrieving revision 1.16506
diff -u -b -r1.16505 -r1.16506
--- ChangeLog   24 Oct 2009 21:51:03 -0000      1.16505
+++ ChangeLog   24 Oct 2009 22:09:08 -0000      1.16506
@@ -1,5 +1,9 @@
 2009-10-24  Chong Yidong  <address@hidden>
 
+       * 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

Index: mail/emacsbug.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/emacsbug.el,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- mail/emacsbug.el    23 Oct 2009 16:17:20 -0000      1.91
+++ mail/emacsbug.el    24 Oct 2009 22:09:11 -0000      1.92
@@ -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)