diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-14 10:14:17 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-14 10:14:17 -0800 |
| commit | 8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d (patch) | |
| tree | 9aed5489fdfdcf75087bf3d8e50e4f5952c8566c /admin | |
| parent | 3720fa2b1ac94b8ac9f193264bcf36990a5f43d2 (diff) | |
| parent | f80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff) | |
| download | emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.gz | |
Merge from mainline.
Diffstat (limited to 'admin')
31 files changed, 56 insertions, 43 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index e8b2d571ebd..5b714193ab1 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -11,6 +11,10 @@ 2011-01-14 Glenn Morris <rgm@gnu.org> + * admin.el (set-copyright): Also handle \year in refcards/*.tex. + +2011-01-14 Glenn Morris <rgm@gnu.org> + * bzrmerge.el: Require cl when compiling. (bzrmerge-merges): Doc fix. @@ -1007,8 +1011,8 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, + 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/README b/admin/README index 694f206baaf..17232f5f3a5 100644 --- a/admin/README +++ b/admin/README @@ -1,5 +1,5 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010 Free Software Foundation, Inc. + 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/admin.el b/admin/admin.el index 7cd2c02fb58..4387aecdde7 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -1,7 +1,7 @@ ;;; admin.el --- utilities for Emacs administration ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -;; 2010 Free Software Foundation, Inc. +;; 2010, 2011 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -160,7 +160,6 @@ Root must be the root of an Emacs source tree." version (rx (and "Version=" (submatch (1+ (in "0-9."))))))) ;; Note this makes some assumptions about form of short copyright. -;; FIXME add the \year in the refcards/*.tex files. (defun set-copyright (root copyright) "Set Emacs short copyright to COPYRIGHT in relevant files under ROOT. Root must be the root of an Emacs source tree." @@ -174,16 +173,16 @@ Root must be the root of an Emacs source tree." (error "%s doesn't seem to be the root of an Emacs source tree" root)) (set-version-in-file root "src/emacs.c" copyright (rx (and "emacs_copyright" (0+ (not (in ?\"))) - ?\" (submatch (1+ (not (in ?\")))) ?\"))) + ?\" (submatch (1+ (not (in ?\")))) ?\"))) (set-version-in-file root "lib-src/ebrowse.c" copyright (rx (and "emacs_copyright" (0+ (not (in ?\"))) - ?\" (submatch (1+ (not (in ?\")))) ?\"))) + ?\" (submatch (1+ (not (in ?\")))) ?\"))) (set-version-in-file root "lib-src/etags.c" copyright (rx (and "emacs_copyright" (0+ (not (in ?\"))) - ?\" (submatch (1+ (not (in ?\")))) ?\"))) + ?\" (submatch (1+ (not (in ?\")))) ?\"))) (set-version-in-file root "lib-src/rcs2log" copyright - (rx (and "Copyright" (0+ space) ?= (0+ space) - ?\' (submatch (1+ nonl))))) + (rx (and "Copyright" (0+ space) ?= (0+ space) + ?\' (submatch (1+ nonl))))) ;; This one is a nuisance, as it needs to be split over two lines. (string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright) ;; nextstep. @@ -199,7 +198,18 @@ Root must be the root of an Emacs source tree." (set-version-in-file root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist" copyright (rx (and "Copyright" (0+ space) ?\= (0+ space) - ?\" (submatch (1+ (not (in ?\")))))))) + ?\" (submatch (1+ (not (in ?\"))))))) + (when (string-match "\\([0-9]\\{4\\}\\)" copyright) + (setq copyright (match-string 1 copyright)) + (dolist (file (directory-files (expand-file-name "etc/refcards" root) + t "\\.tex\\'")) + (unless (string-match "gnus-refcard\\.tex" file) + (set-version-in-file + root file copyright + (concat (if (string-match "ru-refcard\\.tex" file) + "\\\\newcommand{\\\\cyear}\\[0\\]{" + "\\\\def\\\\year{") + "\\([0-9]\\{4\\}\\)}.+%.+copyright year")))))) (provide 'admin) diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index 8ff699382a0..38312604248 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -1,5 +1,5 @@ /* Allocate X colors. Used for testing with dense colormaps. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/build-configs b/admin/build-configs index e20024ff666..759750f8475 100755 --- a/admin/build-configs +++ b/admin/build-configs @@ -1,7 +1,7 @@ #! /usr/bin/perl # Build Emacs in several different configurations. -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/charsets/Makefile b/admin/charsets/Makefile index a93b18b63cc..a041f7f14ab 100644 --- a/admin/charsets/Makefile +++ b/admin/charsets/Makefile @@ -1,5 +1,5 @@ # Makefile -- Makefile to generate charset maps in etc/charsets. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 # diff --git a/admin/charsets/big5.awk b/admin/charsets/big5.awk index a0113a6677c..7cae450ba53 100644 --- a/admin/charsets/big5.awk +++ b/admin/charsets/big5.awk @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 diff --git a/admin/charsets/compact.awk b/admin/charsets/compact.awk index f84715e1d8d..83b5a7f0e34 100644 --- a/admin/charsets/compact.awk +++ b/admin/charsets/compact.awk @@ -1,5 +1,5 @@ # compact.awk -- Make charset map compact. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk index 387f314fe37..6cf2f37dbd3 100644 --- a/admin/charsets/cp51932.awk +++ b/admin/charsets/cp51932.awk @@ -1,5 +1,5 @@ # cp51932.awk -- Generate a translation table for CP51932. -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 diff --git a/admin/charsets/cp932.awk b/admin/charsets/cp932.awk index 397f025acee..d6f1966894e 100644 --- a/admin/charsets/cp932.awk +++ b/admin/charsets/cp932.awk @@ -1,5 +1,5 @@ # cp932.awk -- Add sort keys and append user defined area to CP932-2BYTE.map. -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 diff --git a/admin/charsets/eucjp-ms.awk b/admin/charsets/eucjp-ms.awk index f5876777b01..15803525997 100644 --- a/admin/charsets/eucjp-ms.awk +++ b/admin/charsets/eucjp-ms.awk @@ -1,5 +1,5 @@ # eucjp-ms.awk -- Generate a translation table for eucJP-ms. -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk index fd8748f50be..7b89c903beb 100644 --- a/admin/charsets/gb180302.awk +++ b/admin/charsets/gb180302.awk @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 diff --git a/admin/charsets/gb180304.awk b/admin/charsets/gb180304.awk index 43e2b474841..c1b691b9a63 100644 --- a/admin/charsets/gb180304.awk +++ b/admin/charsets/gb180304.awk @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv index 89943074939..deb69e2a1a9 100755 --- a/admin/charsets/mapconv +++ b/admin/charsets/mapconv @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index 3e09cfd098f..a47c5d7b733 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README @@ -1,5 +1,5 @@ -Copyright (C) 2009, 2010 Free Software Foundation, Inc. -Copyright (C) 2009, 2010 +Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 See the end of the file for license conditions. diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el index 07708bcd5a4..6234471e9eb 100644 --- a/admin/charsets/mule-charsets.el +++ b/admin/charsets/mule-charsets.el @@ -1,5 +1,5 @@ ;; mule-charsets.el -- Generate Mule-orignal charset maps. -;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 diff --git a/admin/cus-test.el b/admin/cus-test.el index 35d0412cc43..060e100f6c4 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el @@ -1,6 +1,6 @@ ;;; cus-test.el --- tests for custom types and load problems -;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; Free Software Foundation, Inc. ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de> diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 9858fc00363..92198bad892 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/make-announcement b/admin/make-announcement index 37ab76c0f05..180c35601b3 100755 --- a/admin/make-announcement +++ b/admin/make-announcement @@ -1,7 +1,7 @@ #! /bin/bash ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -## 2010 Free Software Foundation, Inc. +## 2010, 2011 Free Software Foundation, Inc. ## Author: Francesco Potorti` <pot@gnu.org> diff --git a/admin/make-emacs b/admin/make-emacs index 1fecaa33a69..9abfa731be5 100755 --- a/admin/make-emacs +++ b/admin/make-emacs @@ -2,7 +2,7 @@ # Build Emacs with various options for profiling, debugging, # with and without warnings enabled etc. -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/notes/copyright b/admin/notes/copyright index 430192482b0..bee8a50b3ed 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -1,4 +1,4 @@ -Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/font-backend b/admin/notes/font-backend index d3fb56a2ba4..be35693fc6e 100644 --- a/admin/notes/font-backend +++ b/admin/notes/font-backend @@ -1,4 +1,4 @@ -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/lel-TODO b/admin/notes/lel-TODO index 2e453444275..f38f9641c58 100644 --- a/admin/notes/lel-TODO +++ b/admin/notes/lel-TODO @@ -1,6 +1,6 @@ Some lisp/emacs-lisp/ Features and Where They Are Documented -Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index d7f68930204..1dfc56f7a10 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -1,6 +1,6 @@ -*- coding: utf-8; mode: text; -*- -Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions. From README.multi-tty in the multi-tty branch. diff --git a/admin/notes/unicode b/admin/notes/unicode index a9176377dad..2ef9baf11b1 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -1,6 +1,6 @@ -*-mode: text; coding: latin-1;-*- -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index 4ab34d3234f..e5dad487e13 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index 6b6c592eab1..eab757148d8 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 24972e655b6..d146fdad605 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -1,8 +1,8 @@ #!/bin/sh ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly -## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -## 2010 Free Software Foundation, Inc. +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +## Free Software Foundation, Inc. ## Author: Miles Bader <miles@gnu.org> diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index e7b0fbe4bf9..04f2f1d4380 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@ -1,5 +1,5 @@ # Makefile -- Makefile to generate character property tables. -# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 # diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in index 58cea29db8b..1f9f276a35c 100644 --- a/admin/unidata/makefile.w32-in +++ b/admin/unidata/makefile.w32-in @@ -1,5 +1,5 @@ # makefile.w32-in -- W32 -*- Makefile -*- to generate character property tables. -# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 # diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index 211c6f0a530..9f898668526 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el @@ -1,5 +1,5 @@ ;; unidata-gen.el -- Create files containing character property data. -;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 @@ -1241,7 +1241,7 @@ Property value is a character." (byte-compile describer) (setq describer (symbol-function describer))) (set-char-table-extra-slot table 3 describer)) - (insert ";; Copyright (C) 1991-2009, 2010 Unicode, Inc. + (insert ";; Copyright (C) 1991-2009 Unicode, Inc. ;; This file was generated from the Unicode data file at ;; http://www.unicode.org/Public/UNIDATA/UnicodeData.txt. ;; See lisp/international/README for the copyright and permission notice.\n" @@ -1261,5 +1261,4 @@ Property value is a character." -;; arch-tag: 961c862e-b821-447e-9b8a-bfbab9c2d525 ;;; unidata-gen.el ends here |