From: Glenn Morris Date: Mon, 24 Nov 2014 01:11:51 +0000 (-0800) Subject: * src/emacs.c (main) <--version>: Make use of PACKAGE_NAME. X-Git-Tag: emacs-25.0.90~2635^2~352 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e01ec2ed084776b370e0634120deec6b65424b8a;p=emacs.git * src/emacs.c (main) <--version>: Make use of PACKAGE_NAME. --- diff --git a/src/ChangeLog b/src/ChangeLog index 8d5f78671d3..a4410161c5a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2014-11-24 Glenn Morris + * emacs.c (main) <--version>: Make use of PACKAGE_NAME. + * Makefile.in (emacs.res): Use ../nt rule, rather than duplicating it. (ntsource, WINDRES, EMACS_MANIFEST): Remove, now unused. diff --git a/src/emacs.c b/src/emacs.c index 62f03c6ea12..da34eaac14b 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -803,10 +803,10 @@ main (int argc, char **argv) version = emacs_version; copyright = emacs_copyright; } - printf ("GNU Emacs %s\n", version); + printf ("%s %s\n", PACKAGE_NAME, version); printf ("%s\n", copyright); - printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n"); - printf ("You may redistribute copies of Emacs\n"); + printf ("%s comes with ABSOLUTELY NO WARRANTY.\n", PACKAGE_NAME); + printf ("You may redistribute copies of %s\n", PACKAGE_NAME); printf ("under the terms of the GNU General Public License.\n"); printf ("For more information about these matters, "); printf ("see the file named COPYING.\n");