diff options
author | Eli Zaretskii <eliz@gnu.org> | 2023-01-01 05:47:47 -0500 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2023-01-01 05:47:47 -0500 |
commit | 3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2 (patch) | |
tree | bc5715fea2ff0ae8830afdee165dcaa22344f159 /nt | |
parent | df192b5153f9d0c9b371f28f6460a038cba8a987 (diff) | |
parent | cae528457cb862dc886a34240c9d4c73035b6659 (diff) | |
download | emacs-3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2.tar.gz |
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.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/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 |
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 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 1995-1999, 2001-2022 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2001-2023 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/INSTALL b/nt/INSTALL index 81d4c6293c5..2d973816e37 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-2022 Free Software Foundation, Inc. + Copyright (C) 2013-2023 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 0e5e62117d2..fa576fb4d7f 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-2022 Free Software Foundation, Inc. + Copyright (c) 2015-2023 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 c5a9bf4363d..0c3192a63e6 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2013-2022 Free Software Foundation, Inc. +# Copyright (C) 2013-2023 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/nt/README b/nt/README index a142994b743..118ead25fce 100644 --- a/nt/README +++ b/nt/README @@ -1,6 +1,6 @@ Emacs for Windows NT/2000 and Windows 95/98/ME - Copyright (C) 2001-2022 Free Software Foundation, Inc. + Copyright (C) 2001-2023 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 30f33ca706f..da1ede1ea4d 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2022 Free Software Foundation, Inc. +Copyright (C) 2001-2023 Free Software Foundation, Inc. See the end of the file for license conditions. 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 @@ /* Add entries to the GNU Emacs Program Manager folder. - Copyright (C) 1995, 2001-2022 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2023 Free Software Foundation, Inc. This file is part of GNU Emacs. 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 @@ /* Proxy shell designed for use with Emacs on Windows 95 and NT. - Copyright (C) 1997, 2001-2022 Free Software Foundation, Inc. + Copyright (C) 1997, 2001-2023 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 60682a7a81d..d63929527f7 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-2022 Free Software Foundation, Inc.
+rem Copyright (C) 1999-2023 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
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 @@ /* Simple client interface to DDE servers. - Copyright (C) 1998, 2001-2022 Free Software Foundation, Inc. + Copyright (C) 1998, 2001-2023 Free Software Foundation, Inc. This file is part of GNU Emacs. 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 @@ 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-2022 Free Software +Copyright (C) 1993, 1995, 1997, 1999, 2001-2023 Free Software Foundation, Inc. This 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 @@ # Configurations for ../lib/gnulib.mk. # -# Copyright 2017-2022 Free Software Foundation, Inc. +# Copyright 2017-2023 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 f84d4635b35..dbb28fcfee1 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-2022 Free Software Foundation, Inc. +Copyright (C) 2008-2023 Free Software Foundation, Inc. License: GNU General Public License version 3 or later File: emacs22.ico Author: Andrew Zhilin -Copyright (C) 2005-2022 Free Software Foundation, Inc. +Copyright (C) 2005-2023 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-2022 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2023 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 14866684a97..1a5f0276ca1 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-2022 Free Software Foundation, Inc. +Copyright (C) 2003-2023 Free Software Foundation, Inc. This file is part of GNU Emacs. 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 @@ /* Replacement inttypes.h file for building GNU Emacs on Windows with MSVC. -Copyright (C) 2011-2022 Free Software Foundation, Inc. +Copyright (C) 2011-2023 Free Software Foundation, Inc. This file is part of GNU Emacs. 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 @@ /* Replacement langinfo.h file for building GNU Emacs on Windows. -Copyright (C) 2006-2022 Free Software Foundation, Inc. +Copyright (C) 2006-2023 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 98e31df70c8..58be1199345 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-2022 Free Software Foundation, Inc. +Copyright (C) 1993-1995, 2001-2023 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 155a62f4c08..17debcc5b64 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-2022 Free Software Foundation, Inc. +Copyright (C) 2006-2023 Free Software Foundation, Inc. This file is part of GNU Emacs. 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 @@ /* Replacement stdint.h file for building GNU Emacs on Windows. -Copyright (C) 2011-2022 Free Software Foundation, Inc. +Copyright (C) 2011-2023 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 87f396b1f2c..72d855e6a82 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-2022 Free Software Foundation, Inc. +Copyright (C) 2016-2023 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 87123dcc640..43a24797b4c 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 2001-2022 Free Software Foundation, Inc. +/* Copyright (C) 1995, 2001-2023 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 17e5dd62649..0eb178dc0c9 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-2022 Free Software Foundation, Inc. +Copyright (C) 2008-2023 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 56f690baa15..6f49c055fb7 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-2022 Free Software Foundation, Inc. +Copyright (C) 2012-2023 Free Software Foundation, Inc. This file is part of GNU Emacs. 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 @@ /* Pre-process emacs.exe for profiling by MSVC. - Copyright (C) 1999, 2001-2022 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2023 Free Software Foundation, Inc. This file is part of GNU Emacs. 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 @@ /* runemacs --- Simple program to start Emacs with its console window hidden. -Copyright (C) 2001-2022 Free Software Foundation, Inc. +Copyright (C) 2001-2023 Free Software Foundation, Inc. This file is part of GNU Emacs. |