diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-09-16 17:56:08 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-09-16 17:56:08 -0700 |
| commit | 78f83752f50a2aa9944e60a5aceac4015eb3ca58 (patch) | |
| tree | 48c1ff5a6e08a5d69ef36593de966018f229b01e /lib-src | |
| parent | 48093eb9bca47488b6867e53a12e7cac37d6f5a6 (diff) | |
| download | emacs-78f83752f50a2aa9944e60a5aceac4015eb3ca58.tar.gz | |
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 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/ebrowse.c | 3 | ||||
| -rw-r--r-- | lib-src/etags.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f5846657707..3f1e287db34 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2012-09-17 Glenn Morris <rgm@gnu.org> + + * ebrowse.c (version): + * etags.c (print_version): Use COPYRIGHT. + 2012-09-11 Paul Eggert <eggert@cs.ucla.edu> * pop.c (socket_connection) [HAVE_GETADDRINFO]: diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index f8569fe3747..056ed471fde 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -3516,8 +3516,7 @@ usage (int error) static _Noreturn void version (void) { - /* Makes it easier to update automatically. */ - char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; + char emacs_copyright[] = COPYRIGHT; printf ("ebrowse %s\n", VERSION); puts (emacs_copyright); diff --git a/lib-src/etags.c b/lib-src/etags.c index e65082de534..ec415e9905f 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -836,8 +836,7 @@ etags --help --lang=ada."); static void print_version (void) { - /* Makes it easier to update automatically. */ - char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; + char emacs_copyright[] = COPYRIGHT; printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); puts (emacs_copyright); |