diff options
| author | Eli Zaretskii | 2023-01-01 05:47:47 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2023-01-01 05:47:47 -0500 |
| commit | 3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2 (patch) | |
| tree | bc5715fea2ff0ae8830afdee165dcaa22344f159 /msdos | |
| parent | df192b5153f9d0c9b371f28f6460a038cba8a987 (diff) | |
| parent | cae528457cb862dc886a34240c9d4c73035b6659 (diff) | |
| download | emacs-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 'msdos')
| -rw-r--r-- | msdos/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | msdos/INSTALL | 2 | ||||
| -rw-r--r-- | msdos/README | 2 | ||||
| -rw-r--r-- | msdos/autogen/Makefile.in | 2 | ||||
| -rw-r--r-- | msdos/autogen/config.in | 2 | ||||
| -rw-r--r-- | msdos/depfiles.bat | 2 | ||||
| -rw-r--r-- | msdos/inttypes.h | 2 | ||||
| -rw-r--r-- | msdos/langinfo.h | 2 | ||||
| -rw-r--r-- | msdos/mainmake.v2 | 2 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 | ||||
| -rw-r--r-- | msdos/sed1x.inp | 2 | ||||
| -rw-r--r-- | msdos/sed2v2.inp | 4 | ||||
| -rw-r--r-- | msdos/sed2x.inp | 2 | ||||
| -rw-r--r-- | msdos/sed3v2.inp | 2 | ||||
| -rw-r--r-- | msdos/sed4.inp | 2 | ||||
| -rw-r--r-- | msdos/sed5x.inp | 2 | ||||
| -rw-r--r-- | msdos/sed6.inp | 2 | ||||
| -rw-r--r-- | msdos/sedadmin.inp | 2 | ||||
| -rw-r--r-- | msdos/sedalloc.inp | 2 | ||||
| -rw-r--r-- | msdos/sedleim.inp | 2 | ||||
| -rw-r--r-- | msdos/sedlibcf.inp | 2 | ||||
| -rw-r--r-- | msdos/sedlibmk.inp | 2 | ||||
| -rw-r--r-- | msdos/sedlisp.inp | 2 |
23 files changed, 24 insertions, 24 deletions
diff --git a/msdos/ChangeLog.1 b/msdos/ChangeLog.1 index aef002c459f..c58ff771084 100644 --- a/msdos/ChangeLog.1 +++ b/msdos/ChangeLog.1 | |||
| @@ -1550,7 +1550,7 @@ | |||
| 1550 | ;; coding: utf-8 | 1550 | ;; coding: utf-8 |
| 1551 | ;; End: | 1551 | ;; End: |
| 1552 | 1552 | ||
| 1553 | Copyright (C) 1994-1999, 2001-2022 Free Software Foundation, Inc. | 1553 | Copyright (C) 1994-1999, 2001-2023 Free Software Foundation, Inc. |
| 1554 | 1554 | ||
| 1555 | This file is part of GNU Emacs. | 1555 | This file is part of GNU Emacs. |
| 1556 | 1556 | ||
diff --git a/msdos/INSTALL b/msdos/INSTALL index 453bfa434a6..4baf2b15ab1 100644 --- a/msdos/INSTALL +++ b/msdos/INSTALL | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | GNU Emacs Installation Guide for the DJGPP (a.k.a. MS-DOS) port | 1 | GNU Emacs Installation Guide for the DJGPP (a.k.a. MS-DOS) port |
| 2 | 2 | ||
| 3 | Copyright (C) 1992, 1994, 1996-1997, 2000-2022 Free Software Foundation, | 3 | Copyright (C) 1992, 1994, 1996-1997, 2000-2023 Free Software Foundation, |
| 4 | Inc. | 4 | Inc. |
| 5 | See the end of the file for license conditions. | 5 | See the end of the file for license conditions. |
| 6 | 6 | ||
diff --git a/msdos/README b/msdos/README index cdda15f00dd..fb321273083 100644 --- a/msdos/README +++ b/msdos/README | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2001-2022 Free Software Foundation, Inc. | 1 | Copyright (C) 2001-2023 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/msdos/autogen/Makefile.in b/msdos/autogen/Makefile.in index cd7c97b2959..7f44c9867fe 100644 --- a/msdos/autogen/Makefile.in +++ b/msdos/autogen/Makefile.in | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # Makefile.in generated by automake 1.11.1 from Makefile.am. | 1 | # Makefile.in generated by automake 1.11.1 from Makefile.am. |
| 2 | # @configure_input@ | 2 | # @configure_input@ |
| 3 | 3 | ||
| 4 | # Copyright (C) 1994-2009, 2013-2022 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2009, 2013-2023 Free Software Foundation, Inc. |
| 5 | # This Makefile.in is free software; the Free Software Foundation | 5 | # This Makefile.in is free software; the Free Software Foundation |
| 6 | # gives unlimited permission to copy and/or distribute it, | 6 | # gives unlimited permission to copy and/or distribute it, |
| 7 | # with or without modifications, as long as this notice is preserved. | 7 | # with or without modifications, as long as this notice is preserved. |
diff --git a/msdos/autogen/config.in b/msdos/autogen/config.in index 4b1cfb96e86..88728cb309c 100644 --- a/msdos/autogen/config.in +++ b/msdos/autogen/config.in | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | /* GNU Emacs site configuration template file. | 3 | /* GNU Emacs site configuration template file. |
| 4 | 4 | ||
| 5 | Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2022 Free Software | 5 | Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2023 Free Software |
| 6 | Foundation, Inc. | 6 | Foundation, Inc. |
| 7 | 7 | ||
| 8 | This file is part of GNU Emacs. | 8 | This file is part of GNU Emacs. |
diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat index 8c36fbcdef1..269a5d07181 100644 --- a/msdos/depfiles.bat +++ b/msdos/depfiles.bat | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | @echo off | 1 | @echo off |
| 2 | rem ---------------------------------------------------------------------- | 2 | rem ---------------------------------------------------------------------- |
| 3 | rem Auxiliary script for MSDOS, run by ../config.bat | 3 | rem Auxiliary script for MSDOS, run by ../config.bat |
| 4 | rem Copyright (C) 2011-2022 Free Software Foundation, Inc. | 4 | rem Copyright (C) 2011-2023 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | rem This file is part of GNU Emacs. | 6 | rem This file is part of GNU Emacs. |
| 7 | 7 | ||
diff --git a/msdos/inttypes.h b/msdos/inttypes.h index daaa80bfa5d..ef646eef415 100644 --- a/msdos/inttypes.h +++ b/msdos/inttypes.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Replacement inttypes.h file for building GNU Emacs on MS-DOS with DJGPP. | 1 | /* Replacement inttypes.h file for building GNU Emacs on MS-DOS with DJGPP. |
| 2 | 2 | ||
| 3 | Copyright (C) 2011-2022 Free Software Foundation, Inc. | 3 | Copyright (C) 2011-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/msdos/langinfo.h b/msdos/langinfo.h index 02137ba36c3..018497af437 100644 --- a/msdos/langinfo.h +++ b/msdos/langinfo.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Replacement langinfo.h file for building GNU Emacs on MS-DOS with DJGPP. | 1 | /* Replacement langinfo.h file for building GNU Emacs on MS-DOS with DJGPP. |
| 2 | 2 | ||
| 3 | Copyright (C) 2021-2022 Free Software Foundation, Inc. | 3 | Copyright (C) 2021-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/msdos/mainmake.v2 b/msdos/mainmake.v2 index 2e7d242f0b1..4a1e10b336f 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*- | 1 | # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*- |
| 2 | 2 | ||
| 3 | # Copyright (C) 1996-2022 Free Software Foundation, Inc. | 3 | # Copyright (C) 1996-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/msdos/sed1v2.inp b/msdos/sed1v2.inp index 9c9d1eded19..4d4c80a6b1a 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration script for src/Makefile under DJGPP v2.x | 2 | # Configuration script for src/Makefile under DJGPP v2.x |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 1996-1997, 1999-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 1996-1997, 1999-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index 858f565f416..1a8e362f951 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Extra configuration script for src/makefile for DesqView/X | 2 | # Extra configuration script for src/makefile for DesqView/X |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 1994-1997, 1999-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 1994-1997, 1999-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 9e178ac1435..58c1663dda0 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration script for src/config.h under DJGPP v2.x | 2 | # Configuration script for src/config.h under DJGPP v2.x |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 1993-1997, 1999-2000, 2002-2022 Free Software | 5 | # Copyright (C) 1993-1997, 1999-2000, 2002-2023 Free Software |
| 6 | # Foundation, Inc. | 6 | # Foundation, Inc. |
| 7 | # | 7 | # |
| 8 | # This file is part of GNU Emacs. | 8 | # This file is part of GNU Emacs. |
| @@ -27,7 +27,7 @@ | |||
| 27 | #ifndef MSDOS\ | 27 | #ifndef MSDOS\ |
| 28 | #define MSDOS\ | 28 | #define MSDOS\ |
| 29 | #endif | 29 | #endif |
| 30 | /^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2022 Free Software Foundation, Inc."/ | 30 | /^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2023 Free Software Foundation, Inc."/ |
| 31 | /^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'! | 31 | /^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'! |
| 32 | /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ | 32 | /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ |
| 33 | /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ | 33 | /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ |
diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp index c147d62193d..4c38952b11c 100644 --- a/msdos/sed2x.inp +++ b/msdos/sed2x.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Extra configuration script for src/config.h for DesqView/X | 2 | # Extra configuration script for src/config.h for DesqView/X |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 1994, 2001-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 1994, 2001-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index 5b5d321607f..dc9eaff27c8 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration script for lib-src/makefile under DJGPP v2 | 2 | # Configuration script for lib-src/makefile under DJGPP v2 |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 1996, 1998, 2000-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 1996, 1998, 2000-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |
diff --git a/msdos/sed4.inp b/msdos/sed4.inp index f1c6662bf5a..1a579b78773 100644 --- a/msdos/sed4.inp +++ b/msdos/sed4.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration script for src/paths.h | 2 | # Configuration script for src/paths.h |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 1994, 2001-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 1994, 2001-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |
diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp index 57895ed1c36..250ac9b4adb 100644 --- a/msdos/sed5x.inp +++ b/msdos/sed5x.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration script for oldxmenu/makefile for DesqView/X | 2 | # Configuration script for oldxmenu/makefile for DesqView/X |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 1994, 2001-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 1994, 2001-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |
diff --git a/msdos/sed6.inp b/msdos/sed6.inp index 41cd41993b0..ec04b8f0af7 100644 --- a/msdos/sed6.inp +++ b/msdos/sed6.inp | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # doc/lispintro/Makefile, and doc/misc/Makefile under DJGPP v2.x | 3 | # doc/lispintro/Makefile, and doc/misc/Makefile under DJGPP v2.x |
| 4 | # --------------------------------------------------------------------------- | 4 | # --------------------------------------------------------------------------- |
| 5 | # | 5 | # |
| 6 | # Copyright (C) 1997, 2000-2022 Free Software Foundation, Inc. | 6 | # Copyright (C) 1997, 2000-2023 Free Software Foundation, Inc. |
| 7 | # | 7 | # |
| 8 | # This file is part of GNU Emacs. | 8 | # This file is part of GNU Emacs. |
| 9 | # | 9 | # |
diff --git a/msdos/sedadmin.inp b/msdos/sedadmin.inp index 79a18144f3a..a2d652ac8a3 100644 --- a/msdos/sedadmin.inp +++ b/msdos/sedadmin.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration script for admin/unidata/Makefile under DJGPP v2.x | 2 | # Configuration script for admin/unidata/Makefile under DJGPP v2.x |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 2014-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 2014-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |
diff --git a/msdos/sedalloc.inp b/msdos/sedalloc.inp index 0341148608f..716bc6c0e8e 100644 --- a/msdos/sedalloc.inp +++ b/msdos/sedalloc.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration script for SYSTEM_MALLOC/REL_ALLOC in src/config.h | 2 | # Configuration script for SYSTEM_MALLOC/REL_ALLOC in src/config.h |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 2008-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 2008-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |
diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp index 612cfb92359..d759fc40714 100644 --- a/msdos/sedleim.inp +++ b/msdos/sedleim.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration script for leim/Makefile under DJGPP v2.x | 2 | # Configuration script for leim/Makefile under DJGPP v2.x |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 1999-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 1999-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |
diff --git a/msdos/sedlibcf.inp b/msdos/sedlibcf.inp index 741192c973c..931ceb8f044 100644 --- a/msdos/sedlibcf.inp +++ b/msdos/sedlibcf.inp | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | # files whose names are invalid on DOS 8+3 filesystems. | 5 | # files whose names are invalid on DOS 8+3 filesystems. |
| 6 | # ---------------------------------------------------------------------- | 6 | # ---------------------------------------------------------------------- |
| 7 | # | 7 | # |
| 8 | # Copyright (C) 2011-2022 Free Software Foundation, Inc. | 8 | # Copyright (C) 2011-2023 Free Software Foundation, Inc. |
| 9 | # | 9 | # |
| 10 | # This file is part of GNU Emacs. | 10 | # This file is part of GNU Emacs. |
| 11 | # | 11 | # |
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 3af0db6e0a5..497aedb2096 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration script for lib/Makefile under DJGPP v2.x | 2 | # Configuration script for lib/Makefile under DJGPP v2.x |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 2011-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 2011-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |
diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp index 731bf0bb8ee..89d11fb44e3 100644 --- a/msdos/sedlisp.inp +++ b/msdos/sedlisp.inp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration script for lisp/Makefile under DJGPP v2.x | 2 | # Configuration script for lisp/Makefile under DJGPP v2.x |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 2000-2022 Free Software Foundation, Inc. | 5 | # Copyright (C) 2000-2023 Free Software Foundation, Inc. |
| 6 | # | 6 | # |
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | # | 8 | # |