Mercurial > emacs
comparison src/image.c @ 90381:65ca8fb66a0d
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-54
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 190-203)
- Update from CVS
- Undo incorrect merge of etc/images/README from Gnus 5.10
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 74-80)
- Update from CVS
- Update from CVS: README: Addition from 5.10.6 tar ball.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 09 Apr 2006 00:38:22 +0000 |
parents | e3bacb89536a fd6d18b61fa7 |
children | c156f6a9e7b5 |
comparison
equal
deleted
inserted
replaced
90380:4bf7966e0788 | 90381:65ca8fb66a0d |
---|---|
37 #include "window.h" | 37 #include "window.h" |
38 #include "dispextern.h" | 38 #include "dispextern.h" |
39 #include "blockinput.h" | 39 #include "blockinput.h" |
40 #include "systime.h" | 40 #include "systime.h" |
41 #include <epaths.h> | 41 #include <epaths.h> |
42 #include "charset.h" | |
43 #include "coding.h" | |
42 | 44 |
43 | 45 |
44 #ifdef HAVE_X_WINDOWS | 46 #ifdef HAVE_X_WINDOWS |
45 #include "xterm.h" | 47 #include "xterm.h" |
46 #include <sys/types.h> | 48 #include <sys/types.h> |
2244 | 2246 |
2245 static unsigned char *slurp_file P_ ((char *, int *)); | 2247 static unsigned char *slurp_file P_ ((char *, int *)); |
2246 | 2248 |
2247 | 2249 |
2248 /* Find image file FILE. Look in data-directory, then | 2250 /* Find image file FILE. Look in data-directory, then |
2249 x-bitmap-file-path. Value is the full name of the file found, or | 2251 x-bitmap-file-path. Value is the encoded full name of the file |
2250 nil if not found. */ | 2252 found, or nil if not found. */ |
2251 | 2253 |
2252 Lisp_Object | 2254 Lisp_Object |
2253 x_find_image_file (file) | 2255 x_find_image_file (file) |
2254 Lisp_Object file; | 2256 Lisp_Object file; |
2255 { | 2257 { |
2265 fd = openp (search_path, file, Qnil, &file_found, Qnil); | 2267 fd = openp (search_path, file, Qnil, &file_found, Qnil); |
2266 | 2268 |
2267 if (fd == -1) | 2269 if (fd == -1) |
2268 file_found = Qnil; | 2270 file_found = Qnil; |
2269 else | 2271 else |
2270 close (fd); | 2272 { |
2273 file_found = ENCODE_FILE (file_found); | |
2274 close (fd); | |
2275 } | |
2271 | 2276 |
2272 UNGCPRO; | 2277 UNGCPRO; |
2273 return file_found; | 2278 return file_found; |
2274 } | 2279 } |
2275 | 2280 |