mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-28

Browse source 
efb1c7ec37 ; * admin/notes/years: More known problems.
f475c5823a ; Copyright year fixes
2684def348 ; Run set-copyright from admin.el
2558b37b5e ; * admin/notes/years: Mention known problems with 'update...
This commit is contained in:
Stefan Kangas 2022-01-02 06:31:44 +01:00
commit ad125a9927
20 changed files with 47 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
admin/notes/years
View file

@ -7,6 +7,28 @@ checkout, redirecting its output to a file, so that you could later
examine the files that don't have copyright notices. Inspect the examine the files that don't have copyright notices. Inspect the
results for plausibility, then commit them. results for plausibility, then commit them.
A few known problems with the build-aux/update-copyright script:
. it doesn't update config.bat, msdos/depfiles.bat,
nt/configure.bat, etc/tutorials/TUTORIAL.cn, and
etc/tutorials/TUTORIAL.he because the "Copyright" statement begins
in these files after a prefix that is more than 5 characters long
. it doesn't update etc/tutorials/TUTORIAL.nl and
etc/tutorials/TUTORIAL.ro for some reason
. it doesn't update the second Copyright notice, the one that gets
output into PDF and PS, in etc/refcards/ru-refcard.tex
. it doesn't update etc/refcards/gnus-refcard.tex and
doc/misc/org.org because their Copyright statements have a
non-standard format
. several README and XPM files under etc/images/, and also
etc/refcards/README, msdos/README, and nt/icons/README aren't
updated either
These files need to be updated by hand.
Next, run "M-x set-copyright" from admin.el, which updates several
copyright notices in the Emacs sources.
You should also run the etags test suite in test/manual/etags/. It You should also run the etags test suite in test/manual/etags/. It
will most probably fail because the contents of the test files changes will most probably fail because the contents of the test files changes
due to copyright years update, so you need to move each ETAGS and due to copyright years update, so you need to move each ETAGS and

2
configure.ac
View file

@ -5777,7 +5777,7 @@ fi
version=$PACKAGE_VERSION version=$PACKAGE_VERSION
copyright="Copyright (C) 2021 Free Software Foundation, Inc." copyright="Copyright (C) 2022 Free Software Foundation, Inc."
AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"], AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"],
[Short copyright string for this version of Emacs.]) [Short copyright string for this version of Emacs.])
AC_SUBST(copyright) AC_SUBST(copyright)

2
doc/misc/org.org
View file

@ -21601,7 +21601,7 @@ that are mentioned in the manual. For a more complete list, use
This manual is for Org version {{{version}}}. This manual is for Org version {{{version}}}.
Copyright \copy 2004--2021 Free Software Foundation, Inc. Copyright \copy 2004--2022 Free Software Foundation, Inc.
#+begin_quote #+begin_quote
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document

6
etc/images/README
View file

@ -31,15 +31,15 @@ File: mh-logo.xpm
Files: gnus.pbm Files: gnus.pbm
Author: Luis Fernandes <elf@ee.ryerson.ca> Author: Luis Fernandes <elf@ee.ryerson.ca>
Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 2001-2022 Free Software Foundation, Inc.
Files: splash.png, splash.svg, splash.pbm, splash.xpm Files: splash.png, splash.svg, splash.pbm, splash.xpm
Author: Francesc Rocher <francesc.rocher@gmail.com> Author: Francesc Rocher <francesc.rocher@gmail.com>
Copyright (C) 2008-2021 Free Software Foundation, Inc. Copyright (C) 2008-2022 Free Software Foundation, Inc.
Files: checked.xpm, unchecked.xpm Files: checked.xpm, unchecked.xpm
Author: Chong Yidong <cyd@stupidchicken.com> Author: Chong Yidong <cyd@stupidchicken.com>
Copyright (C) 2010-2021 Free Software Foundation, Inc. Copyright (C) 2010-2022 Free Software Foundation, Inc.
* The following icons are from GTK+ 2.x. They are not part of Emacs, but * The following icons are from GTK+ 2.x. They are not part of Emacs, but

