diff options
| author | Paul Eggert | 2018-01-01 01:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-01-01 01:13:04 -0800 |
| commit | bb267f17f9e1e593d8dee379aceee22d7fa42680 (patch) | |
| tree | 466dfb3f8ef7587ebcb652709bd1cc05d18a92f3 /msdos/README | |
| parent | a5835dfee139322de7aa071f1c87ef015acbecad (diff) | |
| parent | 63b04c11d530f4a6a41f112d1b3ba1ed1eb81195 (diff) | |
| download | emacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.tar.gz emacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.zip | |
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/README')
| -rw-r--r-- | msdos/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/msdos/README b/msdos/README index 1add1c46e97..d1c2fdab79a 100644 --- a/msdos/README +++ b/msdos/README | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2001-2017 Free Software Foundation, Inc. | 1 | Copyright (C) 2001-2018 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 | ||
| @@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on | |||
| 10 | Windows 3.X. Since these are binary files, their copyright notice is | 10 | Windows 3.X. Since these are binary files, their copyright notice is |
| 11 | reproduced here: | 11 | reproduced here: |
| 12 | 12 | ||
| 13 | # Copyright (C) 1993, 2002-2017 Free Software Foundation, Inc. | 13 | # Copyright (C) 1993, 2002-2018 Free Software Foundation, Inc. |
| 14 | # | 14 | # |
| 15 | # This file is part of GNU Emacs. | 15 | # This file is part of GNU Emacs. |
| 16 | # | 16 | # |