# HG changeset patch # User Glenn Morris # Date 1268893675 25200 # Node ID 929a106309b7bb5e25620e8f46b7088654e8505d # Parent a21a1c5668d6933a6075a958fae45839c3ae35c3 Remove obsolete code in emacs.c that chooses a bug reporting address. * emacs.c (USAGE4): Hard-code bug address. (REPORT_EMACS_BUG_ADDRESS, REPORT_EMACS_BUG_PRETEST_ADDRESS): Remove. (bug_reporting_address): Remove. (main): Don't call bug_reporting_address. diff -r a21a1c5668d6 -r 929a106309b7 src/ChangeLog --- a/src/ChangeLog Wed Mar 17 23:21:21 2010 -0700 +++ b/src/ChangeLog Wed Mar 17 23:27:55 2010 -0700 @@ -1,5 +1,10 @@ 2010-03-18 Glenn Morris + * emacs.c (USAGE4): Hard-code bug address. + (REPORT_EMACS_BUG_ADDRESS, REPORT_EMACS_BUG_PRETEST_ADDRESS): Remove. + (bug_reporting_address): Remove. + (main): Don't call bug_reporting_address. + * Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF) (LIBGPM, LIBRESOLV): Set using autoconf rather than cpp. diff -r a21a1c5668d6 -r 929a106309b7 src/emacs.c --- a/src/emacs.c Wed Mar 17 23:21:21 2010 -0700 +++ b/src/emacs.c Wed Mar 17 23:27:55 2010 -0700 @@ -345,7 +345,7 @@ Various environment variables and window system resources also affect\n\ Emacs' operation. See the main documentation.\n\ \n\ -Report bugs to %s. First, please see the Bugs\n\ +Report bugs to bug-gnu-emacs@gnu.org. First, please see the Bugs\n\ section of the Emacs manual or the file BUGS.\n" @@ -746,41 +746,6 @@ #endif /* DOUG_LEA_MALLOC */ -#define REPORT_EMACS_BUG_ADDRESS "bug-gnu-emacs@gnu.org" -#define REPORT_EMACS_BUG_PRETEST_ADDRESS "bug-gnu-emacs@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 = SDATA (temp); - - /* Count dots in `emacs-version'. */ - while (*string) - { - if (*string == '.') - count++; - 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 (int argc, char **argv) @@ -1082,7 +1047,7 @@ { printf (USAGE1, argv[0], USAGE2); printf (USAGE3); - printf (USAGE4, bug_reporting_address ()); + printf (USAGE4); exit (0); }