diff options
| author | Glenn Morris | 2010-01-10 23:51:51 -0800 |
|---|---|---|
| committer | Glenn Morris | 2010-01-10 23:51:51 -0800 |
| commit | 6589a2f98dae1301980e85e01844b75079f48364 (patch) | |
| tree | 91b75fb7a1c53f996004cc8c5f53efddb5b013b5 | |
| parent | 1df47e3844f79ba5f490096dd6206d50367363ba (diff) | |
| download | emacs-6589a2f98dae1301980e85e01844b75079f48364.tar.gz emacs-6589a2f98dae1301980e85e01844b75079f48364.zip | |
Set copyright year to 2010.
* Cocoa/Emacs.base/Contents/Info.plist:
* Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* GNUstep/Emacs.base/Resources/Info-gnustep.plist:
Set copyright year to 2010.
* version.el (emacs-copyright): Set copyright year to 2010.
* ebrowse.c (version):
* etags.c (print_version):
* rcs2log (Copyright): Set copyright year to 2010.
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/ebrowse.c | 4 | ||||
| -rw-r--r-- | lib-src/etags.c | 4 | ||||
| -rwxr-xr-x | lib-src/rcs2log | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/version.el | 4 | ||||
| -rw-r--r-- | nextstep/ChangeLog | 7 | ||||
| -rw-r--r-- | nextstep/Cocoa/Emacs.base/Contents/Info.plist | 2 | ||||
| -rw-r--r-- | nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings | 2 | ||||
| -rw-r--r-- | nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist | 2 |
10 files changed, 28 insertions, 11 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index cc205d26a50..120a2f3b604 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2010-01-11 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * ebrowse.c (version): | ||
| 4 | * etags.c (print_version): | ||
| 5 | * rcs2log (Copyright): Set copyright year to 2010. | ||
| 6 | |||
| 1 | 2009-12-09 David Robinow <drobinow@gmail.com> (tiny change) | 7 | 2009-12-09 David Robinow <drobinow@gmail.com> (tiny change) |
| 2 | 8 | ||
| 3 | * makefile.w32-in: Use parenthesis for macros for nmake | 9 | * makefile.w32-in: Use parenthesis for macros for nmake |
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 85def362dea..b51b4aa6965 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* ebrowse.c --- parsing files for the ebrowse C++ browser | 1 | /* ebrowse.c --- parsing files for the ebrowse C++ browser |
| 2 | 2 | ||
| 3 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, | 3 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
| 4 | 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 | 4 | 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 5 | Free Software Foundation, Inc. | 5 | Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | This file is part of GNU Emacs. | 7 | This file is part of GNU Emacs. |
| @@ -3680,7 +3680,7 @@ void | |||
| 3680 | version () | 3680 | version () |
| 3681 | { | 3681 | { |
| 3682 | /* Makes it easier to update automatically. */ | 3682 | /* Makes it easier to update automatically. */ |
| 3683 | char emacs_copyright[] = "Copyright (C) 2009 Free Software Foundation, Inc."; | 3683 | char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; |
| 3684 | 3684 | ||
| 3685 | printf ("ebrowse %s\n", VERSION); | 3685 | printf ("ebrowse %s\n", VERSION); |
| 3686 | puts (emacs_copyright); | 3686 | puts (emacs_copyright); |
diff --git a/lib-src/etags.c b/lib-src/etags.c index 6fce4529855..8cdd47957f6 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -29,7 +29,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999, | 31 | Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999, |
| 32 | 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 | 32 | 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 33 | Free Software Foundation, Inc. | 33 | Free Software Foundation, Inc. |
| 34 | 34 | ||
| 35 | This file is not considered part of GNU Emacs. | 35 | This file is not considered part of GNU Emacs. |
| @@ -898,7 +898,7 @@ static void | |||
| 898 | print_version () | 898 | print_version () |
| 899 | { | 899 | { |
| 900 | /* Makes it easier to update automatically. */ | 900 | /* Makes it easier to update automatically. */ |
| 901 | char emacs_copyright[] = "Copyright (C) 2009 Free Software Foundation, Inc."; | 901 | char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; |
| 902 | 902 | ||
| 903 | printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); | 903 | printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); |
| 904 | puts (emacs_copyright); | 904 | puts (emacs_copyright); |
diff --git a/lib-src/rcs2log b/lib-src/rcs2log index df84aef198c..2a2eab83fcb 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # RCS to ChangeLog generator | 3 | # RCS to ChangeLog generator |
| 4 | 4 | ||
| 5 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, | 5 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, |
| 6 | # 2004, 2005, 2006, 2007, 2008, 2009 | 6 | # 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 7 | # Free Software Foundation, Inc. | 7 | # Free Software Foundation, Inc. |
| 8 | 8 | ||
| 9 | # Author: Paul Eggert <eggert@twinsun.com> | 9 | # Author: Paul Eggert <eggert@twinsun.com> |
| @@ -22,7 +22,7 @@ | |||
| 22 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 22 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | Copyright='Copyright (C) 2009 Free Software Foundation, Inc. | 25 | Copyright='Copyright (C) 2010 Free Software Foundation, Inc. |
| 26 | This program comes with NO WARRANTY, to the extent permitted by law. | 26 | This program comes with NO WARRANTY, to the extent permitted by law. |
| 27 | You may redistribute copies of this program | 27 | You may redistribute copies of this program |
| 28 | under the terms of the GNU General Public License. | 28 | under the terms of the GNU General Public License. |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 677f1b404ea..8df3e5c77c1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-01-11 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * version.el (emacs-copyright): Set copyright year to 2010. | ||
| 4 | |||
| 1 | 2010-01-10 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2010-01-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * format.el (format-annotate-function): Only set | 7 | * format.el (format-annotate-function): Only set |
diff --git a/lisp/version.el b/lisp/version.el index 92252f3a222..8b8cdb376e9 100644 --- a/lisp/version.el +++ b/lisp/version.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- | 1 | ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, | 3 | ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, |
| 4 | ;; 2004, 2005, 2006, 2007, 2008, 2009 | 4 | ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 5 | ;; Free Software Foundation, Inc. | 5 | ;; Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | ;; Maintainer: FSF | 7 | ;; Maintainer: FSF |
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | ;;; Code: | 30 | ;;; Code: |
| 31 | 31 | ||
| 32 | (defconst emacs-copyright "Copyright (C) 2009 Free Software Foundation, Inc." "\ | 32 | (defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\ |
| 33 | Short copyright string for this version of Emacs.") | 33 | Short copyright string for this version of Emacs.") |
| 34 | 34 | ||
| 35 | (defconst emacs-version "23.1.91" "\ | 35 | (defconst emacs-version "23.1.91" "\ |
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 86f36eb14a7..d4fae2fd58f 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2010-01-11 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Cocoa/Emacs.base/Contents/Info.plist: | ||
| 4 | * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: | ||
| 5 | * GNUstep/Emacs.base/Resources/Info-gnustep.plist: | ||
| 6 | Set copyright year to 2010. | ||
| 7 | |||
| 1 | 2009-09-23 Adrian Robert <Adrian.B.Robert@gmail.com> | 8 | 2009-09-23 Adrian Robert <Adrian.B.Robert@gmail.com> |
| 2 | 9 | ||
| 3 | * README: Note GNUstep support is now Startup 0.23 or later. | 10 | * README: Note GNUstep support is now Startup 0.23 or later. |
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index be1ec763dfc..35dc00e190d 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist | |||
| @@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | |||
| 553 | <key>CFBundleExecutable</key> | 553 | <key>CFBundleExecutable</key> |
| 554 | <string>Emacs</string> | 554 | <string>Emacs</string> |
| 555 | <key>CFBundleGetInfoString</key> | 555 | <key>CFBundleGetInfoString</key> |
| 556 | <string>Emacs 23.1.91 Copyright (C) 2009 Free Software Foundation, Inc.</string> | 556 | <string>Emacs 23.1.91 Copyright (C) 2010 Free Software Foundation, Inc.</string> |
| 557 | <key>CFBundleIconFile</key> | 557 | <key>CFBundleIconFile</key> |
| 558 | <string>Emacs.icns</string> | 558 | <string>Emacs.icns</string> |
| 559 | <key>CFBundleIdentifier</key> | 559 | <key>CFBundleIdentifier</key> |
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings index 582d142d0bc..7e8a96ce47c 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings | |||
| @@ -3,4 +3,4 @@ | |||
| 3 | CFBundleName = "Emacs"; | 3 | CFBundleName = "Emacs"; |
| 4 | CFBundleShortVersionString = "Version 23.1.91"; | 4 | CFBundleShortVersionString = "Version 23.1.91"; |
| 5 | CFBundleGetInfoString = "Emacs version 23.1.91, NS Windowing"; | 5 | CFBundleGetInfoString = "Emacs version 23.1.91, NS Windowing"; |
| 6 | NSHumanReadableCopyright = "Copyright (C) 2009 Free Software Foundation, Inc."; | 6 | NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc."; |
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist index be9b4a5af5a..22b71d443e6 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | "Carl Edman (NeXTStep)", | 11 | "Carl Edman (NeXTStep)", |
| 12 | "..see http://emacs-app.sf.net/authorship.html" | 12 | "..see http://emacs-app.sf.net/authorship.html" |
| 13 | ); | 13 | ); |
| 14 | Copyright = "Copyright (C) 2009 Free Software Foundation, Inc."; | 14 | Copyright = "Copyright (C) 2010 Free Software Foundation, Inc."; |
| 15 | CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; | 15 | CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; |
| 16 | FullVersionID = "Emacs 23.1.91, NS Windowing"; | 16 | FullVersionID = "Emacs 23.1.91, NS Windowing"; |
| 17 | NSExecutable = Emacs; | 17 | NSExecutable = Emacs; |