diff options
| author | Jason Rumney | 2003-05-07 22:14:01 +0000 |
|---|---|---|
| committer | Jason Rumney | 2003-05-07 22:14:01 +0000 |
| commit | 5adcec2317814d032a24566cb8680d0622370630 (patch) | |
| tree | 744a193f4abe5ec790d28133e60c15acfc379955 /src | |
| parent | 81404d64b33a66f8b0b7d7dbace2e4908146d731 (diff) | |
| download | emacs-5adcec2317814d032a24566cb8680d0622370630.tar.gz emacs-5adcec2317814d032a24566cb8680d0622370630.zip | |
(Ffile_symlink_p): Let handlers handle symlinks even
when system does not support them.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fileio.c | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f1869a7334a..a7add6733e3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2003-05-07 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * fileio.c (Ffile_symlink_p): Let handlers handle symlinks even | ||
| 4 | when system does not support them. | ||
| 5 | |||
| 1 | 2003-05-05 Stefan Monnier <monnier@cs.yale.edu> | 6 | 2003-05-05 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 7 | ||
| 3 | * fileio.c (Qwrite_region_annotate_functions): New var. | 8 | * fileio.c (Qwrite_region_annotate_functions): New var. |
diff --git a/src/fileio.c b/src/fileio.c index 71036912bbc..cfaf5738a5e 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3192,11 +3192,6 @@ Otherwise returns nil. */) | |||
| 3192 | (filename) | 3192 | (filename) |
| 3193 | Lisp_Object filename; | 3193 | Lisp_Object filename; |
| 3194 | { | 3194 | { |
| 3195 | #ifdef S_IFLNK | ||
| 3196 | char *buf; | ||
| 3197 | int bufsize; | ||
| 3198 | int valsize; | ||
| 3199 | Lisp_Object val; | ||
| 3200 | Lisp_Object handler; | 3195 | Lisp_Object handler; |
| 3201 | 3196 | ||
| 3202 | CHECK_STRING (filename); | 3197 | CHECK_STRING (filename); |
| @@ -3208,6 +3203,13 @@ Otherwise returns nil. */) | |||
| 3208 | if (!NILP (handler)) | 3203 | if (!NILP (handler)) |
| 3209 | return call2 (handler, Qfile_symlink_p, filename); | 3204 | return call2 (handler, Qfile_symlink_p, filename); |
| 3210 | 3205 | ||
| 3206 | #ifdef S_IFLNK | ||
| 3207 | { | ||
| 3208 | char *buf; | ||
| 3209 | int bufsize; | ||
| 3210 | int valsize; | ||
| 3211 | Lisp_Object val; | ||
| 3212 | |||
| 3211 | filename = ENCODE_FILE (filename); | 3213 | filename = ENCODE_FILE (filename); |
| 3212 | 3214 | ||
| 3213 | bufsize = 50; | 3215 | bufsize = 50; |
| @@ -3242,6 +3244,7 @@ Otherwise returns nil. */) | |||
| 3242 | xfree (buf); | 3244 | xfree (buf); |
| 3243 | val = DECODE_FILE (val); | 3245 | val = DECODE_FILE (val); |
| 3244 | return val; | 3246 | return val; |
| 3247 | } | ||
| 3245 | #else /* not S_IFLNK */ | 3248 | #else /* not S_IFLNK */ |
| 3246 | return Qnil; | 3249 | return Qnil; |
| 3247 | #endif /* not S_IFLNK */ | 3250 | #endif /* not S_IFLNK */ |