aboutsummaryrefslogtreecommitdiffstats
path: root/msdos
diff options
context:
space:
mode:
authorPaul Eggert2020-01-01 01:08:16 +0000
committerPaul Eggert2020-01-01 01:08:16 +0000
commitc6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch)
treeab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /msdos
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 'msdos')
-rw-r--r--msdos/ChangeLog.12
-rw-r--r--msdos/INSTALL2
-rw-r--r--msdos/README4
-rw-r--r--msdos/autogen/Makefile.in6
-rw-r--r--msdos/autogen/config.in2
-rw-r--r--msdos/depfiles.bat2
-rw-r--r--msdos/inttypes.h2
-rw-r--r--msdos/mainmake.v22
-rw-r--r--msdos/sed1v2.inp2
-rw-r--r--msdos/sed1x.inp2
-rw-r--r--msdos/sed2v2.inp4
-rw-r--r--msdos/sed2x.inp2
-rw-r--r--msdos/sed3v2.inp2
-rw-r--r--msdos/sed4.inp2
-rw-r--r--msdos/sed5x.inp2
-rw-r--r--msdos/sed6.inp2
-rw-r--r--msdos/sedadmin.inp2
-rw-r--r--msdos/sedalloc.inp2
-rw-r--r--msdos/sedleim.inp2
-rw-r--r--msdos/sedlibcf.inp2
-rw-r--r--msdos/sedlibmk.inp2
-rw-r--r--msdos/sedlisp.inp2
22 files changed, 26 insertions, 26 deletions
diff --git a/msdos/ChangeLog.1 b/msdos/ChangeLog.1
index fa3477f84ad..210cecd2173 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-2019 Free Software Foundation, Inc. 1553 Copyright (C) 1994-1999, 2001-2020 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 daae992dc82..a67c4d59754 100644
--- a/msdos/INSTALL
+++ b/msdos/INSTALL
@@ -1,6 +1,6 @@
1GNU Emacs Installation Guide for the DJGPP (a.k.a. MS-DOS) port 1GNU Emacs Installation Guide for the DJGPP (a.k.a. MS-DOS) port
2 2
3Copyright (C) 1992, 1994, 1996-1997, 2000-2019 Free Software Foundation, 3Copyright (C) 1992, 1994, 1996-1997, 2000-2020 Free Software Foundation,
4Inc. 4Inc.
5See the end of the file for license conditions. 5See the end of the file for license conditions.
6 6
diff --git a/msdos/README b/msdos/README
index 75ae2c0634f..d1073741c67 100644
--- a/msdos/README
+++ b/msdos/README
@@ -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 4
@@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on
10Windows 3.X. Since these are binary files, their copyright notice is 10Windows 3.X. Since these are binary files, their copyright notice is
11reproduced here: 11reproduced here:
12 12
13# Copyright (C) 1993, 2002-2019 Free Software Foundation, Inc. 13# Copyright (C) 1993, 2002-2020 Free Software Foundation, Inc.
14# 14#
15# This file is part of GNU Emacs. 15# This file is part of GNU Emacs.
16# 16#
diff --git a/msdos/autogen/Makefile.in b/msdos/autogen/Makefile.in
index 5d6ff70c734..be1a84faa66 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-2019 Free Software Foundation, Inc. 4# Copyright (C) 1994-2009, 2013-2020 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.
@@ -13,7 +13,7 @@
13 13
14@SET_MAKE@ 14@SET_MAKE@
15 15
16# Copyright (C) 2002-2019 Free Software Foundation, Inc. 16# Copyright (C) 2002-2020 Free Software Foundation, Inc.
17# 17#
18# This file is free software; you can redistribute it and/or modify 18# This file is free software; you can redistribute it and/or modify
19# it under the terms of the GNU General Public License as published by 19# it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
36# Generated by gnulib-tool. 36# Generated by gnulib-tool.
37# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings 37# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings
38 38
39# Copyright (C) 2002-2019 Free Software Foundation, Inc. 39# Copyright (C) 2002-2020 Free Software Foundation, Inc.
40# 40#
41# This file is free software; you can redistribute it and/or modify 41# This file is free software; you can redistribute it and/or modify
42# it under the terms of the GNU General Public License as published by 42# it under the terms of the GNU General Public License as published by
diff --git a/msdos/autogen/config.in b/msdos/autogen/config.in
index 6a18ff96f87..6101abd1fa6 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
5Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2019 Free Software 5Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2020 Free Software
6Foundation, Inc. 6Foundation, Inc.
7 7
8This file is part of GNU Emacs. 8This file is part of GNU Emacs.
diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat
index e99c967e1e4..f3c4b33d186 100644
--- a/msdos/depfiles.bat
+++ b/msdos/depfiles.bat
@@ -1,7 +1,7 @@
1@echo off 1@echo off
2rem ---------------------------------------------------------------------- 2rem ----------------------------------------------------------------------
3rem Auxiliary script for MSDOS, run by ../config.bat 3rem Auxiliary script for MSDOS, run by ../config.bat
4rem Copyright (C) 2011-2019 Free Software Foundation, Inc. 4rem Copyright (C) 2011-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/msdos/inttypes.h b/msdos/inttypes.h
index 5c073fcf6fd..88ffae70a85 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
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/msdos/mainmake.v2 b/msdos/mainmake.v2
index 08086d67d82..57c44795437 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-2019 Free Software Foundation, Inc. 3# Copyright (C) 1996-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/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 9edd4d4b949..8e181224357 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 1996-1997, 1999-2020 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 23aa28e1d4a..8d10375c90d 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 1994-1997, 1999-2020 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 f69b8bc8db3..e79dc4600c1 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-2019 Free Software 5# Copyright (C) 1993-1997, 1999-2000, 2002-2020 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) 2019 Free Software Foundation, Inc."/ 30/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2020 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 695c0b20723..054cd91cd6c 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 1994, 2001-2020 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 952481f9a1a..37ad23ab755 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 1996, 1998, 2000-2020 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 520df665036..6997a574966 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 1994, 2001-2020 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 bb8fe9be8d1..3f593f1aa19 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 1994, 2001-2020 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 c1b5b16b19c..cb2a30391bd 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-2019 Free Software Foundation, Inc. 6# Copyright (C) 1997, 2000-2020 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 bd63fe562c0..ac9f38fce54 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 2014-2020 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 67211964bb9..e2d6a56ee5d 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 2008-2020 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 9384ecaa5da..c4e6e7501b6 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 1999-2020 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 5785a612ae9..a071e163783 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-2019 Free Software Foundation, Inc. 8# Copyright (C) 2011-2020 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 df9e8d31081..519d5baeb8c 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 2011-2020 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 dc1774061e8..d62c0f9211e 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-2019 Free Software Foundation, Inc. 5# Copyright (C) 2000-2020 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-12 23:03:47 +0000