diff options
31 files changed, 60 insertions, 28 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 6e5bb392cc..37d3ebeaff 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,17 @@ +2012-01-10 Glenn Morris <[email protected]> + + * 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. + 2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex index e74cc53615..b68e8b8529 100644 --- a/etc/refcards/calccard.tex +++ b/etc/refcards/calccard.tex @@ -65,7 +65,7 @@ % Internet: [email protected] \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 bb91fa6002..4f955cf96e 100644 --- a/etc/refcards/cs-dired-ref.tex +++ b/etc/refcards/cs-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/cs-refcard.tex b/etc/refcards/cs-refcard.tex index 252976d6e8..ba8bd2ba2b 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 b87e561ff3..c4e303a9f2 100644 --- a/etc/refcards/cs-survival.tex +++ b/etc/refcards/cs-survival.tex @@ -56,7 +56,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 9e074b7239..cb485b256c 100644 --- a/etc/refcards/de-refcard.tex +++ b/etc/refcards/de-refcard.tex @@ -62,7 +62,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 fdb46d5b48..e04a867f87 100644 --- a/etc/refcards/dired-ref.tex +++ b/etc/refcards/dired-ref.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 % Nothing else needs to be changed. diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex index 549cf341a5..0bd368961a 100644 --- a/etc/refcards/fr-dired-ref.tex +++ b/etc/refcards/fr-dired-ref.tex @@ -37,7 +37,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 c02169cc67..3da6955283 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 fea6ec27cf..3565216e8a 100644 --- a/etc/refcards/fr-survival.tex +++ b/etc/refcards/fr-survival.tex @@ -51,7 +51,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 28fb565dc8..18dd570046 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,7 +1,7 @@ % Reference Card for Org Mode \def\orgversionnumber{6.33x} \def\versionyear{2009} % 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 500689aa85..826e624a6c 100644 --- a/etc/refcards/pl-refcard.tex +++ b/etc/refcards/pl-refcard.tex @@ -71,7 +71,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 76c1c37caa..eaf1dbc5f2 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 1c56bef2fc..1849411db7 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 6030dbb17b..274bafcf7a 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -23,7 +23,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 4a2b707403..6604b5c612 100644 --- a/etc/refcards/sk-dired-ref.tex +++ b/etc/refcards/sk-dired-ref.tex @@ -44,7 +44,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 534216734c..9ed211f959 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 b59ba833b9..031ab54848 100644 --- a/etc/refcards/sk-survival.tex +++ b/etc/refcards/sk-survival.tex @@ -57,7 +57,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 2d2bff576f..6642f077c1 100644 --- a/etc/refcards/survival.tex +++ b/etc/refcards/survival.tex @@ -46,7 +46,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 bd3beb71d3..9970eacbd7 100644 --- a/etc/refcards/vipcard.tex +++ b/etc/refcards/vipcard.tex @@ -51,7 +51,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 d403d9d261..d500a5e37d 100644 --- a/etc/refcards/viperCard.tex +++ b/etc/refcards/viperCard.tex @@ -54,7 +54,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 73a63eeaec..73a447bc3a 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2012-01-10 Glenn Morris <[email protected]> + + * ebrowse.c (version) <emacs_copyright>: + * etags.c (print_version) <emacs_copyright>: + * rcs2log (Copyright): Update short copyright year to 2012. + 2011-03-07 Chong Yidong <[email protected]> * Version 23.3 released. diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 735cf30ae2..ce71264333 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -3685,7 +3685,7 @@ void version () { /* 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 da43b89e40..c3209a92dd 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -898,7 +898,7 @@ static void print_version () { /* 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 5808068f64..ffc7b54755 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -22,7 +22,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/lisp/ChangeLog b/lisp/ChangeLog index f579b7179d..6b96ed60dd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-01-10 Glenn Morris <[email protected]> + + * version.el (emacs-copyright): Update year to 2012. + 2011-08-21 Deniz Dogan <[email protected]> * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of diff --git a/lisp/version.el b/lisp/version.el index 424c681c08..14b447eda2 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, 2011 +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -29,7 +29,7 @@ ;;; Code: -(defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\ +(defconst emacs-copyright "Copyright (C) 2012 Free Software Foundation, Inc." "\ Short copyright string for this version of Emacs.") (defconst emacs-version "23.3.50" "\ diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index c0a08f844b..7d05195e24 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,10 @@ +2012-01-10 Glenn Morris <[email protected]> + + * 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-03-07 Chong Yidong <[email protected]> * Version 23.3 released. @@ -7,6 +14,7 @@ * 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 2011. 2010-05-07 Chong Yidong <[email protected]> diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index 14a543bc27..1e77b29eeb 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 23.3.50 Copyright (C) 2011 Free Software Foundation, Inc.</string> + <string>Emacs 23.3.50 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 fe99acec15..154f7d4041 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.3.50"; CFBundleGetInfoString = "Emacs version 23.3.50, 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 b72854f760..caef866651 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) 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 23.3.50, NS Windowing"; NSExecutable = Emacs; |