diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-01 01:13:04 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-01 01:13:04 -0800 |
commit | bb267f17f9e1e593d8dee379aceee22d7fa42680 (patch) | |
tree | 466dfb3f8ef7587ebcb652709bd1cc05d18a92f3 /msdos | |
parent | a5835dfee139322de7aa071f1c87ef015acbecad (diff) | |
parent | 63b04c11d530f4a6a41f112d1b3ba1ed1eb81195 (diff) | |
download | emacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.tar.gz |
Merge from origin/emacs-26
63b04c11d5 Fix copyright years by hand
5c7dd8a783 Update copyright year to 2018
220a9ecba1 Merge from Gnulib
312c565566 Don't add empty keyboard macro to macro ring (Bug#24992)
39ca289a7a Allow customization of decoding of "man" command
f8240815ea * etc/NEWS: Add security consideration note on passphrase ...
0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ...
acd289c5a4 Fix problems with indexing in User manual
b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh...
e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846
81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ...
7175496d7a Fix doc string of 'enable-recursive-minibuffers'
5b38406491 Fix documentation of delsel and of killing text
# Conflicts:
# etc/NEWS
# etc/refcards/ru-refcard.tex
Diffstat (limited to 'msdos')
-rw-r--r-- | msdos/ChangeLog.1 | 2 | ||||
-rw-r--r-- | msdos/INSTALL | 2 | ||||
-rw-r--r-- | msdos/README | 4 | ||||
-rw-r--r-- | msdos/autogen/Makefile.in | 6 | ||||
-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/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 |
22 files changed, 26 insertions, 26 deletions
diff --git a/msdos/ChangeLog.1 b/msdos/ChangeLog.1 index 6fe88d119bb..603f507af0d 100644 --- a/msdos/ChangeLog.1 +++ b/msdos/ChangeLog.1 @@ -1550,7 +1550,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1994-1999, 2001-2017 Free Software Foundation, Inc. + Copyright (C) 1994-1999, 2001-2018 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/msdos/INSTALL b/msdos/INSTALL index 41e36545f7e..3b343f14563 100644 --- a/msdos/INSTALL +++ b/msdos/INSTALL @@ -1,6 +1,6 @@ GNU Emacs Installation Guide for the DJGPP (a.k.a. MS-DOS) port -Copyright (C) 1992, 1994, 1996-1997, 2000-2017 Free Software Foundation, +Copyright (C) 1992, 1994, 1996-1997, 2000-2018 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/msdos/README b/msdos/README index 1add1c46e97..d1c2fdab79a 100644 --- a/msdos/README +++ b/msdos/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2017 Free Software Foundation, Inc. +Copyright (C) 2001-2018 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -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-2017 Free Software Foundation, Inc. +# Copyright (C) 1993, 2002-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/autogen/Makefile.in b/msdos/autogen/Makefile.in index 6c3af73cfe2..dae66e82c83 100644 --- a/msdos/autogen/Makefile.in +++ b/msdos/autogen/Makefile.in @@ -1,7 +1,7 @@ # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2009, 2013-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2009, 2013-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 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 @@ -36,7 +36,7 @@ # Generated by gnulib-tool. # 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 -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 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/msdos/autogen/config.in b/msdos/autogen/config.in index 6e219e760ba..3784897fc5f 100644 --- a/msdos/autogen/config.in +++ b/msdos/autogen/config.in @@ -2,7 +2,7 @@ /* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2017 Free Software +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2018 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat index 8910b009eb3..5330f2bd07f 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-2017 Free Software Foundation, Inc.
+rem Copyright (C) 2011-2018 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/msdos/inttypes.h b/msdos/inttypes.h index ce7797a933e..7df4f6f48a8 100644 --- a/msdos/inttypes.h +++ b/msdos/inttypes.h @@ -1,6 +1,6 @@ /* Replacement inttypes.h file for building GNU Emacs on MS-DOS with DJGPP. -Copyright (C) 2011-2017 Free Software Foundation, Inc. +Copyright (C) 2011-2018 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index e8391bcf918..9be2f6e1e33 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 @@ -1,6 +1,6 @@ # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index cc51301cad3..8b68cb7507a 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -2,7 +2,7 @@ # Configuration script for src/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1996-1997, 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index 24d51b8a495..14d0e480a27 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -2,7 +2,7 @@ # Extra configuration script for src/makefile for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994-1997, 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-1997, 1999-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 595b01e4bb2..c57fa4b0416 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -2,7 +2,7 @@ # Configuration script for src/config.h under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1993-1997, 1999-2000, 2002-2017 Free Software +# Copyright (C) 1993-1997, 1999-2000, 2002-2018 Free Software # Foundation, Inc. # # This file is part of GNU Emacs. @@ -27,7 +27,7 @@ #ifndef MSDOS\ #define MSDOS\ #endif -/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2017 Free Software Foundation, Inc."/ +/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2018 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/ diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp index 68aa03fd181..7b0f706eb60 100644 --- a/msdos/sed2x.inp +++ b/msdos/sed2x.inp @@ -2,7 +2,7 @@ # Extra configuration script for src/config.h for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index 174c63aacbe..8311d08789e 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -2,7 +2,7 @@ # Configuration script for lib-src/makefile under DJGPP v2 # ---------------------------------------------------------------------- # -# Copyright (C) 1996, 1998, 2000-2017 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed4.inp b/msdos/sed4.inp index 94fccf7785c..8e96168a5d0 100644 --- a/msdos/sed4.inp +++ b/msdos/sed4.inp @@ -2,7 +2,7 @@ # Configuration script for src/paths.h # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp index ea9f4a89d5a..5d990062168 100644 --- a/msdos/sed5x.inp +++ b/msdos/sed5x.inp @@ -2,7 +2,7 @@ # Configuration script for oldxmenu/makefile for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed6.inp b/msdos/sed6.inp index 8a54ad7e448..1dbb2df2420 100644 --- a/msdos/sed6.inp +++ b/msdos/sed6.inp @@ -3,7 +3,7 @@ # doc/lispintro/Makefile, and doc/misc/Makefile under DJGPP v2.x # --------------------------------------------------------------------------- # -# Copyright (C) 1997, 2000-2017 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedadmin.inp b/msdos/sedadmin.inp index e8da83b8a53..111b5e217a0 100644 --- a/msdos/sedadmin.inp +++ b/msdos/sedadmin.inp @@ -2,7 +2,7 @@ # Configuration script for admin/unidata/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 2014-2017 Free Software Foundation, Inc. +# Copyright (C) 2014-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedalloc.inp b/msdos/sedalloc.inp index 5447d68eaa9..cdd1d56b402 100644 --- a/msdos/sedalloc.inp +++ b/msdos/sedalloc.inp @@ -2,7 +2,7 @@ # Configuration script for SYSTEM_MALLOC/REL_ALLOC in src/config.h # ---------------------------------------------------------------------- # -# Copyright (C) 2008-2017 Free Software Foundation, Inc. +# Copyright (C) 2008-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp index 74202b328cf..84354326035 100644 --- a/msdos/sedleim.inp +++ b/msdos/sedleim.inp @@ -2,7 +2,7 @@ # Configuration script for leim/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedlibcf.inp b/msdos/sedlibcf.inp index 843c6743366..c7431597d17 100644 --- a/msdos/sedlibcf.inp +++ b/msdos/sedlibcf.inp @@ -5,7 +5,7 @@ # files whose names are invalid on DOS 8+3 filesystems. # ---------------------------------------------------------------------- # -# Copyright (C) 2011-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 27072e25a6c..9b66a4c3652 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -2,7 +2,7 @@ # Configuration script for lib/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 2011-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp index 15f17ce3ee2..0fcef036151 100644 --- a/msdos/sedlisp.inp +++ b/msdos/sedlisp.inp @@ -2,7 +2,7 @@ # Configuration script for lisp/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 2000-2017 Free Software Foundation, Inc. +# Copyright (C) 2000-2018 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # |