7 files changed, 23 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index f8c4c599cd6..639db918f1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-03-28  Glenn Morris  <rgm@gnu.org>
 
+        * configure.ac (AC_INIT): Add "GNU" in package, add bug address.
+        (PACKAGE_BUGREPORT): Use it.
+
         * configure.ac (ACL_SUMMARY): Rename from acl_summary, for consistency.
         (EMACS_CONFIG_FEATURES): New define.
 
diff --git a/configure.ac b/configure.ac
index 1b622c9de3c..2ac1828562c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.65)
-AC_INIT(emacs, 24.4.50)
+AC_INIT(GNU Emacs, 24.4.50, bug-gnu-emacs@gnu.org)
 
 dnl We get MINGW64 with MSYS2
 if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64"
@@ -653,7 +653,7 @@ dnl quotation ends
 
 if test $unported = yes; then
   AC_MSG_ERROR([Emacs does not support `${canonical}' systems.
-If you think it should, please send a report to bug-gnu-emacs@gnu.org.
+If you think it should, please send a report to ${PACKAGE_BUGREPORT}.
 Check `etc/MACHINES' for recognized configuration names.])
 fi
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24f17f004f5..8c008185424 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2014-03-28  Glenn Morris  <rgm@gnu.org>
 
+        * cus-start.el (report-emacs-bug-address): Set custom properties.
+        * mail/emacsbug.el (report-emacs-bug-address):
+        Variable is now defined in emacs.c.
+
         * mail/emacsbug.el (report-emacs-bug):
         Include system-configuration-features.
 
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 7fbddbe1c45..ee09c433f33 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -198,6 +198,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 
              ;; editfns.c
              (user-full-name mail string)
+             ;; emacs.c
+             (report-emacs-bug-address emacsbug string)
              ;; eval.c
              (max-specpdl-size limits integer)
              (max-lisp-eval-depth limits integer)
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 54f7b6a21ea..91451504cab 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -43,11 +43,6 @@
 (define-obsolete-variable-alias 'report-emacs-bug-pretest-address
   'report-emacs-bug-address "24.1")
 
-(defcustom report-emacs-bug-address "bug-gnu-emacs@gnu.org"
-  "Address of mailing list for GNU Emacs bugs."
-  :group 'emacsbug
-  :type 'string)
-
 (defcustom report-emacs-bug-no-confirmation nil
   "If non-nil, suppress the confirmations asked for the sake of novice users."
   :group 'emacsbug
diff --git a/src/ChangeLog b/src/ChangeLog
index 1527c98f052..3241d3953c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2014-03-28  Glenn Morris  <rgm@gnu.org>
 
+        * emacs.c (emacs_version): Use PACKAGE_VERSION rather than VERSION.
+        (emacs_bugreport): New variable.
+        (usage_message): Use PACKAGE_BUGREPORT.
+        (syms_of_emacs) <report-emacs-bug-address>: New variable.
+
         * emacs.c (syms_of_emacs) <system-configuration-features>: New var.
 
 2014-03-27  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/src/emacs.c b/src/emacs.c
index 07deccd16ec..56096016d41 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -105,8 +105,9 @@ extern void moncontrol (int mode);
 #include <sys/personality.h>
 #endif
 
-static const char emacs_version[] = VERSION;
+static const char emacs_version[] = PACKAGE_VERSION;
 static const char emacs_copyright[] = COPYRIGHT;
+static const char emacs_bugreport[] = PACKAGE_BUGREPORT;
 
 /* Empty lisp strings.  To avoid having to build any others.  */
 Lisp_Object empty_unibyte_string, empty_multibyte_string;
@@ -324,7 +325,7 @@ abbreviation for a --option.\n\
 Various environment variables and window system resources also affect\n\
 the operation of Emacs.  See the main documentation.\n\
 \n\
-Report bugs to bug-gnu-emacs@gnu.org.  First, please see the Bugs\n\
+Report bugs to " PACKAGE_BUGREPORT ".  First, please see the Bugs\n\
 section of the Emacs manual or the file BUGS.\n"
   };
 
@@ -2543,6 +2544,10 @@ This is nil during initialization.  */);
                doc: /* Version numbers of this version of Emacs.  */);
   Vemacs_version = build_string (emacs_version);
 
+  DEFVAR_LISP ("report-emacs-bug-address", Vreport_emacs_bug_address,
+               doc: /* Address of mailing list for GNU Emacs bugs.  */);
+  Vreport_emacs_bug_address = build_string (emacs_bugreport);
+
   DEFVAR_LISP ("dynamic-library-alist", Vdynamic_library_alist,
     doc: /* Alist of dynamic libraries vs external files implementing them.
 Each element is a list (LIBRARY FILE...), where the car is a symbol