aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorEli Zaretskii2023-01-01 05:47:47 -0500
committerEli Zaretskii2023-01-01 05:47:47 -0500
commit3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2 (patch)
treebc5715fea2ff0ae8830afdee165dcaa22344f159 /nt
parentdf192b5153f9d0c9b371f28f6460a038cba8a987 (diff)
parentcae528457cb862dc886a34240c9d4c73035b6659 (diff)
downloademacs-3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2.tar.gz
emacs-3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2.zip
Merge from origin/emacs-29
cae528457c ; Add 2023 to copyright years. b394359261 Improve documentation of 'isearch-open-overlay-temporary' ab3210e709 Document 'use-package' in the 2 main manuals # Conflicts: # etc/refcards/ru-refcard.tex # lib/explicit_bzero.c # m4/explicit_bzero.m4
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/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
25 files changed, 27 insertions, 27 deletions
diff --git a/nt/ChangeLog.1 b/nt/ChangeLog.1
index 632dc642cda..1e54afd7a1d 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-2022 Free Software Foundation, Inc. 3551 Copyright (C) 1995-1999, 2001-2023 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 81d4c6293c5..2d973816e37 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-2022 Free Software Foundation, Inc. 4 Copyright (C) 2013-2023 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 0e5e62117d2..fa576fb4d7f 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-2022 Free Software Foundation, Inc. 4 Copyright (c) 2015-2023 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 c5a9bf4363d..0c3192a63e6 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-2022 Free Software Foundation, Inc. 3# Copyright (C) 2013-2023 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 a142994b743..118ead25fce 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-2022 Free Software Foundation, Inc. 3 Copyright (C) 2001-2023 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 30f33ca706f..da1ede1ea4d 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,4 +1,4 @@
1Copyright (C) 2001-2022 Free Software Foundation, Inc. 1Copyright (C) 2001-2023 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 30.0.50 for MS-Windows 4 Emacs version 30.0.50 for MS-Windows
diff --git a/nt/addpm.c b/nt/addpm.c
index 22134e482a2..1f137144aac 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-2022 Free Software Foundation, Inc. 2 Copyright (C) 1995, 2001-2023 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 ad061306a37..d669fa1a391 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-2022 Free Software Foundation, Inc. 2 Copyright (C) 1997, 2001-2023 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 60682a7a81d..d63929527f7 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-2022 Free Software Foundation, Inc. 4rem Copyright (C) 1999-2023 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 87f209422cc..1fbd2da4c13 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-2022 Free Software Foundation, Inc. 2 Copyright (C) 1998, 2001-2023 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/epaths.nt b/nt/epaths.nt
index da17883bf23..6069004cd13 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-2022 Free Software 15Copyright (C) 1993, 1995, 1997, 1999, 2001-2023 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 69119b135e2..eca3778f203 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-2022 Free Software Foundation, Inc. 3# Copyright 2017-2023 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 f84d4635b35..dbb28fcfee1 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-2022 Free Software Foundation, Inc. 5Copyright (C) 2008-2023 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-2022 Free Software Foundation, Inc. 11Copyright (C) 2005-2023 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-2022 Free Software Foundation, Inc. 20Copyright (C) 1999, 2001-2023 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 14866684a97..1a5f0276ca1 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-2022 Free Software Foundation, Inc. 3Copyright (C) 2003-2023 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 c41966b14a0..657bd960758 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-2022 Free Software Foundation, Inc. 3Copyright (C) 2011-2023 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 9475e6a11ca..86d925bd13f 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-2022 Free Software Foundation, Inc. 3Copyright (C) 2006-2023 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 98e31df70c8..58be1199345 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-2022 Free Software Foundation, Inc. 3Copyright (C) 1993-1995, 2001-2023 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 155a62f4c08..17debcc5b64 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-2022 Free Software Foundation, Inc. 3Copyright (C) 2006-2023 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 812e54c4027..c9b667f5759 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-2022 Free Software Foundation, Inc. 3Copyright (C) 2011-2023 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 87f396b1f2c..72d855e6a82 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-2022 Free Software Foundation, Inc. 3Copyright (C) 2016-2023 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 87123dcc640..43a24797b4c 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -1,4 +1,4 @@
1/* Copyright (C) 1995, 2001-2022 Free Software Foundation, Inc. 1/* Copyright (C) 1995, 2001-2023 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 17e5dd62649..0eb178dc0c9 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-2022 Free Software Foundation, Inc. 4Copyright (C) 2008-2023 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 56f690baa15..6f49c055fb7 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-2022 Free Software Foundation, Inc. 3Copyright (C) 2012-2023 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 a2de049d596..618a260f12f 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-2022 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2001-2023 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 ea1e420fab0..9226bb50745 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-2022 Free Software Foundation, Inc. 3Copyright (C) 2001-2023 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6