aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f21395d9632..3c0799d14b3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-09-17 Glenn Morris <rgm@gnu.org>
2
3 * emacs.c: Use COPYRIGHT.
4
12012-09-16 Paul Eggert <eggert@cs.ucla.edu> 52012-09-16 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Remove configure's --without-sync-input option (Bug#12450). 7 Remove configure's --without-sync-input option (Bug#12450).
diff --git a/src/emacs.c b/src/emacs.c
index 233c0e68a14..d4b52ab64ea 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -88,7 +88,7 @@ extern void moncontrol (int mode);
88#endif 88#endif
89 89
90static const char emacs_version[] = VERSION; 90static const char emacs_version[] = VERSION;
91static const char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; 91static const char emacs_copyright[] = COPYRIGHT;
92 92
93/* Empty lisp strings. To avoid having to build any others. */ 93/* Empty lisp strings. To avoid having to build any others. */
94Lisp_Object empty_unibyte_string, empty_multibyte_string; 94Lisp_Object empty_unibyte_string, empty_multibyte_string;