[Emacs-diffs] trunk r116900: Improve usage of AC_INIT

[Glenn Morris]

------------------------------------------------------------
revno: 116900
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-03-28 19:11:39 -0400
message:
  Improve usage of AC_INIT
  
  * configure.ac (AC_INIT): Add "GNU" in package, add bug address.
  (PACKAGE_BUGREPORT): Use it.
  
  * src/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.
  
  * lisp/cus-start.el (report-emacs-bug-address): Set custom properties.
  
  * lisp/mail/emacsbug.el (report-emacs-bug-address):
  Variable is now defined in emacs.c.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/cus-start.el              
cusstart.el-20091113204419-o5vbwnq5f7feedwu-1100
  lisp/mail/emacsbug.el          emacsbug.el-20091113204419-o5vbwnq5f7feedwu-73
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/emacs.c                    emacs.c-20091113204419-o5vbwnq5f7feedwu-241

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-03-28 22:03:42 +0000
+++ b/ChangeLog 2014-03-28 23:11:39 +0000
@@ -1,5 +1,8 @@
 2014-03-28  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'configure.ac'
--- a/configure.ac      2014-03-28 22:03:42 +0000
+++ b/configure.ac      2014-03-28 23:11:39 +0000
@@ -22,7 +22,7 @@
 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, address@hidden)
 
 dnl We get MINGW64 with MSYS2
 if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64"
@@ -653,7 +653,7 @@
 
 if test $unported = yes; then
   AC_MSG_ERROR([Emacs does not support `${canonical}' systems.
-If you think it should, please send a report to address@hidden
+If you think it should, please send a report to ${PACKAGE_BUGREPORT}.
 Check `etc/MACHINES' for recognized configuration names.])
 fi
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-28 22:03:42 +0000
+++ b/lisp/ChangeLog    2014-03-28 23:11:39 +0000
@@ -1,5 +1,9 @@
 2014-03-28  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2014-03-21 17:04:50 +0000
+++ b/lisp/cus-start.el 2014-03-28 23:11:39 +0000
@@ -198,6 +198,8 @@
 
             ;; 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)

=== modified file 'lisp/mail/emacsbug.el'
--- a/lisp/mail/emacsbug.el     2014-03-28 22:03:42 +0000
+++ b/lisp/mail/emacsbug.el     2014-03-28 23:11:39 +0000
@@ -43,11 +43,6 @@
 (define-obsolete-variable-alias 'report-emacs-bug-pretest-address
   'report-emacs-bug-address "24.1")
 
-(defcustom report-emacs-bug-address "address@hidden"
-  "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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-03-28 22:03:42 +0000
+++ b/src/ChangeLog     2014-03-28 23:11:39 +0000
@@ -1,5 +1,10 @@
 2014-03-28  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2014-03-28 22:03:42 +0000
+++ b/src/emacs.c       2014-03-28 23:11:39 +0000
@@ -105,8 +105,9 @@
 #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 @@
 Various environment variables and window system resources also affect\n\
 the operation of Emacs.  See the main documentation.\n\
 \n\
-Report bugs to address@hidden  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 @@
               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