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 /nt | |
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 'nt')
-rw-r--r-- | nt/ChangeLog.1 | 2 | ||||
-rw-r--r-- | nt/INSTALL | 2 | ||||
-rw-r--r-- | nt/INSTALL.W64 | 2 | ||||
-rw-r--r-- | nt/Makefile.in | 2 | ||||
-rw-r--r-- | nt/README | 2 | ||||
-rw-r--r-- | nt/README.W32 | 2 | ||||
-rw-r--r-- | nt/addpm.c | 2 | ||||
-rw-r--r-- | nt/cmdproxy.c | 2 | ||||
-rw-r--r-- | nt/ddeclient.c | 2 | ||||
-rw-r--r-- | nt/epaths.nt | 2 | ||||
-rw-r--r-- | nt/gnulib-cfg.mk | 2 | ||||
-rw-r--r-- | nt/icons/README | 2 | ||||
-rw-r--r-- | nt/inc/grp.h | 2 | ||||
-rw-r--r-- | nt/inc/inttypes.h | 2 | ||||
-rw-r--r-- | nt/inc/langinfo.h | 2 | ||||
-rw-r--r-- | nt/inc/ms-w32.h | 2 | ||||
-rw-r--r-- | nt/inc/nl_types.h | 2 | ||||
-rw-r--r-- | nt/inc/stdint.h | 2 | ||||
-rw-r--r-- | nt/inc/sys/resource.h | 2 | ||||
-rw-r--r-- | nt/inc/sys/socket.h | 2 | ||||
-rw-r--r-- | nt/inc/sys/stat.h | 2 | ||||
-rw-r--r-- | nt/inc/sys/wait.h | 2 | ||||
-rw-r--r-- | nt/preprep.c | 2 | ||||
-rw-r--r-- | nt/runemacs.c | 2 |
24 files changed, 24 insertions, 24 deletions
diff --git a/nt/ChangeLog.1 b/nt/ChangeLog.1 index d0aed936d19..632dc642cda 100644 --- a/nt/ChangeLog.1 +++ b/nt/ChangeLog.1 @@ -3548,7 +3548,7 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 1995-1999, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/INSTALL b/nt/INSTALL index c324fb4ae7d..0b8ca98c8ad 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -1,7 +1,7 @@ Building and Installing Emacs on MS-Windows using the MSYS and MinGW tools - Copyright (C) 2013-2021 Free Software Foundation, Inc. + Copyright (C) 2013-2022 Free Software Foundation, Inc. See the end of the file for license conditions. The MSYS/MinGW build described here is supported on versions of diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64 index c3845d5b177..fd8f60bb0b5 100644 --- a/nt/INSTALL.W64 +++ b/nt/INSTALL.W64 @@ -1,7 +1,7 @@ Building and Installing Emacs on 64-bit MS-Windows using MSYS2 and MinGW-w64 - Copyright (c) 2015-2021 Free Software Foundation, Inc. + Copyright (c) 2015-2022 Free Software Foundation, Inc. See the end of the file for license conditions. This document describes how to compile a 64-bit GNU Emacs using MSYS2 diff --git a/nt/Makefile.in b/nt/Makefile.in index 811680da851..c904e6d451e 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2013-2021 Free Software Foundation, Inc. +# Copyright (C) 2013-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/nt/README b/nt/README index 3da31d018b9..a142994b743 100644 --- a/nt/README +++ b/nt/README @@ -1,6 +1,6 @@ Emacs for Windows NT/2000 and Windows 95/98/ME - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. This directory contains support for compiling and running GNU Emacs on diff --git a/nt/README.W32 b/nt/README.W32 index 495af0baede..cbb5b12551e 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Emacs version 29.0.50 for MS-Windows diff --git a/nt/addpm.c b/nt/addpm.c index 4fbcf6c05ea..22134e482a2 100644 --- a/nt/addpm.c +++ b/nt/addpm.c @@ -1,5 +1,5 @@ /* Add entries to the GNU Emacs Program Manager folder. - Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index f5a0550aa9d..ad061306a37 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c @@ -1,5 +1,5 @@ /* Proxy shell designed for use with Emacs on Windows 95 and NT. - Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1997, 2001-2022 Free Software Foundation, Inc. Accepts subset of Unix sh(1) command-line options, for compatibility with elisp code written for Unix. When possible, executes external diff --git a/nt/ddeclient.c b/nt/ddeclient.c index 0a44cbfd770..87f209422cc 100644 --- a/nt/ddeclient.c +++ b/nt/ddeclient.c @@ -1,5 +1,5 @@ /* Simple client interface to DDE servers. - Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1998, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/epaths.nt b/nt/epaths.nt index a75ed52a34a..da17883bf23 100644 --- a/nt/epaths.nt +++ b/nt/epaths.nt @@ -12,7 +12,7 @@ the host system (e.g., i686-pc-mingw32), and @SRC@ by the root of the Emacs source tree used to build Emacs. */ /* -Copyright (C) 1993, 1995, 1997, 1999, 2001-2021 Free Software +Copyright (C) 1993, 1995, 1997, 1999, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk index e9f00e748ea..4748474f1dc 100644 --- a/nt/gnulib-cfg.mk +++ b/nt/gnulib-cfg.mk @@ -1,6 +1,6 @@ # Configurations for ../lib/gnulib.mk. # -# Copyright 2017-2021 Free Software Foundation, Inc. +# Copyright 2017-2022 Free Software Foundation, Inc. # # This file 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/nt/icons/README b/nt/icons/README index a8849b2eeec..4006146d352 100644 --- a/nt/icons/README +++ b/nt/icons/README @@ -2,7 +2,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: emacs.ico Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> -Copyright (C) 2008-2021 Free Software Foundation, Inc. +Copyright (C) 2008-2022 Free Software Foundation, Inc. License: GNU General Public License version 3 or later diff --git a/nt/inc/grp.h b/nt/inc/grp.h index 41511477dbf..14866684a97 100644 --- a/nt/inc/grp.h +++ b/nt/inc/grp.h @@ -1,6 +1,6 @@ /* Replacement grp.h file for building GNU Emacs on Windows. -Copyright (C) 2003-2021 Free Software Foundation, Inc. +Copyright (C) 2003-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h index 89c000238f8..c41966b14a0 100644 --- a/nt/inc/inttypes.h +++ b/nt/inc/inttypes.h @@ -1,6 +1,6 @@ /* Replacement inttypes.h file for building GNU Emacs on Windows with MSVC. -Copyright (C) 2011-2021 Free Software Foundation, Inc. +Copyright (C) 2011-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h index 86f4ce5bd9a..9475e6a11ca 100644 --- a/nt/inc/langinfo.h +++ b/nt/inc/langinfo.h @@ -1,6 +1,6 @@ /* Replacement langinfo.h file for building GNU Emacs on Windows. -Copyright (C) 2006-2021 Free Software Foundation, Inc. +Copyright (C) 2006-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index aad51b59cfe..3f4b2f34892 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -1,6 +1,6 @@ /* System description file for Windows NT. -Copyright (C) 1993-1995, 2001-2021 Free Software Foundation, Inc. +Copyright (C) 1993-1995, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h index 8926f75f79d..155a62f4c08 100644 --- a/nt/inc/nl_types.h +++ b/nt/inc/nl_types.h @@ -1,6 +1,6 @@ /* Replacement nl_types.h file for building GNU Emacs on Windows. -Copyright (C) 2006-2021 Free Software Foundation, Inc. +Copyright (C) 2006-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h index 0ee3d4a9ffc..812e54c4027 100644 --- a/nt/inc/stdint.h +++ b/nt/inc/stdint.h @@ -1,6 +1,6 @@ /* Replacement stdint.h file for building GNU Emacs on Windows. -Copyright (C) 2011-2021 Free Software Foundation, Inc. +Copyright (C) 2011-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/resource.h b/nt/inc/sys/resource.h index d35f89b8cdf..87f396b1f2c 100644 --- a/nt/inc/sys/resource.h +++ b/nt/inc/sys/resource.h @@ -1,6 +1,6 @@ /* A limited emulation of sys/resource.h. -Copyright (C) 2016-2021 Free Software Foundation, Inc. +Copyright (C) 2016-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 48b24628f88..87123dcc640 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. +/* Copyright (C) 1995, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h index aa93bd4af44..17e5dd62649 100644 --- a/nt/inc/sys/stat.h +++ b/nt/inc/sys/stat.h @@ -1,7 +1,7 @@ /* sys/stat.h supplied with MSVCRT uses too narrow data types for inode and user/group id, so we replace them with our own. -Copyright (C) 2008-2021 Free Software Foundation, Inc. +Copyright (C) 2008-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/wait.h b/nt/inc/sys/wait.h index 481ad9c38b5..56f690baa15 100644 --- a/nt/inc/sys/wait.h +++ b/nt/inc/sys/wait.h @@ -1,6 +1,6 @@ /* A limited emulation of sys/wait.h on Posix systems. -Copyright (C) 2012-2021 Free Software Foundation, Inc. +Copyright (C) 2012-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/preprep.c b/nt/preprep.c index 8b054b19a71..a2de049d596 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -1,5 +1,5 @@ /* Pre-process emacs.exe for profiling by MSVC. - Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/runemacs.c b/nt/runemacs.c index b4ed9fb1564..ea1e420fab0 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -1,6 +1,6 @@ /* runemacs --- Simple program to start Emacs with its console window hidden. -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. |