aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-11-23 17:11:51 -0800
committerGlenn Morris2014-11-23 17:11:51 -0800
commite01ec2ed084776b370e0634120deec6b65424b8a (patch)
tree604e302056164f64e7eaae41cc37b8903f807003
parent825351bcce8a6697905310793d82c57449500755 (diff)
downloademacs-e01ec2ed084776b370e0634120deec6b65424b8a.tar.gz
emacs-e01ec2ed084776b370e0634120deec6b65424b8a.zip
* src/emacs.c (main) <--version>: Make use of PACKAGE_NAME.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/emacs.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8d5f78671d3..a4410161c5a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12014-11-24 Glenn Morris <rgm@gnu.org> 12014-11-24 Glenn Morris <rgm@gnu.org>
2 2
3 * emacs.c (main) <--version>: Make use of PACKAGE_NAME.
4
3 * Makefile.in (emacs.res): Use ../nt rule, rather than duplicating it. 5 * Makefile.in (emacs.res): Use ../nt rule, rather than duplicating it.
4 (ntsource, WINDRES, EMACS_MANIFEST): Remove, now unused. 6 (ntsource, WINDRES, EMACS_MANIFEST): Remove, now unused.
5 7
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)
803 version = emacs_version; 803 version = emacs_version;
804 copyright = emacs_copyright; 804 copyright = emacs_copyright;
805 } 805 }
806 printf ("GNU Emacs %s\n", version); 806 printf ("%s %s\n", PACKAGE_NAME, version);
807 printf ("%s\n", copyright); 807 printf ("%s\n", copyright);
808 printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n"); 808 printf ("%s comes with ABSOLUTELY NO WARRANTY.\n", PACKAGE_NAME);
809 printf ("You may redistribute copies of Emacs\n"); 809 printf ("You may redistribute copies of %s\n", PACKAGE_NAME);
810 printf ("under the terms of the GNU General Public License.\n"); 810 printf ("under the terms of the GNU General Public License.\n");
811 printf ("For more information about these matters, "); 811 printf ("For more information about these matters, ");
812 printf ("see the file named COPYING.\n"); 812 printf ("see the file named COPYING.\n");