2
etc/images/checked.xpm
View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
/* Copyright (C) 2010-2021 Free Software Foundation, Inc. /* Copyright (C) 2010-2022 Free Software Foundation, Inc.
* *
* Author: Chong Yidong <cyd@stupidchicken.com> * Author: Chong Yidong <cyd@stupidchicken.com>
* *

4
etc/images/gnus/README
View file

@ -21,11 +21,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm
uu-post.pbm uu-post.xpm uu-post.pbm uu-post.xpm
Author: Luis Fernandes <elf@ee.ryerson.ca> Author: Luis Fernandes <elf@ee.ryerson.ca>
Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 2001-2022 Free Software Foundation, Inc.
Files: gnus.png, gnus.svg Files: gnus.png, gnus.svg
Author: Francesc Rocher <rocher@member.fsf.org> Author: Francesc Rocher <rocher@member.fsf.org>
Copyright (C) 2008-2021 Free Software Foundation, Inc. Copyright (C) 2008-2022 Free Software Foundation, Inc.
* The following icons are from GNOME 2.x. They are not part of Emacs, * The following icons are from GNOME 2.x. They are not part of Emacs,

6
etc/images/icons/README
View file

@ -14,7 +14,7 @@ Files: hicolor/16x16/apps/emacs23.png hicolor/24x24/apps/emacs23.png
hicolor/128x128/apps/emacs23.png hicolor/scalable/apps/emacs23.svg hicolor/128x128/apps/emacs23.png hicolor/scalable/apps/emacs23.svg
Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Copyright (C) 2007-2021 Free Software Foundation, Inc. Copyright (C) 2007-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING) License: GNU General Public License version 3 or later (see COPYING)
@ -22,7 +22,7 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png
Author: Andrew Zhilin <andrew_zhilin@yahoo.com> Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
Copyright (C) 2005-2021 Free Software Foundation, Inc. Copyright (C) 2005-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING) License: GNU General Public License version 3 or later (see COPYING)
Files: allout-widgets-dark-bg/closed.png Files: allout-widgets-dark-bg/closed.png
@ -71,5 +71,5 @@ Files: allout-widgets-dark-bg/closed.png
allout-widgets-light-bg/through-descender.xpm allout-widgets-light-bg/through-descender.xpm
Author: Ken Manheimer <ken.manheimer@gmail.com> Author: Ken Manheimer <ken.manheimer@gmail.com>
Copyright (C) 2011-2021 Free Software Foundation, Inc. Copyright (C) 2011-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING) License: GNU General Public License version 3 or later (see COPYING)

2
etc/images/mh-logo.xpm
View file

@ -1,7 +1,7 @@
/* XPM */ /* XPM */
/* MH-E Logo /* MH-E Logo
* *
* Copyright (C) 2003-2021 Free Software Foundation, Inc. * Copyright (C) 2003-2022 Free Software Foundation, Inc.
* *
* Author: Satyaki Das * Author: Satyaki Das
* *

2
etc/images/unchecked.xpm
View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
/* Copyright (C) 2010-2021 Free Software Foundation, Inc. /* Copyright (C) 2010-2022 Free Software Foundation, Inc.
* *
* Author: Chong Yidong <cyd@stupidchicken.com> * Author: Chong Yidong <cyd@stupidchicken.com>
* *

2
etc/refcards/README
View file

@ -77,7 +77,7 @@ it is reproduced here for convenience.
File: gnus-logo.eps, gnus-logo.pdf File: gnus-logo.eps, gnus-logo.pdf
Author: Luis Fernandes <elf@ee.ryerson.ca> Author: Luis Fernandes <elf@ee.ryerson.ca>
Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 2001-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING) License: GNU General Public License version 3 or later (see COPYING)

2
etc/tutorials/TUTORIAL.cn
View file

@ -1026,7 +1026,7 @@ using, writing, and sharing free software!
本篇指南是 GNU Emacs 的一部分，并允许在下列条件的约束下发行其拷贝： 本篇指南是 GNU Emacs 的一部分，并允许在下列条件的约束下发行其拷贝：
Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Copyright (C) 1985, 1996, 1998, 2001-2022 Free Software Foundation,
Inc. Inc.
本文件为 GNU Emacs 的一部分。 本文件为 GNU Emacs 的一部分。

2
etc/tutorials/TUTORIAL.nl
View file

@ -1239,7 +1239,7 @@ Engels origineel van de copyrightmelding en condities:
This version of the tutorial is a part of GNU Emacs. It is copyrighted This version of the tutorial is a part of GNU Emacs. It is copyrighted
and comes with permission to distribute copies on certain conditions: and comes with permission to distribute copies on certain conditions:
Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. Copyright (C) 1985, 1996, 1998, 2001-2022 Free Software Foundation, Inc.
This file is part of GNU Emacs. This file is part of GNU Emacs.

2
etc/tutorials/TUTORIAL.ro
View file

@ -1082,7 +1082,7 @@ continuare noţita de copyright originală în limba engleză.
This version of the tutorial, like GNU Emacs, is copyrighted, and This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions: comes with permission to distribute copies on certain conditions:
Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. Copyright (C) 1998, 2001-2022 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the of this document as received, in any medium, provided that the

2
lib-src/rcs2log
View file

@ -20,7 +20,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
Copyright='Copyright (C) 2021 Free Software Foundation, Inc. Copyright='Copyright (C) 2022 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law. This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program You may redistribute copies of this program
under the terms of the GNU General Public License. under the terms of the GNU General Public License.

2
msdos/README
View file

@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on
Windows 3.X. Since these are binary files, their copyright notice is Windows 3.X. Since these are binary files, their copyright notice is
reproduced here: reproduced here:
# Copyright (C) 1993, 2002-2021 Free Software Foundation, Inc. # Copyright (C) 1993, 2002-2022 Free Software Foundation, Inc.
# #
# This file is part of GNU Emacs. # This file is part of GNU Emacs.
# #

2
msdos/depfiles.bat
View file

@ -1,7 +1,7 @@
@echo off @echo off
rem ---------------------------------------------------------------------- rem ----------------------------------------------------------------------
rem Auxiliary script for MSDOS, run by ../config.bat rem Auxiliary script for MSDOS, run by ../config.bat
rem Copyright (C) 2011-2021 Free Software Foundation, Inc. rem Copyright (C) 2011-2022 Free Software Foundation, Inc.
rem This file is part of GNU Emacs. rem This file is part of GNU Emacs.

2
msdos/sed2v2.inp
View file

@ -27,7 +27,7 @@
#ifndef MSDOS\ #ifndef MSDOS\
#define MSDOS\ #define MSDOS\
#endif #endif
/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2021 Free Software Foundation, Inc."/ /^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2022 Free Software Foundation, Inc."/
/^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'! /^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'!
/^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/
/^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/

2
nt/configure.bat
View file

@ -1,7 +1,7 @@
@echo off @echo off
rem ---------------------------------------------------------------------- rem ----------------------------------------------------------------------
rem This was the old configuration script for MS Windows operating systems rem This was the old configuration script for MS Windows operating systems
rem Copyright (C) 1999-2021 Free Software Foundation, Inc. rem Copyright (C) 1999-2022 Free Software Foundation, Inc.
rem This file is part of GNU Emacs. rem This file is part of GNU Emacs.

4
nt/icons/README
View file

@ -8,7 +8,7 @@ License: GNU General Public License version 3 or later
File: emacs22.ico File: emacs22.ico
Author: Andrew Zhilin Author: Andrew Zhilin
Copyright (C) 2005-2021 Free Software Foundation, Inc. Copyright (C) 2005-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING) License: GNU General Public License version 3 or later (see COPYING)
@ -17,7 +17,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico
gnu7.ico gnu8.ico gnu9.ico gnu7.ico gnu8.ico gnu9.ico
Author: Rob Davenport <rgd at bigfoot.com> Author: Rob Davenport <rgd at bigfoot.com>
Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. Copyright (C) 1999, 2001-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING) License: GNU General Public License version 3 or later (see COPYING)
<http://users.adelphia.net/~rob.davenport/gnuicons.html> <http://users.adelphia.net/~rob.davenport/gnuicons.html>

2
test/lisp/emacs-lisp/lisp-mnt-tests.el
View file

@ -1,6 +1,6 @@
;;; lisp-mnt-tests.el --- Tests for lisp-mnt -*- lexical-binding: t; -*- ;;; lisp-mnt-tests.el --- Tests for lisp-mnt -*- lexical-binding: t; -*-
;; Copyright (C) 2021 2020-2021 Free Software Foundation, Inc. ;; Copyright (C) 2021-2022 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>