diff options
author | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
---|---|---|
committer | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
commit | 5db5064395c251a822e429e19ddecb74a974b6ef (patch) | |
tree | 2e04729a03d5fc68d0caef3a16e00349b6d413fc /nt | |
parent | 9420ea6e0840bffcb140d3677dfdabb9251c1f63 (diff) | |
parent | 0f561ee55348ff451600cc6027db5940ee14606f (diff) | |
download | emacs-5db5064395c251a822e429e19ddecb74a974b6ef.tar.gz |
Merge remote-tracking branch 'savannah/master' into HEAD
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 | ||||
-rwxr-xr-x | nt/configure.bat | 2 | ||||
-rw-r--r-- | nt/ddeclient.c | 2 | ||||
-rw-r--r-- | nt/emacs.rc.in | 2 | ||||
-rw-r--r-- | nt/emacsclient.rc.in | 2 | ||||
-rw-r--r-- | nt/epaths.nt | 2 | ||||
-rw-r--r-- | nt/gnulib-cfg.mk | 2 | ||||
-rw-r--r-- | nt/icons/README | 6 | ||||
-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 |
27 files changed, 29 insertions, 29 deletions
diff --git a/nt/ChangeLog.1 b/nt/ChangeLog.1 index 187a59c7184..247f10a7335 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-2020 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/INSTALL b/nt/INSTALL index 27fb5f096f7..9f543151a94 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-2020 Free Software Foundation, Inc. + Copyright (C) 2013-2021 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 4724116ebcc..8f0d0c9528f 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-2020 Free Software Foundation, Inc. + Copyright (c) 2015-2021 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 6bdf824ba9f..aa3a76280ef 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2013-2020 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/nt/README b/nt/README index bc028c8a24f..3da31d018b9 100644 --- a/nt/README +++ b/nt/README @@ -1,6 +1,6 @@ Emacs for Windows NT/2000 and Windows 95/98/ME - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 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 9c8d20472a9..ed5673334ad 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. Emacs version 28.0.50 for MS-Windows diff --git a/nt/addpm.c b/nt/addpm.c index 19a40220203..f54a6ea9f7c 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-2020 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index 51390012be7..224f68b1e85 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-2020 Free Software Foundation, Inc. + Copyright (C) 1997, 2001-2021 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/configure.bat b/nt/configure.bat index 8d436690e4f..0cb1a632e2b 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -1,7 +1,7 @@ @echo off
rem ----------------------------------------------------------------------
rem This was the old configuration script for MS Windows operating systems
-rem Copyright (C) 1999-2020 Free Software Foundation, Inc.
+rem Copyright (C) 1999-2021 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/nt/ddeclient.c b/nt/ddeclient.c index a1a1999f701..c577bfcfa93 100644 --- a/nt/ddeclient.c +++ b/nt/ddeclient.c @@ -1,5 +1,5 @@ /* Simple client interface to DDE servers. - Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/emacs.rc.in b/nt/emacs.rc.in index b551e588cad..ed217887c5d 100644 --- a/nt/emacs.rc.in +++ b/nt/emacs.rc.in @@ -31,7 +31,7 @@ BEGIN VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "Emacs\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2020\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2021\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" VALUE "ProductVersion", "@comma_space_version@\0" diff --git a/nt/emacsclient.rc.in b/nt/emacsclient.rc.in index ebb117f0e6b..c061f06528e 100644 --- a/nt/emacsclient.rc.in +++ b/nt/emacsclient.rc.in @@ -25,7 +25,7 @@ BEGIN VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "EmacsClient\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2020\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2021\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" VALUE "ProductVersion", "@comma_space_version@\0" diff --git a/nt/epaths.nt b/nt/epaths.nt index a61bcb944b8..a75ed52a34a 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-2020 Free Software +Copyright (C) 1993, 1995, 1997, 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk index b84626d903d..5cdbde6bb5b 100644 --- a/nt/gnulib-cfg.mk +++ b/nt/gnulib-cfg.mk @@ -1,6 +1,6 @@ # Configurations for ../lib/gnulib.mk. # -# Copyright 2017-2020 Free Software Foundation, Inc. +# Copyright 2017-2021 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 9502e17437f..a8849b2eeec 100644 --- a/nt/icons/README +++ b/nt/icons/README @@ -2,13 +2,13 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: emacs.ico Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> -Copyright (C) 2008-2020 Free Software Foundation, Inc. +Copyright (C) 2008-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later File: emacs22.ico Author: Andrew Zhilin -Copyright (C) 2005-2020 Free Software Foundation, Inc. +Copyright (C) 2005-2021 Free Software Foundation, Inc. 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 gnu7.ico gnu8.ico gnu9.ico Author: Rob Davenport <rgd at bigfoot.com> -Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) <http://users.adelphia.net/~rob.davenport/gnuicons.html> diff --git a/nt/inc/grp.h b/nt/inc/grp.h index 342dfba7098..41511477dbf 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-2020 Free Software Foundation, Inc. +Copyright (C) 2003-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h index 3ac73a780e0..89c000238f8 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-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h index 243a6a52ab7..86f4ce5bd9a 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-2020 Free Software Foundation, Inc. +Copyright (C) 2006-2021 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 2c754f93e8f..aad51b59cfe 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-2020 Free Software Foundation, Inc. +Copyright (C) 1993-1995, 2001-2021 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 28ec639d075..8926f75f79d 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-2020 Free Software Foundation, Inc. +Copyright (C) 2006-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h index c06c97e7132..0ee3d4a9ffc 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-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 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 e03c2243e27..d35f89b8cdf 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-2020 Free Software Foundation, Inc. +Copyright (C) 2016-2021 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 94ed2aa35d2..48b24628f88 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +/* Copyright (C) 1995, 2001-2021 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 f58d5ab6573..aa93bd4af44 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-2020 Free Software Foundation, Inc. +Copyright (C) 2008-2021 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 0dff5203f4e..481ad9c38b5 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-2020 Free Software Foundation, Inc. +Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/preprep.c b/nt/preprep.c index 21eda0ee5e7..78ed1c32381 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-2020 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/runemacs.c b/nt/runemacs.c index 32fdc2b3074..308e856be2a 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-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. |