diff options
| author | Glenn Morris | 2012-01-04 23:45:28 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-01-04 23:45:28 -0800 |
| commit | 1c6e5a3260fd774dbc8fac0c1e14b57165bcf6bd (patch) | |
| tree | ef971faa3c2326a9800dd4f2cb9f527be1bfbe34 | |
| parent | bb5aa5d6c3a0138c36e2879a78d9cdb22e6f410e (diff) | |
| download | emacs-1c6e5a3260fd774dbc8fac0c1e14b57165bcf6bd.tar.gz emacs-1c6e5a3260fd774dbc8fac0c1e14b57165bcf6bd.zip | |
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.
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 @@ | |||
| 1 | 2012-01-05 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * refcards/calccard.tex, refcards/cs-dired-ref.tex: | ||
| 4 | * refcards/cs-refcard.tex, refcards/cs-survival.tex: | ||
| 5 | * refcards/de-refcard.tex, refcards/dired-ref.tex: | ||
| 6 | * refcards/fr-dired-ref.tex, refcards/fr-refcard.tex: | ||
| 7 | * refcards/fr-survival.tex, refcards/orgcard.tex: | ||
| 8 | * refcards/pl-refcard.tex, refcards/pt-br-refcard.tex: | ||
| 9 | * refcards/refcard.tex, refcards/ru-refcard.tex: | ||
| 10 | * refcards/sk-dired-ref.tex, refcards/sk-refcard.tex: | ||
| 11 | * refcards/sk-survival.tex, refcards/survival.tex: | ||
| 12 | * refcards/vipcard.tex, refcards/viperCard.tex: | ||
| 13 | Update short copyright year to 2012. | ||
| 14 | |||
| 1 | 2012-01-03 Bastien Guerry <bzg@altern.org> | 15 | 2012-01-03 Bastien Guerry <bzg@altern.org> |
| 2 | 16 | ||
| 3 | * org/COPYRIGHT-AND-LICENSE: New file. | 17 | * 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 @@ | |||
| 64 | % Internet: gildea@stop.mail-abuse.org | 64 | % Internet: gildea@stop.mail-abuse.org |
| 65 | 65 | ||
| 66 | \def\emacsversionnumber{23} | 66 | \def\emacsversionnumber{23} |
| 67 | \def\year{2011} % latest copyright year | 67 | \def\year{2012} % latest copyright year |
| 68 | 68 | ||
| 69 | \def\shortcopyrightnotice{\vskip 1ex plus 2 fill | 69 | \def\shortcopyrightnotice{\vskip 1ex plus 2 fill |
| 70 | \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. | 70 | \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 @@ | |||
| 42 | \pdflayout=(0) | 42 | \pdflayout=(0) |
| 43 | 43 | ||
| 44 | \def\versionemacs{23} % version of Emacs this is for | 44 | \def\versionemacs{23} % version of Emacs this is for |
| 45 | \def\year{2011} % latest copyright year | 45 | \def\year{2012} % latest copyright year |
| 46 | 46 | ||
| 47 | % Nothing else needs to be changed. | 47 | % Nothing else needs to be changed. |
| 48 | 48 | ||
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 @@ | |||
| 60 | \pdflayout=(0) | 60 | \pdflayout=(0) |
| 61 | 61 | ||
| 62 | \def\versionemacs{23} % version of Emacs this is for | 62 | \def\versionemacs{23} % version of Emacs this is for |
| 63 | \def\year{2011} % latest copyright year | 63 | \def\year{2012} % latest copyright year |
| 64 | 64 | ||
| 65 | % Nothing else needs to be changed. | 65 | % Nothing else needs to be changed. |
| 66 | 66 | ||
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 @@ | |||
| 55 | \chyph | 55 | \chyph |
| 56 | 56 | ||
| 57 | \def\versionemacs{23} % version of Emacs this is for | 57 | \def\versionemacs{23} % version of Emacs this is for |
| 58 | \def\year{2011} % latest copyright year | 58 | \def\year{2012} % latest copyright year |
| 59 | 59 | ||
| 60 | \def\copyrightnotice{\penalty-1\vfill | 60 | \def\copyrightnotice{\penalty-1\vfill |
| 61 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter | 61 | \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 @@ | |||
| 61 | \mdqoff % deactivates the "-char | 61 | \mdqoff % deactivates the "-char |
| 62 | 62 | ||
| 63 | \def\versionemacs{23} % version of Emacs this is for | 63 | \def\versionemacs{23} % version of Emacs this is for |
| 64 | \def\year{2011} % latest copyright year | 64 | \def\year{2012} % latest copyright year |
| 65 | 65 | ||
| 66 | % Nothing else needs to be changed below this line. | 66 | % Nothing else needs to be changed below this line. |
| 67 | 67 | ||
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 @@ | |||
| 44 | \pdflayout=(1) | 44 | \pdflayout=(1) |
| 45 | 45 | ||
| 46 | \def\versionemacs{23} % version of Emacs this is for | 46 | \def\versionemacs{23} % version of Emacs this is for |
| 47 | \def\year{2011} % latest copyright year | 47 | \def\year{2012} % latest copyright year |
| 48 | 48 | ||
| 49 | % Nothing else needs to be changed. | 49 | % Nothing else needs to be changed. |
| 50 | 50 | ||
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 @@ | |||
| 36 | \pdflayout=(0) | 36 | \pdflayout=(0) |
| 37 | 37 | ||
| 38 | \def\versionemacs{23} % version of Emacs this is for | 38 | \def\versionemacs{23} % version of Emacs this is for |
| 39 | \def\year{2011} % latest copyright year | 39 | \def\year{2012} % latest copyright year |
| 40 | 40 | ||
| 41 | % Nothing else needs to be changed. | 41 | % Nothing else needs to be changed. |
| 42 | 42 | ||
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 @@ | |||
| 57 | \pdflayout=(0l) | 57 | \pdflayout=(0l) |
| 58 | 58 | ||
| 59 | \def\versionemacs{23} % version of Emacs this is for | 59 | \def\versionemacs{23} % version of Emacs this is for |
| 60 | \def\year{2011} % latest copyright year | 60 | \def\year{2012} % latest copyright year |
| 61 | 61 | ||
| 62 | % Nothing else needs to be changed below this line. | 62 | % Nothing else needs to be changed below this line. |
| 63 | 63 | ||
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 @@ | |||
| 50 | \pdflayout=(0) | 50 | \pdflayout=(0) |
| 51 | 51 | ||
| 52 | \def\versionemacs{23} % version of Emacs this is for | 52 | \def\versionemacs{23} % version of Emacs this is for |
| 53 | \def\year{2011} % latest copyright year | 53 | \def\year{2012} % latest copyright year |
| 54 | 54 | ||
| 55 | \def\copyrightnotice{\penalty-1\vfill | 55 | \def\copyrightnotice{\penalty-1\vfill |
| 56 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter | 56 | \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 @@ | |||
| 1 | % Reference Card for Org Mode | 1 | % Reference Card for Org Mode |
| 2 | \def\orgversionnumber{7.8.02} | 2 | \def\orgversionnumber{7.8.02} |
| 3 | \def\versionyear{2011} % latest update | 3 | \def\versionyear{2011} % latest update |
| 4 | \def\year{2011} % latest copyright year | 4 | \def\year{2012} % latest copyright year |
| 5 | 5 | ||
| 6 | %**start of header | 6 | %**start of header |
| 7 | \newcount\columnsperpage | 7 | \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 @@ | |||
| 70 | \pdflayout=(0) | 70 | \pdflayout=(0) |
| 71 | 71 | ||
| 72 | \def\versionemacs{23} % version of Emacs this is for | 72 | \def\versionemacs{23} % version of Emacs this is for |
| 73 | \def\year{2011} % latest copyright year | 73 | \def\year{2012} % latest copyright year |
| 74 | 74 | ||
| 75 | % Nothing else needs to be changed. | 75 | % Nothing else needs to be changed. |
| 76 | 76 | ||
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 @@ | |||
| 63 | \pdflayout=(0l) | 63 | \pdflayout=(0l) |
| 64 | 64 | ||
| 65 | \def\versionemacs{23} % version of Emacs this is for | 65 | \def\versionemacs{23} % version of Emacs this is for |
| 66 | \def\year{2011} % latest copyright year | 66 | \def\year{2012} % latest copyright year |
| 67 | 67 | ||
| 68 | % Nothing else needs to be changed below this line. | 68 | % Nothing else needs to be changed below this line. |
| 69 | 69 | ||
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 @@ | |||
| 64 | % Nothing else needs to be changed below this line. | 64 | % Nothing else needs to be changed below this line. |
| 65 | 65 | ||
| 66 | \def\versionemacs{23} % version of Emacs this is for | 66 | \def\versionemacs{23} % version of Emacs this is for |
| 67 | \def\year{2011} % copyright year | 67 | \def\year{2012} % copyright year |
| 68 | 68 | ||
| 69 | \def\shortcopyrightnotice{\vskip 1ex plus 2 fill | 69 | \def\shortcopyrightnotice{\vskip 1ex plus 2 fill |
| 70 | \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. | 70 | \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 @@ | |||
| 22 | \setlength{\ColThreeWidth}{25mm} | 22 | \setlength{\ColThreeWidth}{25mm} |
| 23 | 23 | ||
| 24 | \newcommand{\versionemacs}[0]{23} % version of Emacs this is for | 24 | \newcommand{\versionemacs}[0]{23} % version of Emacs this is for |
| 25 | \newcommand{\cyear}[0]{2011} % copyright year | 25 | \newcommand{\cyear}[0]{2012} % copyright year |
| 26 | 26 | ||
| 27 | \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill | 27 | \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill |
| 28 | \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. | 28 | \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 @@ | |||
| 43 | \pdflayout=(0) | 43 | \pdflayout=(0) |
| 44 | 44 | ||
| 45 | \def\versionemacs{23} % version of Emacs this is for | 45 | \def\versionemacs{23} % version of Emacs this is for |
| 46 | \def\year{2011} % latest copyright year | 46 | \def\year{2012} % latest copyright year |
| 47 | 47 | ||
| 48 | % Nothing else needs to be changed. | 48 | % Nothing else needs to be changed. |
| 49 | 49 | ||
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 @@ | |||
| 61 | \pdflayout=(0) | 61 | \pdflayout=(0) |
| 62 | 62 | ||
| 63 | \def\versionemacs{23} % version of Emacs this is for | 63 | \def\versionemacs{23} % version of Emacs this is for |
| 64 | \def\year{2010} % latest copyright year | 64 | \def\year{2012} % latest copyright year |
| 65 | 65 | ||
| 66 | % Nothing else needs to be changed. | 66 | % Nothing else needs to be changed. |
| 67 | 67 | ||
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 @@ | |||
| 56 | \shyph | 56 | \shyph |
| 57 | 57 | ||
| 58 | \def\versionemacs{23} % version of Emacs this is for | 58 | \def\versionemacs{23} % version of Emacs this is for |
| 59 | \def\year{2011} % latest copyright year | 59 | \def\year{2012} % latest copyright year |
| 60 | 60 | ||
| 61 | \def\copyrightnotice{\penalty-1\vfill | 61 | \def\copyrightnotice{\penalty-1\vfill |
| 62 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter | 62 | \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 @@ | |||
| 45 | \pdflayout=(1) | 45 | \pdflayout=(1) |
| 46 | 46 | ||
| 47 | \def\versionemacs{23} % version of Emacs this is for | 47 | \def\versionemacs{23} % version of Emacs this is for |
| 48 | \def\year{2011} % latest copyright year | 48 | \def\year{2012} % latest copyright year |
| 49 | 49 | ||
| 50 | \def\copyrightnotice{\penalty-1\vfill | 50 | \def\copyrightnotice{\penalty-1\vfill |
| 51 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter | 51 | \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 @@ | |||
| 50 | \pdflayout=(1) | 50 | \pdflayout=(1) |
| 51 | 51 | ||
| 52 | \def\versionemacs{18} % version of Emacs this is for | 52 | \def\versionemacs{18} % version of Emacs this is for |
| 53 | \def\year{2011} % latest copyright year | 53 | \def\year{2012} % latest copyright year |
| 54 | \def\versionvip{3.5} | 54 | \def\versionvip{3.5} |
| 55 | 55 | ||
| 56 | % Nothing else needs to be changed. | 56 | % 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 @@ | |||
| 53 | \pdflayout=(1) | 53 | \pdflayout=(1) |
| 54 | 54 | ||
| 55 | \def\versionemacs{21} % version of Emacs this is for | 55 | \def\versionemacs{21} % version of Emacs this is for |
| 56 | \def\year{2011} % latest copyright year | 56 | \def\year{2012} % latest copyright year |
| 57 | \def\versionxemacs{20} % version of XEmacs this is for | 57 | \def\versionxemacs{20} % version of XEmacs this is for |
| 58 | \def\versionviper{3.0} % version of Viper this is for | 58 | \def\versionviper{3.0} % version of Viper this is for |
| 59 | 59 | ||
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 @@ | |||
| 1 | 2012-01-05 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * ebrowse.c (version) <emacs_copyright>: | ||
| 4 | * etags.c (print_version) <emacs_copyright>: | ||
| 5 | * rcs2log (Copyright): Update short copyright year to 2012. | ||
| 6 | |||
| 1 | 2011-12-25 Andreas Schwab <schwab@linux-m68k.org> | 7 | 2011-12-25 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 8 | ||
| 3 | * etags.c (C_entries): Properly skip over string and character | 9 | * 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 | |||
| 3526 | version (void) | 3526 | version (void) |
| 3527 | { | 3527 | { |
| 3528 | /* Makes it easier to update automatically. */ | 3528 | /* Makes it easier to update automatically. */ |
| 3529 | char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc."; | 3529 | char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; |
| 3530 | 3530 | ||
| 3531 | printf ("ebrowse %s\n", VERSION); | 3531 | printf ("ebrowse %s\n", VERSION); |
| 3532 | puts (emacs_copyright); | 3532 | 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 | |||
| 867 | print_version (void) | 867 | print_version (void) |
| 868 | { | 868 | { |
| 869 | /* Makes it easier to update automatically. */ | 869 | /* Makes it easier to update automatically. */ |
| 870 | char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc."; | 870 | char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; |
| 871 | 871 | ||
| 872 | printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); | 872 | printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); |
| 873 | puts (emacs_copyright); | 873 | 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 @@ | |||
| 20 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 20 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | Copyright='Copyright (C) 2011 Free Software Foundation, Inc. | 23 | Copyright='Copyright (C) 2012 Free Software Foundation, Inc. |
| 24 | This program comes with NO WARRANTY, to the extent permitted by law. | 24 | This program comes with NO WARRANTY, to the extent permitted by law. |
| 25 | You may redistribute copies of this program | 25 | You may redistribute copies of this program |
| 26 | under the terms of the GNU General Public License. | 26 | 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 @@ | |||
| 1 | 2012-01-05 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 | Update short copyright year to 2012. | ||
| 7 | |||
| 1 | 2011-10-19 Jan Djärv <jan.h.d@swipnet.se> | 8 | 2011-10-19 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 9 | ||
| 3 | * INSTALL: Remove XCode part. | 10 | * 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/>. | |||
| 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 24.0.92 Copyright (C) 2011 Free Software Foundation, Inc.</string> | 556 | <string>Emacs 24.0.92 Copyright (C) 2012 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 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 @@ | |||
| 3 | CFBundleName = "Emacs"; | 3 | CFBundleName = "Emacs"; |
| 4 | CFBundleShortVersionString = "Version 24.0.92"; | 4 | CFBundleShortVersionString = "Version 24.0.92"; |
| 5 | CFBundleGetInfoString = "Emacs version 24.0.92, NS Windowing"; | 5 | CFBundleGetInfoString = "Emacs version 24.0.92, NS Windowing"; |
| 6 | NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; | 6 | 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 @@ | |||
| 11 | "Carl Edman (NeXTstep)", | 11 | "Carl Edman (NeXTstep)", |
| 12 | "..see etc/NEXTSTEP" | 12 | "..see etc/NEXTSTEP" |
| 13 | ); | 13 | ); |
| 14 | Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; | 14 | Copyright = "Copyright (C) 2012 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 24.0.92, NS Windowing"; | 16 | FullVersionID = "Emacs 24.0.92, NS Windowing"; |
| 17 | NSExecutable = Emacs; | 17 | NSExecutable = Emacs; |
diff --git a/src/ChangeLog b/src/ChangeLog index 31d6ecaca43..9095c46488b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-01-05 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs.c (emacs_copyright): Update short copyright year to 2012. | ||
| 4 | |||
| 1 | 2012-01-01 Eli Zaretskii <eliz@gnu.org> | 5 | 2012-01-01 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * gnutls.c (init_gnutls_functions): Load gnutls_check_version. | 7 | * 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/>. */ | |||
| 98 | #endif | 98 | #endif |
| 99 | 99 | ||
| 100 | static const char emacs_version[] = VERSION; | 100 | static const char emacs_version[] = VERSION; |
| 101 | static const char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc."; | 101 | static const char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; |
| 102 | 102 | ||
| 103 | /* Make these values available in GDB, which doesn't see macros. */ | 103 | /* Make these values available in GDB, which doesn't see macros. */ |
| 104 | 104 | ||