summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-01-01 18:46:30 -0800
committerGlenn Morris <rgm@gnu.org>2011-01-01 18:46:30 -0800
commitd7bfa7a1d955a19894ebf5c6392721a1b5c85d6f (patch)
tree11e62fbb8f8b49bdf0545b3095e0612d3b9512e2
parent9430e9882e6331ea9fa300b44b3c980faa711ac0 (diff)
downloademacs-d7bfa7a1d955a19894ebf5c6392721a1b5c85d6f.tar.gz
Set short copyright year to 2011.
* lib-src/ebrowse.c (version) <emacs_copyright>: * lib-src/etags.c (print_version) <emacs_copyright>: * lib-src/rcs2log (Copyright): * lisp/version.el (emacs-copyright): * nextstep/Cocoa/Emacs.base/Contents/Info.plist: * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist: Set short copyright year to 2011.
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lib-src/ebrowse.c9
-rw-r--r--lib-src/etags.c9
-rwxr-xr-xlib-src/rcs2log7
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/version.el5
-rw-r--r--nextstep/ChangeLog6
-rw-r--r--nextstep/Cocoa/Emacs.base/Contents/Info.plist4
-rw-r--r--nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings2
-rw-r--r--nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist2
10 files changed, 31 insertions, 23 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 0f518445a45..ad1387aab0a 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-02 Glenn Morris <rgm@gnu.org>
+
+ * ebrowse.c (version) <emacs_copyright>:
+ * etags.c (print_version) <emacs_copyright>:
+ * rcs2log (Copyright): Set short copyright year to 2011.
+
2010-11-27 Joe Matarazzo <joe.matarazzo@gmail.com> (tiny change)
* ebrowse.c (yylex): If end of input buffer encountered while
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 67c9637daba..735cf30ae2e 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,8 +1,8 @@
/* ebrowse.c --- parsing files for the ebrowse C++ browser
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -3685,7 +3685,7 @@ void
version ()
{
/* Makes it easier to update automatically. */
- char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
+ char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
printf ("ebrowse %s\n", VERSION);
puts (emacs_copyright);
@@ -3989,7 +3989,4 @@ main (argc, argv)
return EXIT_SUCCESS;
}
-/* arch-tag: fc03b4bc-91a9-4c3d-b3b9-12a77fa86dd8
- (do not change this comment) */
-
/* ebrowse.c ends here */
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 17aad9a2252..da43b89e40a 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -29,8 +29,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ 2011 Free Software Foundation, Inc.
This file is not considered part of GNU Emacs.
@@ -898,7 +898,7 @@ static void
print_version ()
{
/* Makes it easier to update automatically. */
- char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
+ char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
puts (emacs_copyright);
@@ -6854,7 +6854,4 @@ xrealloc (ptr, size)
* End:
*/
-/* arch-tag: 8a9b748d-390c-4922-99db-2eeefa921051
- (do not change this comment) */
-
/* etags.c ends here */
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 2a2eab83fcb..5808068f646 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -3,8 +3,8 @@
# RCS to ChangeLog generator
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Free Software Foundation, Inc.
# Author: Paul Eggert <eggert@twinsun.com>
@@ -22,7 +22,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-Copyright='Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2011 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
@@ -777,4 +777,3 @@ exec rm -fr $logdir
# tab-width:4
# End:
-# arch-tag: cea067bd-a552-4254-ba17-078208933073
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc6eb24b816..278b770097a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-02 Glenn Morris <rgm@gnu.org>
+
+ * version.el (emacs-copyright): Set short copyright year to 2011.
+
2011-01-02 Mark Lillibridge <mark.lillibridge@hp.com> (tiny change)
* mail/mail-utils.el (mail-strip-quoted-names): Avoid clobbering
diff --git a/lisp/version.el b/lisp/version.el
index a4ec3be11d3..1187fea50df 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,7 +1,7 @@
;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; Free Software Foundation, Inc.
;; Maintainer: FSF
@@ -29,7 +29,7 @@
;;; Code:
-(defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
+(defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\
Short copyright string for this version of Emacs.")
(defconst emacs-version "23.2.91" "\
@@ -93,5 +93,4 @@ to the system configuration; look at `system-configuration' instead."
;;version-control: never
;;End:
-;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
;;; version.el ends here
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 9396f90a5c7..2fd7dd4f1fc 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-02 Glenn Morris <rgm@gnu.org>
+
+ * Cocoa/Emacs.base/Contents/Info.plist:
+ * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
+ * GNUstep/Emacs.base/Resources/Info-gnustep.plist:
+
2010-05-07 Chong Yidong <cyd@stupidchicken.com>
* Version 23.2 released.
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index 9788377c103..64601ba5aa4 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
@@ -1,5 +1,5 @@
<!--
-Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
<key>CFBundleExecutable</key>
<string>Emacs</string>
<key>CFBundleGetInfoString</key>
- <string>Emacs 23.2.91 Copyright (C) 2010 Free Software Foundation, Inc.</string>
+ <string>Emacs 23.2.91 Copyright (C) 2011 Free Software Foundation, Inc.</string>
<key>CFBundleIconFile</key>
<string>Emacs.icns</string>
<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 b20105ee28f..20636e09304 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 @@
CFBundleName = "Emacs";
CFBundleShortVersionString = "Version 23.2.91";
CFBundleGetInfoString = "Emacs version 23.2.91, NS Windowing";
-NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
+NSHumanReadableCopyright = "Copyright (C) 2011 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 aaedda4d647..a9963f3651b 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
@@ -11,7 +11,7 @@
"Carl Edman (NeXTStep)",
"..see http://emacs-app.sf.net/authorship.html"
);
- Copyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
+ Copyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
FullVersionID = "Emacs 23.2.91, NS Windowing";
NSExecutable = Emacs;