diff options
| author | Kenichi Handa | 2013-07-20 20:51:53 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-07-20 20:51:53 +0900 |
| commit | 7e67809332c7ac0c798eb13d5573a5804db8134e (patch) | |
| tree | ee8d4702ed94e7179ae30740f6575ca698539d30 /src/lread.c | |
| parent | 0efe47a860bba25617132f02e2220056bfa098b0 (diff) | |
| parent | 6b1b199dc0e3e7f8028fabe87fac446f5a845479 (diff) | |
| download | emacs-7e67809332c7ac0c798eb13d5573a5804db8134e.tar.gz emacs-7e67809332c7ac0c798eb13d5573a5804db8134e.zip | |
merge trunk
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lread.c b/src/lread.c index 146543a99fd..e701338da31 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1044,7 +1044,7 @@ Return t if the file exists and loads successfully. */) | |||
| 1044 | { | 1044 | { |
| 1045 | FILE *stream; | 1045 | FILE *stream; |
| 1046 | int fd; | 1046 | int fd; |
| 1047 | int fd_index; | 1047 | int fd_index = 0; |
| 1048 | ptrdiff_t count = SPECPDL_INDEX (); | 1048 | ptrdiff_t count = SPECPDL_INDEX (); |
| 1049 | struct gcpro gcpro1, gcpro2, gcpro3; | 1049 | struct gcpro gcpro1, gcpro2, gcpro3; |
| 1050 | Lisp_Object found, efound, hist_file_name; | 1050 | Lisp_Object found, efound, hist_file_name; |
| @@ -1175,7 +1175,7 @@ Return t if the file exists and loads successfully. */) | |||
| 1175 | #endif | 1175 | #endif |
| 1176 | } | 1176 | } |
| 1177 | 1177 | ||
| 1178 | if (0 <= fd) | 1178 | if (fd >= 0) |
| 1179 | { | 1179 | { |
| 1180 | fd_index = SPECPDL_INDEX (); | 1180 | fd_index = SPECPDL_INDEX (); |
| 1181 | record_unwind_protect_int (close_file_unwind, fd); | 1181 | record_unwind_protect_int (close_file_unwind, fd); |