diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-01-16 07:50:22 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-01-16 07:50:22 -0800 |
| commit | 215d9fcb79b6ec3c241f58fdff02bf15fb952d0c (patch) | |
| tree | 00b960d85395a10dd1831fef0fe73cb515dbbf11 /nt | |
| parent | 0f4fa004ebbcf8796abab26988e79b01ba4f2ab5 (diff) | |
| parent | 52080b5778cbe535c331fa14539aecd88f2be0a0 (diff) | |
| download | emacs-215d9fcb79b6ec3c241f58fdff02bf15fb952d0c.tar.gz | |
Merge from origin/emacs-27
52080b5778 (origin/emacs-27) * lisp/minibuffer.el (read-file-name-def...
e4cec1fd10 ; * etc/NEWS: Fix some file name quotations.
13995f31a2 Make emacs prefer an existing ~/.emacs.d to an existing XD...
91cac24952 ; etc/NEWS minor edits
5505babc07 Describe --with-cairo non-support for bitmapped fonts.
caf00066ee Mention GTK font chooser changes in NEWS
23b87db628 ; Unmaintain fortran elisp
3b0d1a50aa f90: handle F2008 module function
55803cc189 Move shell-related menu items to "Shell Commands" submenu ...
2be48605c0 * admin/notes/font-backend: Remove outdated file. (Bug#34663)
f07a470124 Declare the ftx font backend driver obsolete
6c08a430fb ; Fix wording of a comment.
# Conflicts:
# admin/notes/font-backend
# etc/NEWS
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/inc/ms-w32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index 3b1d3ff0393..1cce2c3062f 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -63,8 +63,8 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ Look in <sys/time.h> for a timeval structure. */ #define HAVE_TIMEVAL 1 -/* And the select implementation does 1-byte read-ahead waiting - for received packets, so datagrams are broken too. */ +/* Our select emulation does 1-byte read-ahead waiting for received + packets, so datagrams are broken. */ #define BROKEN_DATAGRAM_SOCKETS 1 #define MAIL_USE_SYSTEM_LOCK 1 |