diff options
| author | Joakim Verona | 2013-03-01 00:04:00 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-01 00:04:00 +0100 |
| commit | 1fb561e710e892d96da2681824984d2d4f106487 (patch) | |
| tree | cb82521e46906e064b3688867a3ca5c18349ec14 /src | |
| parent | aa1ff60c7bba6f944522ca2f75f688c1323bdb39 (diff) | |
| parent | 9d232fc451d9abc3e3ee3eead61176067470b24e (diff) | |
| download | emacs-1fb561e710e892d96da2681824984d2d4f106487.tar.gz emacs-1fb561e710e892d96da2681824984d2d4f106487.zip | |
auto upstream
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4135dadf28a..1b8b3c56004 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-02-28 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32.c (sys_open): Don't reset the flags for FD in fd_info[]. | ||
| 4 | (Bug#13546). | ||
| 5 | |||
| 1 | 2013-02-27 Eli Zaretskii <eliz@gnu.org> | 6 | 2013-02-27 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * filelock.c (create_lock_file) [WINDOWSNT]: Use _sopen with | 8 | * filelock.c (create_lock_file) [WINDOWSNT]: Use _sopen with |
| @@ -3411,8 +3411,6 @@ sys_open (const char * path, int oflag, int mode) | |||
| 3411 | res = _open (mpath, (oflag & ~_O_CREAT) | _O_NOINHERIT, mode); | 3411 | res = _open (mpath, (oflag & ~_O_CREAT) | _O_NOINHERIT, mode); |
| 3412 | if (res < 0) | 3412 | if (res < 0) |
| 3413 | res = _open (mpath, oflag | _O_NOINHERIT, mode); | 3413 | res = _open (mpath, oflag | _O_NOINHERIT, mode); |
| 3414 | if (res >= 0 && res < MAXDESC) | ||
| 3415 | fd_info[res].flags = 0; | ||
| 3416 | 3414 | ||
| 3417 | return res; | 3415 | return res; |
| 3418 | } | 3416 | } |