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 /admin/nt | |
| 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 'admin/nt')
| -rw-r--r-- | admin/nt/README-UNDUMP.W32 | 2 | ||||
| -rw-r--r-- | admin/nt/README-ftp-server | 2 | ||||
| -rwxr-xr-x | admin/nt/dist-build/build-dep-zips.py | 2 | ||||
| -rwxr-xr-x | admin/nt/dist-build/build-zips.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index b6ed8eee7ec..e54e208a9be 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 | |||
| @@ -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 | Emacs for Windows | 4 | Emacs for Windows |
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index e480465b36c..3378820e16b 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server | |||
| @@ -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 | Precompiled Distributions of | 4 | Precompiled Distributions of |
diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py index 6ec8fafaf8b..493a128c099 100755 --- a/admin/nt/dist-build/build-dep-zips.py +++ b/admin/nt/dist-build/build-dep-zips.py | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/usr/bin/python3 | 1 | #!/usr/bin/python3 |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2017 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2017-2018 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/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh index 5822d821a1c..01c237152a9 100755 --- a/admin/nt/dist-build/build-zips.sh +++ b/admin/nt/dist-build/build-zips.sh | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2017 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2017-2018 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## This file is part of GNU Emacs. | 5 | ## This file is part of GNU Emacs. |
| 6 | 6 | ||