diff options
| author | Eli Zaretskii | 2022-01-01 07:03:03 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2022-01-01 07:03:03 -0500 |
| commit | dcd76bd48df678d8234b904d7b13c997228519a3 (patch) | |
| tree | 17b11e7d3aa1aa9d32d6be874cbbfb1e5882a2c5 /admin | |
| parent | 84a8f656d344cc69bce3a922b99182896a4e1285 (diff) | |
| parent | 836be7a112191cac8abd187e337c477ff5f05037 (diff) | |
| download | emacs-dcd76bd48df678d8234b904d7b13c997228519a3.tar.gz emacs-dcd76bd48df678d8234b904d7b13c997228519a3.zip | |
Merge from origin/emacs-28
836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year.
86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year
ebe8772f65 ; Minor fixes related to copyright years
23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye...
8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t.
19dcb237b5 ; Add 2022 to copyright years.
# Conflicts:
# etc/NEWS
# etc/refcards/ru-refcard.tex
# lib/cdefs.h
# lisp/erc/erc-dcc.el
# lisp/erc/erc-imenu.el
# lisp/erc/erc-replace.el
# lisp/image-dired.el
# lisp/progmodes/xref.el
# m4/alloca.m4
# m4/byteswap.m4
# m4/errno_h.m4
# m4/getopt.m4
# m4/gnulib-common.m4
# m4/inttypes.m4
# m4/stddef_h.m4
# m4/stdint.m4
# m4/sys_socket_h.m4
Diffstat (limited to 'admin')
48 files changed, 50 insertions, 48 deletions
diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1 index f3de691325b..9409a608cc2 100644 --- a/admin/ChangeLog.1 +++ b/admin/ChangeLog.1 | |||
| @@ -2577,7 +2577,7 @@ | |||
| 2577 | ;; coding: utf-8 | 2577 | ;; coding: utf-8 |
| 2578 | ;; End: | 2578 | ;; End: |
| 2579 | 2579 | ||
| 2580 | Copyright (C) 2001-2021 Free Software Foundation, Inc. | 2580 | Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 2581 | 2581 | ||
| 2582 | This file is part of GNU Emacs. | 2582 | This file is part of GNU Emacs. |
| 2583 | 2583 | ||
diff --git a/admin/README b/admin/README index b0336f91ff2..89cdbbbfafd 100644 --- a/admin/README +++ b/admin/README | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2001-2021 Free Software Foundation, Inc. | 1 | Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/admin/admin.el b/admin/admin.el index c1bdb13df96..5f02ea8ce45 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; admin.el --- utilities for Emacs administration -*- lexical-binding: t; -*- | 1 | ;;; admin.el --- utilities for Emacs administration -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2001-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; This file is part of GNU Emacs. | 5 | ;; This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index ea5b7502363..4db447332ba 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Allocate X colors. Used for testing with dense colormaps. | 1 | /* Allocate X colors. Used for testing with dense colormaps. |
| 2 | 2 | ||
| 3 | Copyright (C) 2001-2021 Free Software Foundation, Inc. | 3 | Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/authors.el b/admin/authors.el index d44bb9bf8e4..342f2718c84 100644 --- a/admin/authors.el +++ b/admin/authors.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*- lexical-binding: t; -*- | 1 | ;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2000-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2000-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Gerd Moellmann <gerd@gnu.org> | 5 | ;; Author: Gerd Moellmann <gerd@gnu.org> |
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/admin/automerge b/admin/automerge index 81082f7dc68..415d717a991 100755 --- a/admin/automerge +++ b/admin/automerge | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | ### automerge - automatically merge the Emacs release branch to master | 2 | ### automerge - automatically merge the Emacs release branch to master |
| 3 | 3 | ||
| 4 | ## Copyright (C) 2018-2021 Free Software Foundation, Inc. | 4 | ## Copyright (C) 2018-2022 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## Author: Glenn Morris <rgm@gnu.org> | 6 | ## Author: Glenn Morris <rgm@gnu.org> |
| 7 | ## Maintainer: Stefan Kangas <stefan@marxist.se> | 7 | ## Maintainer: Stefan Kangas <stefan@marxist.se> |
diff --git a/admin/build-configs b/admin/build-configs index 2e04e0008e7..05e70786b30 100755 --- a/admin/build-configs +++ b/admin/build-configs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #! /usr/bin/perl | 1 | #! /usr/bin/perl |
| 2 | # Build Emacs in several different configurations. | 2 | # Build Emacs in several different configurations. |
| 3 | 3 | ||
| 4 | # Copyright (C) 2001-2021 Free Software Foundation, Inc. | 4 | # Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | # This file is part of GNU Emacs. | 6 | # This file is part of GNU Emacs. |
| 7 | 7 | ||
diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in index f043077e318..572e352f4ad 100644 --- a/admin/charsets/Makefile.in +++ b/admin/charsets/Makefile.in | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### @configure_input@ | 1 | ### @configure_input@ |
| 2 | 2 | ||
| 3 | # Copyright (C) 2015-2021 Free Software Foundation, Inc. | 3 | # Copyright (C) 2015-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | # National Institute of Advanced Industrial Science and Technology (AIST) | 6 | # National Institute of Advanced Industrial Science and Technology (AIST) |
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv index f933c34ffc6..9898d36e743 100755 --- a/admin/charsets/mapconv +++ b/admin/charsets/mapconv | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | 2 | ||
| 3 | # Copyright (C) 2015-2021 Free Software Foundation, Inc. | 3 | # Copyright (C) 2015-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | # National Institute of Advanced Industrial Science and Technology (AIST) | 6 | # National Institute of Advanced Industrial Science and Technology (AIST) |
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index fb078269d6f..0380df9ad72 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2009-2021 Free Software Foundation, Inc. | 1 | Copyright (C) 2009-2022 Free Software Foundation, Inc. |
| 2 | Copyright (C) 2009, 2010, 2011 | 2 | Copyright (C) 2009, 2010, 2011 |
| 3 | National Institute of Advanced Industrial Science and Technology (AIST) | 3 | National Institute of Advanced Industrial Science and Technology (AIST) |
| 4 | Registration Number H13PRO009 | 4 | Registration Number H13PRO009 |
diff --git a/admin/cus-test.el b/admin/cus-test.el index 30b5f655617..8f0914ff691 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; cus-test.el --- tests for custom types and load problems -*- lexical-binding: t; -*- | 1 | ;;; cus-test.el --- tests for custom types and load problems -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1998, 2000, 2002-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1998, 2000, 2002-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Markus Rost <rost@math.uni-bielefeld.de> | 5 | ;; Author: Markus Rost <rost@math.uni-bielefeld.de> |
| 6 | ;; Created: 13 Sep 1998 | 6 | ;; Created: 13 Sep 1998 |
diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 2fe15401d0d..6ab39eab2f5 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #! /bin/sh | 1 | #! /bin/sh |
| 2 | 2 | ||
| 3 | # Copyright (C) 2001-2021 Free Software Foundation, Inc. | 3 | # Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # This file is part of GNU Emacs. | 5 | # This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/find-gc.el b/admin/find-gc.el index 1cce54ef142..1c3c419c563 100644 --- a/admin/find-gc.el +++ b/admin/find-gc.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; find-gc.el --- detect functions that call the garbage collector -*- lexical-binding: t; -*- | 1 | ;;; find-gc.el --- detect functions that call the garbage collector -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992, 2001-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992, 2001-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Maintainer: emacs-devel@gnu.org | 5 | ;; Maintainer: emacs-devel@gnu.org |
| 6 | 6 | ||
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 658ceb77f49..5da70a40285 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; gitmerge.el --- help merge one Emacs branch into another -*- lexical-binding: t; -*- | 1 | ;;; gitmerge.el --- help merge one Emacs branch into another -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Authors: David Engster <deng@randomsample.de> | 5 | ;; Authors: David Engster <deng@randomsample.de> |
| 6 | ;; Stefan Monnier <monnier@iro.umontreal.ca> | 6 | ;; Stefan Monnier <monnier@iro.umontreal.ca> |
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index aaf95c08973..83ac2ef46ef 100644 --- a/admin/grammars/Makefile.in +++ b/admin/grammars/Makefile.in | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### @configure_input@ | 1 | ### @configure_input@ |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2013-2021 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2013-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## This file is part of GNU Emacs. | 5 | ## This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 289081e3ced..2395e747fd6 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; c.by -- LL grammar for C/C++ language specification | 1 | ;;; c.by -- LL grammar for C/C++ language specification |
| 2 | ;; Copyright (C) 1999-2021 Free Software Foundation, Inc. | 2 | ;; Copyright (C) 1999-2022 Free Software Foundation, Inc. |
| 3 | ;; | 3 | ;; |
| 4 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 4 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 5 | ;; David Ponce <david@dponce.com> | 5 | ;; David Ponce <david@dponce.com> |
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy index 35fb7e832e9..1180dc28eb7 100644 --- a/admin/grammars/grammar.wy +++ b/admin/grammars/grammar.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars | 1 | ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars |
| 2 | ;; | 2 | ;; |
| 3 | ;; Copyright (C) 2002-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2022 Free Software Foundation, Inc. |
| 4 | ;; | 4 | ;; |
| 5 | ;; Author: David Ponce <david@dponce.com> | 5 | ;; Author: David Ponce <david@dponce.com> |
| 6 | ;; Created: 26 Aug 2002 | 6 | ;; Created: 26 Aug 2002 |
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy index 486924b7990..138adb2082c 100644 --- a/admin/grammars/java-tags.wy +++ b/admin/grammars/java-tags.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; java-tags.wy -- Semantic LALR grammar for Java | 1 | ;;; java-tags.wy -- Semantic LALR grammar for Java |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2002-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2022 Free Software Foundation, Inc. |
| 4 | ;; | 4 | ;; |
| 5 | ;; Author: David Ponce <david@dponce.com> | 5 | ;; Author: David Ponce <david@dponce.com> |
| 6 | ;; Created: 26 Aug 2002 | 6 | ;; Created: 26 Aug 2002 |
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy index e85db1572c6..2357153ccb5 100644 --- a/admin/grammars/js.wy +++ b/admin/grammars/js.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; javascript-jv.wy -- LALR grammar for Javascript | 1 | ;;; javascript-jv.wy -- LALR grammar for Javascript |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2005-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2005-2022 Free Software Foundation, Inc. |
| 4 | ;; Copyright (C) 1998-2011 Ecma International. | 4 | ;; Copyright (C) 1998-2011 Ecma International. |
| 5 | 5 | ||
| 6 | ;; Author: Joakim Verona | 6 | ;; Author: Joakim Verona |
diff --git a/admin/grammars/make.by b/admin/grammars/make.by index f66585e70e9..193ad77fa98 100644 --- a/admin/grammars/make.by +++ b/admin/grammars/make.by | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; make.by -- BY notation for Makefiles. | 1 | ;;; make.by -- BY notation for Makefiles. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2022 Free Software Foundation, Inc. |
| 4 | ;; | 4 | ;; |
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | ;; David Ponce <david@dponce.com> | 6 | ;; David Ponce <david@dponce.com> |
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy index 2539d1bec8c..17d87e711a2 100644 --- a/admin/grammars/python.wy +++ b/admin/grammars/python.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; python.wy -- LALR grammar for Python | 1 | ;;; python.wy -- LALR grammar for Python |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2002-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2022 Free Software Foundation, Inc. |
| 4 | ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, | 4 | ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 5 | ;; 2009, 2010 Python Software Foundation; All Rights Reserved | 5 | ;; 2009, 2010 Python Software Foundation; All Rights Reserved |
| 6 | 6 | ||
diff --git a/admin/grammars/scheme.by b/admin/grammars/scheme.by index c3abb5a28e2..fcf3007ae7f 100644 --- a/admin/grammars/scheme.by +++ b/admin/grammars/scheme.by | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; scheme.by -- Scheme BNF language specification | 1 | ;;; scheme.by -- Scheme BNF language specification |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2001-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; This file is part of GNU Emacs. | 5 | ;; This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy index 868a81cf18a..c3531ebd549 100644 --- a/admin/grammars/srecode-template.wy +++ b/admin/grammars/srecode-template.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; srecode-template.wy --- Semantic Recoder Template parser | 1 | ;;; srecode-template.wy --- Semantic Recoder Template parser |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2005-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2005-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | ;; Keywords: syntax | 6 | ;; Keywords: syntax |
diff --git a/admin/last-chance.el b/admin/last-chance.el index e8021129e30..30d6a25a287 100644 --- a/admin/last-chance.el +++ b/admin/last-chance.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; last-chance.el --- dangling deterrence -*- lexical-binding: t; -*- | 1 | ;;; last-chance.el --- dangling deterrence -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2016-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2016-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Thien-Thi Nguyen <ttn@gnu.org> | 5 | ;; Author: Thien-Thi Nguyen <ttn@gnu.org> |
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/admin/make-emacs b/admin/make-emacs index fa7880b5664..06d56080921 100755 --- a/admin/make-emacs +++ b/admin/make-emacs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Build Emacs with various options for profiling, debugging, | 2 | # Build Emacs with various options for profiling, debugging, |
| 3 | # with and without warnings enabled etc. | 3 | # with and without warnings enabled etc. |
| 4 | 4 | ||
| 5 | # Copyright (C) 2001-2021 Free Software Foundation, Inc. | 5 | # Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | 8 | ||
diff --git a/admin/make-manuals b/admin/make-manuals index f1339495208..8085412cc8a 100755 --- a/admin/make-manuals +++ b/admin/make-manuals | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | ### make-manuals - create the Emacs manuals to upload to the gnu.org website | 2 | ### make-manuals - create the Emacs manuals to upload to the gnu.org website |
| 3 | 3 | ||
| 4 | ## Copyright 2018-2021 Free Software Foundation, Inc. | 4 | ## Copyright 2018-2022 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## Author: Glenn Morris <rgm@gnu.org> | 6 | ## Author: Glenn Morris <rgm@gnu.org> |
| 7 | ## Maintainer: emacs-devel@gnu.org | 7 | ## Maintainer: emacs-devel@gnu.org |
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index c9fe3b2f95a..73b3d390499 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | # | 4 | # |
| 5 | # admin/merge-gnulib | 5 | # admin/merge-gnulib |
| 6 | 6 | ||
| 7 | # Copyright 2012-2021 Free Software Foundation, Inc. | 7 | # Copyright 2012-2022 Free Software Foundation, Inc. |
| 8 | 8 | ||
| 9 | # This file is part of GNU Emacs. | 9 | # This file is part of GNU Emacs. |
| 10 | 10 | ||
diff --git a/admin/merge-pkg-config b/admin/merge-pkg-config index 1136a304dd7..2f785729a6d 100755 --- a/admin/merge-pkg-config +++ b/admin/merge-pkg-config | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | # | 4 | # |
| 5 | # admin/merge-pkg-config | 5 | # admin/merge-pkg-config |
| 6 | 6 | ||
| 7 | # Copyright 2014-2021 Free Software Foundation, Inc. | 7 | # Copyright 2014-2022 Free Software Foundation, Inc. |
| 8 | 8 | ||
| 9 | # This file is part of GNU Emacs. | 9 | # This file is part of GNU Emacs. |
| 10 | 10 | ||
diff --git a/admin/notes/copyright b/admin/notes/copyright index 5b00c82ce93..6f7cb153345 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2007-2021 Free Software Foundation, Inc. | 1 | Copyright (C) 2007-2022 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/admin/notes/emba b/admin/notes/emba index 2135c7a97cc..99237ea5f63 100644 --- a/admin/notes/emba +++ b/admin/notes/emba | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- mode: outline; coding: utf-8 -*- | 1 | -*- mode: outline; coding: utf-8 -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2019-2021 Free Software Foundation, Inc. | 3 | Copyright (C) 2019-2022 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | NOTES FOR EMACS CONTINUOUS BUILD ON EMBA | 6 | NOTES FOR EMACS CONTINUOUS BUILD ON EMBA |
diff --git a/admin/notes/hydra b/admin/notes/hydra index 62ad7ebf9c5..0987e7be820 100644 --- a/admin/notes/hydra +++ b/admin/notes/hydra | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- mode: outline; coding: utf-8 -*- | 1 | -*- mode: outline; coding: utf-8 -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2013-2021 Free Software Foundation, Inc. | 3 | Copyright (C) 2013-2022 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA | 6 | NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA |
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index fa4df820ae4..9b3f1606a1b 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- coding: utf-8; mode: text; -*- | 1 | -*- coding: utf-8; mode: text; -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2007-2021 Free Software Foundation, Inc. | 3 | Copyright (C) 2007-2022 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | From README.multi-tty in the multi-tty branch. | 6 | From README.multi-tty in the multi-tty branch. |
diff --git a/admin/notes/unicode b/admin/notes/unicode index be51d09d37a..2c4b5e0106a 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*-mode: text; coding: utf-8;-*- | 1 | -*-mode: text; coding: utf-8;-*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2002-2021 Free Software Foundation, Inc. | 3 | Copyright (C) 2002-2022 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | Importing a new Unicode Standard version into Emacs | 6 | Importing a new Unicode Standard version into Emacs |
diff --git a/admin/notes/www b/admin/notes/www index 524b908d0e7..61a80e3d196 100644 --- a/admin/notes/www +++ b/admin/notes/www | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- outline -*- | 1 | -*- outline -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2013-2021 Free Software Foundation, Inc. | 3 | Copyright (C) 2013-2022 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | NOTES FOR EMACS WWW PAGES | 6 | NOTES FOR EMACS WWW PAGES |
diff --git a/admin/notes/years b/admin/notes/years index 19c72c39184..4f1d29ef022 100644 --- a/admin/notes/years +++ b/admin/notes/years | |||
| @@ -3,7 +3,9 @@ HOW TO MAINTAIN COPYRIGHT YEARS FOR GNU EMACS | |||
| 3 | Maintaining copyright years is now very simple: every time a new year | 3 | Maintaining copyright years is now very simple: every time a new year |
| 4 | rolls around, add that year to every FSF (and AIST) copyright notice. | 4 | rolls around, add that year to every FSF (and AIST) copyright notice. |
| 5 | Do this by running the 'admin/update-copyright' script on a fresh repo | 5 | Do this by running the 'admin/update-copyright' script on a fresh repo |
| 6 | checkout. Inspect the results for plausibility, then commit them. | 6 | checkout, redirecting its output to a file, so that you could later |
| 7 | examine the files that don't have copyright notices. Inspect the | ||
| 8 | results for plausibility, then commit them. | ||
| 7 | 9 | ||
| 8 | You should also run the etags test suite in test/manual/etags/. It | 10 | You should also run the etags test suite in test/manual/etags/. It |
| 9 | will most probably fail because the contents of the test files changes | 11 | will most probably fail because the contents of the test files changes |
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index aaaea3b91f7..c42b7b64940 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2001-2021 Free Software Foundation, Inc. | 1 | Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | Emacs for Windows | 4 | Emacs for Windows |
diff --git a/admin/nt/dist-build/README-windows-binaries b/admin/nt/dist-build/README-windows-binaries index b6f6e55d8c6..475612ac80e 100644 --- a/admin/nt/dist-build/README-windows-binaries +++ b/admin/nt/dist-build/README-windows-binaries | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2001-2021 Free Software Foundation, Inc. | 1 | Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | Precompiled Distributions of | 4 | Precompiled Distributions of |
diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py index dfff493b640..a1d9afa517f 100755 --- a/admin/nt/dist-build/build-dep-zips.py +++ b/admin/nt/dist-build/build-dep-zips.py | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/usr/bin/python3 | 1 | #!/usr/bin/python3 |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2017-2021 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2017-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## This file is part of GNU Emacs. | 5 | ## This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh index 4c3a52af6a7..77d20a5a7b9 100755 --- a/admin/nt/dist-build/build-zips.sh +++ b/admin/nt/dist-build/build-zips.sh | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2017-2021 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2017-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## This file is part of GNU Emacs. | 5 | ## This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 475658ae93e..9a73cf5a401 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly | 2 | ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly |
| 3 | 3 | ||
| 4 | ## Copyright (C) 2001-2021 Free Software Foundation, Inc. | 4 | ## Copyright (C) 2001-2022 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## Author: Miles Bader <miles@gnu.org> | 6 | ## Author: Miles Bader <miles@gnu.org> |
| 7 | 7 | ||
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index 011e97b3d10..45bba85213b 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### @configure_input@ | 1 | ### @configure_input@ |
| 2 | 2 | ||
| 3 | # Copyright (C) 2012-2021 Free Software Foundation, Inc. | 3 | # Copyright (C) 2012-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | # National Institute of Advanced Industrial Science and Technology (AIST) | 6 | # National Institute of Advanced Industrial Science and Technology (AIST) |
diff --git a/admin/unidata/blocks.awk b/admin/unidata/blocks.awk index 314ac3e9394..48d8c873c7a 100755 --- a/admin/unidata/blocks.awk +++ b/admin/unidata/blocks.awk | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/usr/bin/awk -f | 1 | #!/usr/bin/awk -f |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2015-2021 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2015-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## Author: Glenn Morris <rgm@gnu.org> | 5 | ## Author: Glenn Morris <rgm@gnu.org> |
| 6 | ## Maintainer: emacs-devel@gnu.org | 6 | ## Maintainer: emacs-devel@gnu.org |
diff --git a/admin/unidata/emoji-zwj.awk b/admin/unidata/emoji-zwj.awk index e704cb45263..3d605d5d640 100644 --- a/admin/unidata/emoji-zwj.awk +++ b/admin/unidata/emoji-zwj.awk | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/usr/bin/awk -f | 1 | #!/usr/bin/awk -f |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2020 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2020, 2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## Author: Robert Pluim <rpluim@gmail.com> | 5 | ## Author: Robert Pluim <rpluim@gmail.com> |
| 6 | 6 | ||
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index abd41e34a48..d6b5a476bb0 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; unidata-gen.el --- Create files containing character property data -*- lexical-binding:t -*- | 1 | ;;; unidata-gen.el --- Create files containing character property data -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | ;; National Institute of Advanced Industrial Science and Technology (AIST) | 6 | ;; National Institute of Advanced Industrial Science and Technology (AIST) |
diff --git a/admin/unidata/uvs.el b/admin/unidata/uvs.el index 0141b638fb2..5a4b8e71a2d 100644 --- a/admin/unidata/uvs.el +++ b/admin/unidata/uvs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts -*- lexical-binding:t -*- | 1 | ;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2014-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2014-2022 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 5 | ;; Author: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 6 | 6 | ||
diff --git a/admin/update-copyright b/admin/update-copyright index 86953838bdd..5a04847a661 100755 --- a/admin/update-copyright +++ b/admin/update-copyright | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | # By default, this script uses the local-time calendar year. | 7 | # By default, this script uses the local-time calendar year. |
| 8 | # Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default. | 8 | # Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default. |
| 9 | 9 | ||
| 10 | # Copyright 2013-2021 Free Software Foundation, Inc. | 10 | # Copyright 2013-2022 Free Software Foundation, Inc. |
| 11 | 11 | ||
| 12 | # This file is part of GNU Emacs. | 12 | # This file is part of GNU Emacs. |
| 13 | 13 | ||
diff --git a/admin/update_autogen b/admin/update_autogen index 99297a9c0dc..bfbf9d15c24 100755 --- a/admin/update_autogen +++ b/admin/update_autogen | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/usr/bin/env bash | 1 | #!/usr/bin/env bash |
| 2 | ### update_autogen - update some auto-generated files in the Emacs tree | 2 | ### update_autogen - update some auto-generated files in the Emacs tree |
| 3 | 3 | ||
| 4 | ## Copyright (C) 2011-2021 Free Software Foundation, Inc. | 4 | ## Copyright (C) 2011-2022 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## Author: Glenn Morris <rgm@gnu.org> | 6 | ## Author: Glenn Morris <rgm@gnu.org> |
| 7 | ## Maintainer: emacs-devel@gnu.org | 7 | ## Maintainer: emacs-devel@gnu.org |
diff --git a/admin/upload-manuals b/admin/upload-manuals index 52999c2997a..1fa9865e657 100755 --- a/admin/upload-manuals +++ b/admin/upload-manuals | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | ### upload-manuals - upload the Emacs manuals to the gnu.org website | 3 | ### upload-manuals - upload the Emacs manuals to the gnu.org website |
| 4 | 4 | ||
| 5 | ## Copyright 2018-2021 Free Software Foundation, Inc. | 5 | ## Copyright 2018-2022 Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | ## Author: Glenn Morris <rgm@gnu.org> | 7 | ## Author: Glenn Morris <rgm@gnu.org> |
| 8 | ## Maintainer: emacs-devel@gnu.org | 8 | ## Maintainer: emacs-devel@gnu.org |