diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/s/cygwin.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 63cb7a23da4..c23585bdab7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-04-13 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * s/cygwin.h (PTY_OPEN): Don't try to close a bogus file descriptor. | ||
| 4 | |||
| 1 | 2012-04-13 Reuben Thomas <rrt@sc3d.org> | 5 | 2012-04-13 Reuben Thomas <rrt@sc3d.org> |
| 2 | 6 | ||
| 3 | * indent.c (Fmove_to_column): Change interactive spec (Bug#739). | 7 | * indent.c (Fmove_to_column): Change interactive spec (Bug#739). |
diff --git a/src/s/cygwin.h b/src/s/cygwin.h index 70d64a50c4e..f8c656e8ebc 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h | |||
| @@ -58,7 +58,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 58 | if (-1 == openpty (&fd, &dummy, pty_name, 0, 0)) \ | 58 | if (-1 == openpty (&fd, &dummy, pty_name, 0, 0)) \ |
| 59 | fd = -1; \ | 59 | fd = -1; \ |
| 60 | sigsetmask (mask); \ | 60 | sigsetmask (mask); \ |
| 61 | emacs_close (dummy); \ | 61 | if (fd >= 0) \ |
| 62 | emacs_close (dummy); \ | ||
| 62 | } \ | 63 | } \ |
| 63 | while (0) | 64 | while (0) |
| 64 | 65 | ||