diff options
| author | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
| commit | cf206f28eb11467aed7f5e03f3e4df7724fd98d2 (patch) | |
| tree | 2f5695e6a774a918874b82c286f140abd052d860 /src/lread.c | |
| parent | 5a876cd5f810b611f78dd4cf7a1673bffeea19a9 (diff) | |
| parent | c893016b07f33eb8d56e1011245fe59a67cb4ee0 (diff) | |
| download | emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.tar.gz emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.zip | |
Merge from mainline.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c index db425b82299..ba9d5378104 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1155,7 +1155,7 @@ Return t if the file exists and loads successfully. */) | |||
| 1155 | 1155 | ||
| 1156 | if (!bcmp (SDATA (found) + SBYTES (found) - 4, | 1156 | if (!bcmp (SDATA (found) + SBYTES (found) - 4, |
| 1157 | ".elc", 4) | 1157 | ".elc", 4) |
| 1158 | || (version = safe_to_load_p (fd)) > 0) | 1158 | || (fd >= 0 && (version = safe_to_load_p (fd)) > 0)) |
| 1159 | /* Load .elc files directly, but not when they are | 1159 | /* Load .elc files directly, but not when they are |
| 1160 | remote and have no handler! */ | 1160 | remote and have no handler! */ |
| 1161 | { | 1161 | { |