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.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index f7c37b2465412e2a32ae5f8973303b1dcc5da054..6c45376b671110fcf60226063491c3838bf125c4 100644 (file)
--- 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 f60be117ad5c580ea023202a1b086b733cf0b60d..1eb88a223fa81d37c2e54c40697942f0e9eb2d39 100644 (file)
--- 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 63239b55c10cb64ab4a79c07dec66a0cfb174581..a2db40137bbbbe4f0910939ee22ed3d6a878b506 100644 (file)
--- 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 8b9456b4a6376260bd4a61f29f8e0e1490150320..b2867e66547c28fa731c61287f87c6563cd8a6bc 100644 (file)
--- 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 d20d6a083643136289939fa7335765bfa5517dd5..76a28eb360e27b3cd5b098934ca2120f9fbec881 100644 (file)
--- 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 58527be9d76869f3a7a542d014437b466a4acac5..472cb1e431eceb7f457bb825e84e02920885a45f 100644 (file)
--- 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 f1fd6808cdebdd9579141c7957b8dceb192289c1..80ab686faefc71e19e0f82a1f68df49b5f4e7722 100644 (file)
--- 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 01afe76ff30f1b7f1e023359b5ada849e2331093..f0cabda8379cca5e8a095fa023fb5c966c79282b 100644 (file)
--- 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 61caccbea8ef769d2e4810f55173a06411b86754..674b63becbc829c3883a14ea467cba14f4c21cc4 100644 (file)
--- 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 b9c84ac680a7c666333bb2ec2fdcdeb12a30fc2e..c6ad7c4f393341c8885633d0d41eeff41ff8801c 100644 (file)
--- 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 d49cd1e6252a9e0bc7d6a164d00bcbac793b57cb..19165a4b4bf2783ad4eb69b9e6bcd9ec44a98dbd 100644 (file)
--- 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 23624116709362256bfffa638ae6febe689cd0b0..e57ea48cd6a3511dcf14f77afd71d549e44323d5 100644 (file)
--- 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 4091f59d1f6c9cd310411f3cb3065754bebb1b56..0515cdb82678e345dcef3c75c3d390da93db8474 100644 (file)
--- 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 7d4f9dbfa89d8636eb35c3146b5228127ea36654..61b81de5cbfd40c84a697c3515eb8ea14c700120 100644 (file)
--- 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 f2b47acc809e40767a24b51aac4dc076060808f0..cd6ff3383e833ef37da0c4243f3d48aef62a7abb 100644 (file)
--- 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 12d66ce95547b3717ff06e60d757e98fdb1f88d6..1203bb1131d689072157b69918bc6ffe35bae583 100644 (file)
--- 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 789bbaea92f6f8fb1c9c4f43874e25d3ce4842e2..9bd2cc71b7123cf17a4752da50a9cc5bc7a5d133 100644 (file)
--- 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 f496ac1af0fae5f4e695ebeb8d9170a901a99d11..282dd3d389a2a35f80c7586d5b733ba32d7583b3 100644 (file)
--- 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 845bc38bc4790b0b4fded2fc4bb9c192d8c7d25d..95ba48cb1efe6d1618f48c5f05f69b052ca5672e 100644 (file)
--- 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 47decbb9f741f725472da672f55368ced91a3d29..07d2193e167643a7732c8015a55bf22b67855734 100644 (file)
--- 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 594137744fed836a408b21e9a49906d99f1dd77b..4922713a91a7ef17521b9acca913089e4e1f97d0 100644 (file)
--- 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 e989473219caaf909e599e83500576af56df3985..f92824f6d7e8653043e749a618b13563a5845b2c 100644 (file)
--- 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 9af4f4faf41556f599641410a6135265380db20e..8cdc7bd0e056221199b6ce381d18addeff04ed32 100644 (file)
--- 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 8852c9faea44d7cd9f136310724f30e4b2fdec52..4f829b84cc188be3dde534c9770727a89ddc747c 100644 (file)
--- 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 4e1dd306977da32259c6268e0660150276f7e15a..212fad88bf56b807eba6b65bddae8f61833b7b81 100755 (executable)
--- 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 4e8fe39997001ee3be94b010a94cadc7ce42ebc6..4f040cf555e20433a8677559de776baca595039e 100644 (file)
--- 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 61a8a28f3a99d045082f23fb73683aab5ff19f54..8a9f97aed8407c4b44dbfa872e81f1b50e594288 100644 (file)
--- 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 438a6103f5e617a4bbf4b7bcd21b07396166131d..681521784d279a398c7897f93d35dabdac85770f 100644 (file)
--- 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 9747ed25a2a4ed1cf2be41999642510a06aef8a4..5a98a76a34421cf2523a259b3ff13cde03aa319b 100644 (file)
--- 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 31d6ecaca432b54dda86df0a39e162d5f19c5a6c..9095c46488b8b2df758ad04a334fe847a8eb2e7b 100644 (file)
--- 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 f4fa0eb0b9edf2339e693c9031bc1f3e5085816f..235d2cfe3b73ac85af9f6ae20050f70597a7e183 100644 (file)
--- 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.  */