(bug_reporting_address): New function.

Use it when displaying usage message.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7d22191f326e84e7995d9877415e421ff954a359..cb6a27c6a4ed099048739d1d188d967e462f8bf6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-10-28  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
+       * emacs.c (bug_reporting_address): New function.
+       Use it when displaying usage message.
+
        * minibuf.c (read_minibuf): Remove unused external declaration of
        variable `Qread_only'.
 

diff --git a/src/emacs.c b/src/emacs.c
index 4222a8e3eb01fab55185df6689012a7d1f044527..db031bc5c8a48e2139eb1ccf7e9bd74e44461aa2 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -285,8 +285,10 @@ abbreviation for a --option.\n\
 \n\
 Various environment variables and window system resources also affect\n\
 Emacs' operation.  See the main documentation.\n\
-\n\
-Report bugs to bug-gnu-emacs@gnu.org.  First, please see the Bugs\n\
+\n"
+
+#define USAGE3 "\
+Report bugs to %s.  First, please see the Bugs\n\
 section of the Emacs manual or the file BUGS.\n"
 
 \f
@@ -713,6 +715,38 @@ void (*__malloc_initialize_hook) () = malloc_initialize_hook;
 
 #endif /* DOUG_LEA_MALLOC */
 
+
+#define REPORT_EMACS_BUG_ADDRESS "bug-gnu-emacs@gnu.org"
+#define REPORT_EMACS_BUG_PRETEST_ADDRESS "emacs-pretest-bug@gnu.org"
+
+/* This function is used to determine an address to which bug report should
+   be sent.  */
+
+char *bug_reporting_address ()
+{
+  int count=0;
+  Lisp_Object temp;
+  char *string;
+
+  temp = Fsymbol_value (intern ("emacs-version"));
+
+  /* When `emacs-version' is invalid, use normal address.  */
+  if (!STRINGP(temp))
+    return REPORT_EMACS_BUG_ADDRESS;
+
+  string = XSTRING (temp)->data;
+
+  do {
+    if (*string=='.')
+      count++;
+  } while (string++,*string);
+
+  /* When `emacs-version' has at least three dots, it is development or
+     pretest version of Emacs.  */
+  return (count>=3) ? REPORT_EMACS_BUG_PRETEST_ADDRESS : REPORT_EMACS_BUG_ADDRESS;
+}
+
+
 /* ARGSUSED */
 int
 main (argc, argv, envp)
@@ -978,6 +1012,7 @@ main (argc, argv, envp)
     {
       printf (USAGE1, argv[0]);
       printf (USAGE2);
+      printf (USAGE3, bug_reporting_address());
       exit (0);
     }