summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-01-04 23:45:28 -0800
committerGlenn Morris <rgm@gnu.org>2012-01-04 23:45:28 -0800
commit1c6e5a3260fd774dbc8fac0c1e14b57165bcf6bd (patch)
treeef971faa3c2326a9800dd4f2cb9f527be1bfbe34
parentbb5aa5d6c3a0138c36e2879a78d9cdb22e6f410e (diff)
downloademacs-1c6e5a3260fd774dbc8fac0c1e14b57165bcf6bd.tar.gz
Update short copyright year to 2012.
* etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex: * etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex: * etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex: * etc/refcards/fr-dired-ref.tex, etc/refcards/fr-refcard.tex: * etc/refcards/fr-survival.tex, etc/refcards/orgcard.tex: * etc/refcards/pl-refcard.tex, etc/refcards/pt-br-refcard.tex: * etc/refcards/refcard.tex, etc/refcards/ru-refcard.tex: * etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex: * etc/refcards/sk-survival.tex, etc/refcards/survival.tex: * etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: * lib-src/ebrowse.c (version) <emacs_copyright>: * lib-src/etags.c (print_version) <emacs_copyright>: * lib-src/rcs2log (Copyright): Update short copyright year to 2012. * 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: * src/emacs.c (emacs_copyright): Update short copyright year to 2012.
-rw-r--r--etc/ChangeLog14
-rw-r--r--etc/refcards/calccard.tex2
-rw-r--r--etc/refcards/cs-dired-ref.tex2
-rw-r--r--etc/refcards/cs-refcard.tex2
-rw-r--r--etc/refcards/cs-survival.tex2
-rw-r--r--etc/refcards/de-refcard.tex2
-rw-r--r--etc/refcards/dired-ref.tex2
-rw-r--r--etc/refcards/fr-dired-ref.tex2
-rw-r--r--etc/refcards/fr-refcard.tex2
-rw-r--r--etc/refcards/fr-survival.tex2
-rw-r--r--etc/refcards/orgcard.tex2
-rw-r--r--etc/refcards/pl-refcard.tex2
-rw-r--r--etc/refcards/pt-br-refcard.tex2
-rw-r--r--etc/refcards/refcard.tex2
-rw-r--r--etc/refcards/ru-refcard.tex2
-rw-r--r--etc/refcards/sk-dired-ref.tex2
-rw-r--r--etc/refcards/sk-refcard.tex2
-rw-r--r--etc/refcards/sk-survival.tex2
-rw-r--r--etc/refcards/survival.tex2
-rw-r--r--etc/refcards/vipcard.tex2
-rw-r--r--etc/refcards/viperCard.tex2
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lib-src/ebrowse.c2
-rw-r--r--lib-src/etags.c2
-rwxr-xr-xlib-src/rcs2log2
-rw-r--r--nextstep/ChangeLog7
-rw-r--r--nextstep/Cocoa/Emacs.base/Contents/Info.plist2
-rw-r--r--nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings2
-rw-r--r--nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist2
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c2
31 files changed, 58 insertions, 27 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index f7c37b24654..6c45376b671 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,17 @@
+2012-01-05 Glenn Morris <rgm@gnu.org>
+
+ * refcards/calccard.tex, refcards/cs-dired-ref.tex:
+ * refcards/cs-refcard.tex, refcards/cs-survival.tex:
+ * refcards/de-refcard.tex, refcards/dired-ref.tex:
+ * refcards/fr-dired-ref.tex, refcards/fr-refcard.tex:
+ * refcards/fr-survival.tex, refcards/orgcard.tex:
+ * refcards/pl-refcard.tex, refcards/pt-br-refcard.tex:
+ * refcards/refcard.tex, refcards/ru-refcard.tex:
+ * refcards/sk-dired-ref.tex, refcards/sk-refcard.tex:
+ * refcards/sk-survival.tex, refcards/survival.tex:
+ * refcards/vipcard.tex, refcards/viperCard.tex:
+ Update short copyright year to 2012.
+
2012-01-03 Bastien Guerry <bzg@altern.org>
* org/COPYRIGHT-AND-LICENSE: New file.
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index f60be117ad5..1eb88a223fa 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -64,7 +64,7 @@
% Internet: gildea@stop.mail-abuse.org
\def\emacsversionnumber{23}
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index 63239b55c10..a2db40137bb 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -42,7 +42,7 @@
\pdflayout=(0)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
% Nothing else needs to be changed.
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 8b9456b4a63..b2867e66547 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -60,7 +60,7 @@
\pdflayout=(0)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
% Nothing else needs to be changed.
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index d20d6a08364..76a28eb360e 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -55,7 +55,7 @@
\chyph
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 58527be9d76..472cb1e431e 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -61,7 +61,7 @@
\mdqoff % deactivates the "-char
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
% Nothing else needs to be changed below this line.
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index f1fd6808cde..80ab686faef 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -44,7 +44,7 @@
\pdflayout=(1)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
% Nothing else needs to be changed.
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index 01afe76ff30..f0cabda8379 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -36,7 +36,7 @@
\pdflayout=(0)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
% Nothing else needs to be changed.
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index 61caccbea8e..674b63becbc 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -57,7 +57,7 @@
\pdflayout=(0l)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
% Nothing else needs to be changed below this line.
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index b9c84ac680a..c6ad7c4f393 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -50,7 +50,7 @@
\pdflayout=(0)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index d49cd1e6252..19165a4b4bf 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,7 +1,7 @@
% Reference Card for Org Mode
\def\orgversionnumber{7.8.02}
\def\versionyear{2011} % latest update
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
%**start of header
\newcount\columnsperpage
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 23624116709..e57ea48cd6a 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -70,7 +70,7 @@
\pdflayout=(0)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
% Nothing else needs to be changed.
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 4091f59d1f6..0515cdb8267 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -63,7 +63,7 @@
\pdflayout=(0l)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
% Nothing else needs to be changed below this line.
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 7d4f9dbfa89..61b81de5cbf 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -64,7 +64,7 @@
% Nothing else needs to be changed below this line.
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % copyright year
+\def\year{2012} % copyright year
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index f2b47acc809..cd6ff3383e8 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -22,7 +22,7 @@
\setlength{\ColThreeWidth}{25mm}
\newcommand{\versionemacs}[0]{23} % version of Emacs this is for
-\newcommand{\cyear}[0]{2011} % copyright year
+\newcommand{\cyear}[0]{2012} % copyright year
\newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
\centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 12d66ce9554..1203bb1131d 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -43,7 +43,7 @@
\pdflayout=(0)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
% Nothing else needs to be changed.
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 789bbaea92f..9bd2cc71b71 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -61,7 +61,7 @@
\pdflayout=(0)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2010} % latest copyright year
+\def\year{2012} % latest copyright year
% Nothing else needs to be changed.
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index f496ac1af0f..282dd3d389a 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -56,7 +56,7 @@
\shyph
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 845bc38bc47..95ba48cb1ef 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -45,7 +45,7 @@
\pdflayout=(1)
\def\versionemacs{23} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index 47decbb9f74..07d2193e167 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -50,7 +50,7 @@
\pdflayout=(1)
\def\versionemacs{18} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
\def\versionvip{3.5}
% Nothing else needs to be changed.
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index 594137744fe..4922713a91a 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -53,7 +53,7 @@
\pdflayout=(1)
\def\versionemacs{21} % version of Emacs this is for
-\def\year{2011} % latest copyright year
+\def\year{2012} % latest copyright year
\def\versionxemacs{20} % version of XEmacs this is for
\def\versionviper{3.0} % version of Viper this is for
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e989473219c..f92824f6d7e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-05 Glenn Morris <rgm@gnu.org>
+
+ * ebrowse.c (version) <emacs_copyright>:
+ * etags.c (print_version) <emacs_copyright>:
+ * rcs2log (Copyright): Update short copyright year to 2012.
+
2011-12-25 Andreas Schwab <schwab@linux-m68k.org>
* etags.c (C_entries): Properly skip over string and character
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 9af4f4faf41..8cdc7bd0e05 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -3526,7 +3526,7 @@ static void
version (void)
{
/* Makes it easier to update automatically. */
- char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
+ char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
printf ("ebrowse %s\n", VERSION);
puts (emacs_copyright);
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 8852c9faea4..4f829b84cc1 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -867,7 +867,7 @@ static void
print_version (void)
{
/* Makes it easier to update automatically. */
- char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
+ char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
puts (emacs_copyright);
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 4e1dd306977..212fad88bf5 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -20,7 +20,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-Copyright='Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2012 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.
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 4e8fe399970..4f040cf555e 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-05 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:
+ Update short copyright year to 2012.
+
2011-10-19 Jan Djärv <jan.h.d@swipnet.se>
* INSTALL: Remove XCode part.
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index 61a8a28f3a9..8a9f97aed84 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/>.
<key>CFBundleExecutable</key>
<string>Emacs</string>
<key>CFBundleGetInfoString</key>
- <string>Emacs 24.0.92 Copyright (C) 2011 Free Software Foundation, Inc.</string>
+ <string>Emacs 24.0.92 Copyright (C) 2012 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 438a6103f5e..681521784d2 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 24.0.92";
CFBundleGetInfoString = "Emacs version 24.0.92, NS Windowing";
-NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
+NSHumanReadableCopyright = "Copyright (C) 2012 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 9747ed25a2a..5a98a76a344 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 etc/NEXTSTEP"
);
- Copyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
+ Copyright = "Copyright (C) 2012 Free Software Foundation, Inc.";
CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
FullVersionID = "Emacs 24.0.92, NS Windowing";
NSExecutable = Emacs;
diff --git a/src/ChangeLog b/src/ChangeLog
index 31d6ecaca43..9095c46488b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-05 Glenn Morris <rgm@gnu.org>
+
+ * emacs.c (emacs_copyright): Update short copyright year to 2012.
+
2012-01-01 Eli Zaretskii <eliz@gnu.org>
* gnutls.c (init_gnutls_functions): Load gnutls_check_version.
diff --git a/src/emacs.c b/src/emacs.c
index f4fa0eb0b9e..235d2cfe3b7 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -98,7 +98,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
static const char emacs_version[] = VERSION;
-static const char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
+static const char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
/* Make these values available in GDB, which doesn't see macros. */