diff options
author | Eli Zaretskii <eliz@gnu.org> | 2022-01-01 07:03:03 -0500 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2022-01-01 07:03:03 -0500 |
commit | dcd76bd48df678d8234b904d7b13c997228519a3 (patch) | |
tree | 17b11e7d3aa1aa9d32d6be874cbbfb1e5882a2c5 /build-aux | |
parent | 84a8f656d344cc69bce3a922b99182896a4e1285 (diff) | |
parent | 836be7a112191cac8abd187e337c477ff5f05037 (diff) | |
download | emacs-dcd76bd48df678d8234b904d7b13c997228519a3.tar.gz |
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 'build-aux')
-rwxr-xr-x | build-aux/config.guess | 2 | ||||
-rwxr-xr-x | build-aux/config.sub | 2 | ||||
-rwxr-xr-x | build-aux/git-hooks/commit-msg | 2 | ||||
-rwxr-xr-x | build-aux/git-hooks/pre-commit | 2 | ||||
-rwxr-xr-x | build-aux/git-hooks/prepare-commit-msg | 2 | ||||
-rwxr-xr-x | build-aux/gitlog-to-changelog | 2 | ||||
-rwxr-xr-x | build-aux/gitlog-to-emacslog | 2 | ||||
-rwxr-xr-x | build-aux/make-info-dir | 2 | ||||
-rwxr-xr-x | build-aux/move-if-change | 2 | ||||
-rwxr-xr-x | build-aux/msys-to-w32 | 2 | ||||
-rwxr-xr-x | build-aux/update-copyright | 2 | ||||
-rwxr-xr-x | build-aux/update-subdirs | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess index 1105a749838..4fd569269c5 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,6 +1,6 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale diff --git a/build-aux/config.sub b/build-aux/config.sub index 38f3d037a78..a4812cb6951 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,6 +1,6 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index cf0f74c6441..bb4f358c5e4 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -1,7 +1,7 @@ #!/bin/sh # Check the format of GNU Emacs change log entries. -# Copyright 2014-2021 Free Software Foundation, Inc. +# Copyright 2014-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit index 719bfefc50a..a55004680fa 100755 --- a/build-aux/git-hooks/pre-commit +++ b/build-aux/git-hooks/pre-commit @@ -1,7 +1,7 @@ #!/bin/sh # Check file names in git commits for GNU Emacs. -# Copyright 2014-2021 Free Software Foundation, Inc. +# Copyright 2014-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/build-aux/git-hooks/prepare-commit-msg b/build-aux/git-hooks/prepare-commit-msg index dd8434479d4..7dc36f22193 100755 --- a/build-aux/git-hooks/prepare-commit-msg +++ b/build-aux/git-hooks/prepare-commit-msg @@ -1,7 +1,7 @@ #!/bin/sh # Check the format of GNU Emacs change log entries. -# Copyright 2019-2021 Free Software Foundation, Inc. +# Copyright 2019-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 9ff15f60198..1c6847ae3b3 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -3,7 +3,7 @@ # Convert git log output to ChangeLog format. -# Copyright (C) 2008-2021 Free Software Foundation, Inc. +# Copyright (C) 2008-2022 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog index 30b2d78659d..2ea20261718 100755 --- a/build-aux/gitlog-to-emacslog +++ b/build-aux/gitlog-to-emacslog @@ -2,7 +2,7 @@ # Convert git log output to ChangeLog format for GNU Emacs. -# Copyright (C) 2014-2021 Free Software Foundation, Inc. +# Copyright (C) 2014-2022 Free Software Foundation, Inc. # Author: Paul Eggert diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir index 256c9f025cc..c29ea5088b7 100755 --- a/build-aux/make-info-dir +++ b/build-aux/make-info-dir @@ -2,7 +2,7 @@ ### make-info-dir - create info/dir, for systems without install-info -## Copyright (C) 2013-2021 Free Software Foundation, Inc. +## Copyright (C) 2013-2022 Free Software Foundation, Inc. ## Author: Glenn Morris <rgm@gnu.org> ## Maintainer: emacs-devel@gnu.org diff --git a/build-aux/move-if-change b/build-aux/move-if-change index e85e90af501..9f7379a603b 100755 --- a/build-aux/move-if-change +++ b/build-aux/move-if-change @@ -8,7 +8,7 @@ VERSION='2018-03-07 03:47'; # UTC # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 2002-2022 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32 index e4e5e086415..2e5df8252d7 100755 --- a/build-aux/msys-to-w32 +++ b/build-aux/msys-to-w32 @@ -2,7 +2,7 @@ # Convert a MSYS path list to Windows-native format. # Status is zero if successful, nonzero otherwise. -# Copyright (C) 2013-2021 Free Software Foundation, Inc. +# Copyright (C) 2013-2022 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/update-copyright b/build-aux/update-copyright index fae3a5fb33b..51b25dd0a5e 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -3,7 +3,7 @@ # Update an FSF copyright year list to include the current year. -# Copyright (C) 2009-2021 Free Software Foundation, Inc. +# Copyright (C) 2009-2022 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/update-subdirs b/build-aux/update-subdirs index e56eea44def..95cf06bb5c2 100755 --- a/build-aux/update-subdirs +++ b/build-aux/update-subdirs @@ -1,7 +1,7 @@ #!/bin/sh # Write into $1/subdirs.el a list of subdirs of directory $1. -# Copyright (C) 1994-1995, 1997, 1999, 2001-2021 Free Software +# Copyright (C) 1994-1995, 1997, 1999, 2001-2022 Free Software # Foundation, Inc. # This file is part of GNU Emacs. |