aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorPaul Eggert2020-01-01 01:08:16 +0000
committerPaul Eggert2020-01-01 01:08:16 +0000
commitc6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch)
treeab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /nt
parent47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff)
parent186152ba400b58d2d278c52d2e3d896decae767e (diff)
downloademacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz
emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip
Merge from origin/emacs-27
186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3 4cd143aded Fix copyright years by hand 365e01cc9f Update copyright year to 2020 cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac... # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog.12
-rw-r--r--nt/INSTALL2
-rw-r--r--nt/INSTALL.W642
-rw-r--r--nt/Makefile.in2
-rw-r--r--nt/README2
-rw-r--r--nt/README.W322
-rw-r--r--nt/addpm.c2
-rw-r--r--nt/cmdproxy.c2
-rwxr-xr-xnt/configure.bat2
-rw-r--r--nt/ddeclient.c2
-rw-r--r--nt/emacs.rc.in2
-rw-r--r--nt/emacsclient.rc.in2
-rw-r--r--nt/epaths.nt2
-rw-r--r--nt/gnulib-cfg.mk2
-rw-r--r--nt/icons/README6
-rw-r--r--nt/inc/grp.h2
-rw-r--r--nt/inc/inttypes.h2
-rw-r--r--nt/inc/langinfo.h2
-rw-r--r--nt/inc/ms-w32.h2
-rw-r--r--nt/inc/nl_types.h2
-rw-r--r--nt/inc/stdint.h2
-rw-r--r--nt/inc/sys/resource.h2
-rw-r--r--nt/inc/sys/socket.h2
-rw-r--r--nt/inc/sys/stat.h2
-rw-r--r--nt/inc/sys/wait.h2
-rw-r--r--nt/preprep.c2
-rw-r--r--nt/runemacs.c2
27 files changed, 29 insertions, 29 deletions
diff --git a/nt/ChangeLog.1 b/nt/ChangeLog.1
index 59b38224b61..187a59c7184 100644
--- a/nt/ChangeLog.1
+++ b/nt/ChangeLog.1
@@ -3548,7 +3548,7 @@
3548;; add-log-time-zone-rule: t 3548;; add-log-time-zone-rule: t
3549;; End: 3549;; End:
3550 3550
3551 Copyright (C) 1995-1999, 2001-2019 Free Software Foundation, Inc. 3551 Copyright (C) 1995-1999, 2001-2020 Free Software Foundation, Inc.
3552 3552
3553 This file is part of GNU Emacs. 3553 This file is part of GNU Emacs.
3554 3554
diff --git a/nt/INSTALL b/nt/INSTALL
index 3e617f27057..2fe2c8c2673 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -1,7 +1,7 @@
1 Building and Installing Emacs on MS-Windows 1 Building and Installing Emacs on MS-Windows
2 using the MSYS and MinGW tools 2 using the MSYS and MinGW tools
3 3
4 Copyright (C) 2013-2019 Free Software Foundation, Inc. 4 Copyright (C) 2013-2020 Free Software Foundation, Inc.
5 See the end of the file for license conditions. 5 See the end of the file for license conditions.
6 6
7The MSYS/MinGW build described here is supported on versions of 7The MSYS/MinGW build described here is supported on versions of
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index 4583aed83bf..c3d4dfa4c28 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -1,7 +1,7 @@
1 Building and Installing Emacs on 64-bit MS-Windows 1 Building and Installing Emacs on 64-bit MS-Windows
2 using MSYS2 and MinGW-w64 2 using MSYS2 and MinGW-w64
3 3
4 Copyright (c) 2015-2019 Free Software Foundation, Inc. 4 Copyright (c) 2015-2020 Free Software Foundation, Inc.
5 See the end of the file for license conditions. 5 See the end of the file for license conditions.
6 6
7This document describes how to compile a 64-bit GNU Emacs using MSYS2 7This document describes how to compile a 64-bit GNU Emacs using MSYS2
diff --git a/nt/Makefile.in b/nt/Makefile.in
index 36e524341f6..6bdf824ba9f 100644
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -1,6 +1,6 @@
1### @configure_input@ 1### @configure_input@
2 2
3# Copyright (C) 2013-2019 Free Software Foundation, Inc. 3# Copyright (C) 2013-2020 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/nt/README b/nt/README
index de68162131c..bc028c8a24f 100644
--- a/nt/README
+++ b/nt/README
@@ -1,6 +1,6 @@
1 Emacs for Windows NT/2000 and Windows 95/98/ME 1 Emacs for Windows NT/2000 and Windows 95/98/ME
2 2
3 Copyright (C) 2001-2019 Free Software Foundation, Inc. 3 Copyright (C) 2001-2020 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 This directory contains support for compiling and running GNU Emacs on 6 This directory contains support for compiling and running GNU Emacs on
diff --git a/nt/README.W32 b/nt/README.W32
index 64dc4c9e68b..9c8d20472a9 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,4 +1,4 @@
1Copyright (C) 2001-2019 Free Software Foundation, Inc. 1Copyright (C) 2001-2020 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 Emacs version 28.0.50 for MS-Windows 4 Emacs version 28.0.50 for MS-Windows
diff --git a/nt/addpm.c b/nt/addpm.c
index 3fd1b1bdc0d..19a40220203 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,5 +1,5 @@
1/* Add entries to the GNU Emacs Program Manager folder. 1/* Add entries to the GNU Emacs Program Manager folder.
2 Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc. 2 Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 0b72bcd4f32..51390012be7 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,5 +1,5 @@
1/* Proxy shell designed for use with Emacs on Windows 95 and NT. 1/* Proxy shell designed for use with Emacs on Windows 95 and NT.
2 Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc. 2 Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc.
3 3
4 Accepts subset of Unix sh(1) command-line options, for compatibility 4 Accepts subset of Unix sh(1) command-line options, for compatibility
5 with elisp code written for Unix. When possible, executes external 5 with elisp code written for Unix. When possible, executes external
diff --git a/nt/configure.bat b/nt/configure.bat
index 09a35945b95..8d436690e4f 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,7 +1,7 @@
1@echo off 1@echo off
2rem ---------------------------------------------------------------------- 2rem ----------------------------------------------------------------------
3rem This was the old configuration script for MS Windows operating systems 3rem This was the old configuration script for MS Windows operating systems
4rem Copyright (C) 1999-2019 Free Software Foundation, Inc. 4rem Copyright (C) 1999-2020 Free Software Foundation, Inc.
5 5
6rem This file is part of GNU Emacs. 6rem This file is part of GNU Emacs.
7 7
diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 81ae9491304..a1a1999f701 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -1,5 +1,5 @@
1/* Simple client interface to DDE servers. 1/* Simple client interface to DDE servers.
2 Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc. 2 Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
diff --git a/nt/emacs.rc.in b/nt/emacs.rc.in
index 71346dba6d0..b551e588cad 100644
--- a/nt/emacs.rc.in
+++ b/nt/emacs.rc.in
@@ -31,7 +31,7 @@ BEGIN
31 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" 31 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
32 VALUE "FileVersion", "@comma_space_version@\0" 32 VALUE "FileVersion", "@comma_space_version@\0"
33 VALUE "InternalName", "Emacs\0" 33 VALUE "InternalName", "Emacs\0"
34 VALUE "LegalCopyright", "Copyright (C) 2001-2019\0" 34 VALUE "LegalCopyright", "Copyright (C) 2001-2020\0"
35 VALUE "OriginalFilename", "emacs.exe" 35 VALUE "OriginalFilename", "emacs.exe"
36 VALUE "ProductName", "Emacs\0" 36 VALUE "ProductName", "Emacs\0"
37 VALUE "ProductVersion", "@comma_space_version@\0" 37 VALUE "ProductVersion", "@comma_space_version@\0"
diff --git a/nt/emacsclient.rc.in b/nt/emacsclient.rc.in
index fac7f6679c6..ebb117f0e6b 100644
--- a/nt/emacsclient.rc.in
+++ b/nt/emacsclient.rc.in
@@ -25,7 +25,7 @@ BEGIN
25 VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" 25 VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
26 VALUE "FileVersion", "@comma_space_version@\0" 26 VALUE "FileVersion", "@comma_space_version@\0"
27 VALUE "InternalName", "EmacsClient\0" 27 VALUE "InternalName", "EmacsClient\0"
28 VALUE "LegalCopyright", "Copyright (C) 2001-2019\0" 28 VALUE "LegalCopyright", "Copyright (C) 2001-2020\0"
29 VALUE "OriginalFilename", "emacsclientw.exe" 29 VALUE "OriginalFilename", "emacsclientw.exe"
30 VALUE "ProductName", "EmacsClient\0" 30 VALUE "ProductName", "EmacsClient\0"
31 VALUE "ProductVersion", "@comma_space_version@\0" 31 VALUE "ProductVersion", "@comma_space_version@\0"
diff --git a/nt/epaths.nt b/nt/epaths.nt
index 152184c651e..62e77490634 100644
--- a/nt/epaths.nt
+++ b/nt/epaths.nt
@@ -12,7 +12,7 @@
12 the host system (e.g., i686-pc-mingw32), and @SRC@ by the root of 12 the host system (e.g., i686-pc-mingw32), and @SRC@ by the root of
13 the Emacs source tree used to build Emacs. */ 13 the Emacs source tree used to build Emacs. */
14/* 14/*
15Copyright (C) 1993, 1995, 1997, 1999, 2001-2019 Free Software 15Copyright (C) 1993, 1995, 1997, 1999, 2001-2020 Free Software
16Foundation, Inc. 16Foundation, Inc.
17 17
18This file is part of GNU Emacs. 18This file is part of GNU Emacs.
diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk
index 91f30ec7149..08e83e028da 100644
--- a/nt/gnulib-cfg.mk
+++ b/nt/gnulib-cfg.mk
@@ -1,6 +1,6 @@
1# Configurations for ../lib/gnulib.mk. 1# Configurations for ../lib/gnulib.mk.
2# 2#
3# Copyright 2017-2019 Free Software Foundation, Inc. 3# Copyright 2017-2020 Free Software Foundation, Inc.
4# 4#
5# This file is free software; you can redistribute it and/or modify 5# This file is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by 6# it under the terms of the GNU General Public License as published by
diff --git a/nt/icons/README b/nt/icons/README
index 86765f96729..9502e17437f 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -2,13 +2,13 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
2 2
3File: emacs.ico 3File: emacs.ico
4Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> 4Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
5Copyright (C) 2008-2019 Free Software Foundation, Inc. 5Copyright (C) 2008-2020 Free Software Foundation, Inc.
6License: GNU General Public License version 3 or later 6License: GNU General Public License version 3 or later
7 7
8 8
9File: emacs22.ico 9File: emacs22.ico
10Author: Andrew Zhilin 10Author: Andrew Zhilin
11Copyright (C) 2005-2019 Free Software Foundation, Inc. 11Copyright (C) 2005-2020 Free Software Foundation, Inc.
12License: GNU General Public License version 3 or later (see COPYING) 12License: GNU General Public License version 3 or later (see COPYING)
13 13
14 14
@@ -17,7 +17,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
17 gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico 17 gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico
18 gnu7.ico gnu8.ico gnu9.ico 18 gnu7.ico gnu8.ico gnu9.ico
19Author: Rob Davenport <rgd at bigfoot.com> 19Author: Rob Davenport <rgd at bigfoot.com>
20Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc. 20Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc.
21License: GNU General Public License version 3 or later (see COPYING) 21License: GNU General Public License version 3 or later (see COPYING)
22 22
23 <http://users.adelphia.net/~rob.davenport/gnuicons.html> 23 <http://users.adelphia.net/~rob.davenport/gnuicons.html>
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index e78a63e107f..342dfba7098 100644
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -1,6 +1,6 @@
1/* Replacement grp.h file for building GNU Emacs on Windows. 1/* Replacement grp.h file for building GNU Emacs on Windows.
2 2
3Copyright (C) 2003-2019 Free Software Foundation, Inc. 3Copyright (C) 2003-2020 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h
index ae76b8cddee..3ac73a780e0 100644
--- a/nt/inc/inttypes.h
+++ b/nt/inc/inttypes.h
@@ -1,6 +1,6 @@
1/* Replacement inttypes.h file for building GNU Emacs on Windows with MSVC. 1/* Replacement inttypes.h file for building GNU Emacs on Windows with MSVC.
2 2
3Copyright (C) 2011-2019 Free Software Foundation, Inc. 3Copyright (C) 2011-2020 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index 6c4959ecb54..243a6a52ab7 100644
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -1,6 +1,6 @@
1/* Replacement langinfo.h file for building GNU Emacs on Windows. 1/* Replacement langinfo.h file for building GNU Emacs on Windows.
2 2
3Copyright (C) 2006-2019 Free Software Foundation, Inc. 3Copyright (C) 2006-2020 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 7de94ca0153..6d20c959a3f 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -1,6 +1,6 @@
1/* System description file for Windows NT. 1/* System description file for Windows NT.
2 2
3Copyright (C) 1993-1995, 2001-2019 Free Software Foundation, Inc. 3Copyright (C) 1993-1995, 2001-2020 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h
index a13309bc78e..28ec639d075 100644
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -1,6 +1,6 @@
1/* Replacement nl_types.h file for building GNU Emacs on Windows. 1/* Replacement nl_types.h file for building GNU Emacs on Windows.
2 2
3Copyright (C) 2006-2019 Free Software Foundation, Inc. 3Copyright (C) 2006-2020 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
index cb7b9f77223..c06c97e7132 100644
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -1,6 +1,6 @@
1/* Replacement stdint.h file for building GNU Emacs on Windows. 1/* Replacement stdint.h file for building GNU Emacs on Windows.
2 2
3Copyright (C) 2011-2019 Free Software Foundation, Inc. 3Copyright (C) 2011-2020 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/nt/inc/sys/resource.h b/nt/inc/sys/resource.h
index c56505590ef..e03c2243e27 100644
--- a/nt/inc/sys/resource.h
+++ b/nt/inc/sys/resource.h
@@ -1,6 +1,6 @@
1/* A limited emulation of sys/resource.h. 1/* A limited emulation of sys/resource.h.
2 2
3Copyright (C) 2016-2019 Free Software Foundation, Inc. 3Copyright (C) 2016-2020 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 0f3943b453a..94ed2aa35d2 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -1,4 +1,4 @@
1/* Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc. 1/* Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc.
2 2
3This file is part of GNU Emacs. 3This file is part of GNU Emacs.
4 4
diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h
index 31ad8724c4d..7bf780dbaa2 100644
--- a/nt/inc/sys/stat.h
+++ b/nt/inc/sys/stat.h
@@ -1,7 +1,7 @@
1/* sys/stat.h supplied with MSVCRT uses too narrow data types for 1/* sys/stat.h supplied with MSVCRT uses too narrow data types for
2 inode and user/group id, so we replace them with our own. 2 inode and user/group id, so we replace them with our own.
3 3
4Copyright (C) 2008-2019 Free Software Foundation, Inc. 4Copyright (C) 2008-2020 Free Software Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
7 7
diff --git a/nt/inc/sys/wait.h b/nt/inc/sys/wait.h
index 0b756a3db39..0dff5203f4e 100644
--- a/nt/inc/sys/wait.h
+++ b/nt/inc/sys/wait.h
@@ -1,6 +1,6 @@
1/* A limited emulation of sys/wait.h on Posix systems. 1/* A limited emulation of sys/wait.h on Posix systems.
2 2
3Copyright (C) 2012-2019 Free Software Foundation, Inc. 3Copyright (C) 2012-2020 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/nt/preprep.c b/nt/preprep.c
index f0f6273b15b..21eda0ee5e7 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -1,5 +1,5 @@
1/* Pre-process emacs.exe for profiling by MSVC. 1/* Pre-process emacs.exe for profiling by MSVC.
2 Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
diff --git a/nt/runemacs.c b/nt/runemacs.c
index 34833e95b91..32fdc2b3074 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -1,6 +1,6 @@
1/* runemacs --- Simple program to start Emacs with its console window hidden. 1/* runemacs --- Simple program to start Emacs with its console window hidden.
2 2
3Copyright (C) 2001-2019 Free Software Foundation, Inc. 3Copyright (C) 2001-2020 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
generated by cgit v1.2.1 (git 2.18.0) at 2026-03-01 13:47:41 +0000