diff options
author | Stefan Kangas <stefan@marxist.se> | 2022-01-02 06:31:44 +0100 |
---|---|---|
committer | Stefan Kangas <stefan@marxist.se> | 2022-01-02 06:31:44 +0100 |
commit | ad125a99273c7bd81d02d388af3c69125dfe27ee (patch) | |
tree | bc693786881845334f6d3652d0ba613628e453b1 /msdos | |
parent | 96212e1a270d9ba665bf33aec8a404979afb896b (diff) | |
parent | efb1c7ec379430f560c5b801969ae43023c52734 (diff) | |
download | emacs-ad125a99273c7bd81d02d388af3c69125dfe27ee.tar.gz |
Merge from origin/emacs-28
efb1c7ec37 ; * admin/notes/years: More known problems.
f475c5823a ; Copyright year fixes
2684def348 ; Run set-copyright from admin.el
2558b37b5e ; * admin/notes/years: Mention known problems with 'update...
Diffstat (limited to 'msdos')
-rw-r--r-- | msdos/README | 2 | ||||
-rw-r--r-- | msdos/depfiles.bat | 2 | ||||
-rw-r--r-- | msdos/sed2v2.inp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/msdos/README b/msdos/README index 90a0c58ee6f..cdda15f00dd 100644 --- a/msdos/README +++ b/msdos/README @@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on Windows 3.X. Since these are binary files, their copyright notice is reproduced here: -# Copyright (C) 1993, 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 1993, 2002-2022 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat index 131f2fc04d4..8c36fbcdef1 100644 --- a/msdos/depfiles.bat +++ b/msdos/depfiles.bat @@ -1,7 +1,7 @@ @echo off
rem ----------------------------------------------------------------------
rem Auxiliary script for MSDOS, run by ../config.bat
-rem Copyright (C) 2011-2021 Free Software Foundation, Inc.
+rem Copyright (C) 2011-2022 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 6839563867c..8728c8dac48 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -27,7 +27,7 @@ #ifndef MSDOS\ #define MSDOS\ #endif -/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2021 Free Software Foundation, Inc."/ +/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2022 Free Software Foundation, Inc."/ /^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'! /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ |