diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /src/dired.c | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dired.c b/src/dired.c index 7bbfee7e5b0..b3348b0aff0 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -95,7 +95,7 @@ open_directory (char const *name, int *fdp) | |||
| 95 | d = fdopendir (fd); | 95 | d = fdopendir (fd); |
| 96 | opendir_errno = errno; | 96 | opendir_errno = errno; |
| 97 | if (! d) | 97 | if (! d) |
| 98 | close (fd); | 98 | emacs_close (fd); |
| 99 | } | 99 | } |
| 100 | #endif | 100 | #endif |
| 101 | 101 | ||