Add "How to Report a Bug" to Help menu

* lisp/info.el (info-emacs-bug): New command.
* lisp/menu-bar.el (menu-bar-help-menu): Add "How to Report a Bug" to Help.
* lisp/mail/emacsbug.el (report-emacs-bug): Replace with info-emacs-bug.

4 files changed, 19 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index abf0bb66b2e..cd57969f73f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-22  Glenn Morris  <rgm@gnu.org>
+
+        * info.el (info-emacs-bug): New command.
+        * menu-bar.el (menu-bar-help-menu): Add "How to Report a Bug" to Help.
+        * mail/emacsbug.el (report-emacs-bug): Replace with info-emacs-bug.
+
 2012-05-21  Glenn Morris  <rgm@gnu.org>
 
         * makefile.w32-in (update-subdirs-SH):
diff --git a/lisp/info.el b/lisp/info.el
index 1e3b14632e6..367d9d0a9ef 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1,6 +1,6 @@
 ;; info.el --- info package for Emacs
 
-;; Copyright (C) 1985-1986, 1992-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1992-2012 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
@@ -683,6 +683,12 @@ See a list of available Info commands in `Info-mode'."
   (info "emacs"))
 
 ;;;###autoload
+(defun info-emacs-bug ()
+  "Display the \"Reporting Bugs\" section of the Emacs manual in Info mode."
+  (interactive)
+  (info "(emacs)Bugs"))
+
+;;;###autoload
 (defun info-standalone ()
   "Run Emacs as a standalone Info reader.
 Usage:  emacs -f info-standalone [filename]
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 33b73335a7d..6cef48749fc 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -316,7 +316,7 @@ usually do not have translators for other languages.\n\n")))
     (fill-region (line-beginning-position 0) (point))
     ;; This is so the user has to type something in order to send easily.
     (use-local-map (nconc (make-sparse-keymap) (current-local-map)))
-    (define-key (current-local-map) "\C-c\C-i" 'report-emacs-bug-info)
+    (define-key (current-local-map) "\C-c\C-i" 'info-emacs-bug)
     (if can-insert-mail
         (define-key (current-local-map) "\C-cm"
           'report-emacs-bug-insert-to-mailer))
@@ -353,10 +353,7 @@ usually do not have translators for other languages.\n\n")))
           (buffer-substring-no-properties (point-min) (point)))
     (goto-char user-point)))
 
-(defun report-emacs-bug-info ()
-  "Go to the Info node on reporting Emacs bugs."
-  (interactive)
-  (info "(emacs)Bugs"))
+(define-obsolete-function-alias 'report-emacs-bug-info 'info-emacs-bug "24.2")
 
 ;; It's the default mail mode, so it seems OK to use its features.
 (autoload 'message-bogus-recipient-p "message")
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 1f57601a711..ec6a4621a4e 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1,6 +1,6 @@
 ;;; menu-bar.el --- define a default menu bar
 
-;; Copyright (C) 1993-1995, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: RMS
 ;; Maintainer: FSF
@@ -1752,6 +1752,9 @@ key, a click, or a menu-item")))
     (define-key menu [send-emacs-bug-report]
       `(menu-item ,(purecopy "Send Bug Report...") report-emacs-bug
                   :help ,(purecopy "Send e-mail to Emacs maintainers")))
+    (define-key menu [emacs-manual-bug]
+      `(menu-item ,(purecopy "How to Report a Bug") info-emacs-bug
+                  :help ,(purecopy "Read about how to report an Emacs bug")))
     (define-key menu [emacs-known-problems]
       `(menu-item ,(purecopy "Emacs Known Problems") view-emacs-problems
                   :help ,(purecopy "Read about known problems with Emacs")))