diff options
| author | Miles Bader <miles@gnu.org> | 2007-05-30 14:40:46 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-05-30 14:40:46 +0000 |
| commit | 62390cbfc25653003034b812258be9cfb5f3edee (patch) | |
| tree | 7ee220bf44a2e65dd80511bced7b77cfa1233b12 /src/sysdep.c | |
| parent | 2d423dd0a720b08c61ee10023554b2a0491f8fae (diff) | |
| parent | 7a781a5480b9a1f55d28a76e1d1f89aaa2421f97 (diff) | |
| download | emacs-62390cbfc25653003034b812258be9cfb5f3edee.tar.gz emacs-62390cbfc25653003034b812258be9cfb5f3edee.tar.bz2 emacs-62390cbfc25653003034b812258be9cfb5f3edee.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 774-780)
- Update from CVS
- Merge from emacs--rel--22, gnus--rel--5.10
- Merge from emacs--rel--22
- Fix tq.el edge case
* emacs--rel--22 (patch 28-32)
- Update from CVS
* gnus--rel--5.10 (patch 224-225)
- Merge from emacs--devo--0, emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-213
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index 202cab4abd2..95ad90c2a1b 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -1679,7 +1679,7 @@ init_sys_modes () if (term_gpm) { fcntl (gpm_fd, F_SETOWN, getpid ()); - fcntl (gpm_fd, F_SETFL, O_NONBLOCK); + fcntl (gpm_fd, F_SETFL, fcntl (gpm_fd, F_GETFL, 0) | O_NONBLOCK); init_sigio (gpm_fd); } #endif /* HAVE_GPM */ |