diff options
| author | Glenn Morris | 2012-09-16 17:56:08 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-09-16 17:56:08 -0700 |
| commit | 78f83752f50a2aa9944e60a5aceac4015eb3ca58 (patch) | |
| tree | 48c1ff5a6e08a5d69ef36593de966018f229b01e /src | |
| parent | 48093eb9bca47488b6867e53a12e7cac37d6f5a6 (diff) | |
| download | emacs-78f83752f50a2aa9944e60a5aceac4015eb3ca58.tar.gz emacs-78f83752f50a2aa9944e60a5aceac4015eb3ca58.zip | |
Reduce the number of versioned files storing the short copyright string
* configure.ac (copyright): New output variable.
(COPYRIGHT): New AC_DEFINE.
* admin/admin.el (set-copyright): No more need to set copyrights for
nextstep, or .c files. Add configure.ac and config.nt.
* lib-src/ebrowse.c (version):
* lib-src/etags.c (print_version): Use COPYRIGHT.
* nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/InfoPlist.strings.in:
* nextstep/templates/Info.plist.in: Let configure set copyright.
* nt/config.nt (COPYRIGHT): New.
* src/emacs.c: Use COPYRIGHT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
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 @@ | |||
| 1 | 2012-09-17 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs.c: Use COPYRIGHT. | ||
| 4 | |||
| 1 | 2012-09-16 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-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 | ||
| 90 | static const char emacs_version[] = VERSION; | 90 | static const char emacs_version[] = VERSION; |
| 91 | static const char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; | 91 | static 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. */ |
| 94 | Lisp_Object empty_unibyte_string, empty_multibyte_string; | 94 | Lisp_Object empty_unibyte_string, empty_multibyte_string; |