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 /nt/inc/sys | |
| 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 'nt/inc/sys')
| -rw-r--r-- | nt/inc/sys/resource.h | 2 | ||||
| -rw-r--r-- | nt/inc/sys/socket.h | 2 | ||||
| -rw-r--r-- | nt/inc/sys/stat.h | 2 | ||||
| -rw-r--r-- | nt/inc/sys/wait.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nt/inc/sys/resource.h b/nt/inc/sys/resource.h index de10aaee06e..5c4f792f2b7 100644 --- a/nt/inc/sys/resource.h +++ b/nt/inc/sys/resource.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* A limited emulation of sys/resource.h. | 1 | /* A limited emulation of sys/resource.h. |
| 2 | 2 | ||
| 3 | Copyright (C) 2016-2017 Free Software Foundation, Inc. | 3 | Copyright (C) 2016-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/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index b7c1103f21a..2582cbdaef1 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright (C) 1995, 2001-2017 Free Software Foundation, Inc. | 1 | /* Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc. |
| 2 | 2 | ||
| 3 | This file is part of GNU Emacs. | 3 | This file is part of GNU Emacs. |
| 4 | 4 | ||
diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h index 2f1cf468736..0b1f9bcec6a 100644 --- a/nt/inc/sys/stat.h +++ b/nt/inc/sys/stat.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* sys/stat.h supplied with MSVCRT uses too narrow data types for | 1 | /* sys/stat.h supplied with MSVCRT uses too narrow data types for |
| 2 | inode and user/group id, so we replace them with our own. | 2 | inode and user/group id, so we replace them with our own. |
| 3 | 3 | ||
| 4 | Copyright (C) 2008-2017 Free Software Foundation, Inc. | 4 | Copyright (C) 2008-2018 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 7 | 7 | ||
diff --git a/nt/inc/sys/wait.h b/nt/inc/sys/wait.h index 51eae821b54..9c86eb8bbee 100644 --- a/nt/inc/sys/wait.h +++ b/nt/inc/sys/wait.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* A limited emulation of sys/wait.h on Posix systems. | 1 | /* A limited emulation of sys/wait.h on Posix systems. |
| 2 | 2 | ||
| 3 | Copyright (C) 2012-2017 Free Software Foundation, Inc. | 3 | Copyright (C) 2012-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 | ||