Mercurial > emacs
comparison src/w32fns.c @ 45009:7a00556be3ce
(x_create_bitmap_from_file, x_find_image_file): Update call to openp.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 30 Apr 2002 01:02:42 +0000 |
parents | 2b19f2634b3c |
children | 4413ac739ab9 |
comparison
equal
deleted
inserted
replaced
45008:07245ba4ebcc | 45009:7a00556be3ce |
---|---|
574 return id + 1; | 574 return id + 1; |
575 } | 575 } |
576 } | 576 } |
577 | 577 |
578 /* Search bitmap-file-path for the file, if appropriate. */ | 578 /* Search bitmap-file-path for the file, if appropriate. */ |
579 fd = openp (Vx_bitmap_file_path, file, Qnil, &found, 0); | 579 fd = openp (Vx_bitmap_file_path, file, Qnil, &found, Qnil); |
580 if (fd < 0) | 580 if (fd < 0) |
581 return -1; | 581 return -1; |
582 emacs_close (fd); | 582 emacs_close (fd); |
583 | 583 |
584 filename = (char *) XSTRING (found)->data; | 584 filename = (char *) XSTRING (found)->data; |
9452 file_found = Qnil; | 9452 file_found = Qnil; |
9453 search_path = Fcons (Vdata_directory, Vx_bitmap_file_path); | 9453 search_path = Fcons (Vdata_directory, Vx_bitmap_file_path); |
9454 GCPRO2 (file_found, search_path); | 9454 GCPRO2 (file_found, search_path); |
9455 | 9455 |
9456 /* Try to find FILE in data-directory, then x-bitmap-file-path. */ | 9456 /* Try to find FILE in data-directory, then x-bitmap-file-path. */ |
9457 fd = openp (search_path, file, Qnil, &file_found, 0); | 9457 fd = openp (search_path, file, Qnil, &file_found, Qnil); |
9458 | 9458 |
9459 if (fd == -1) | 9459 if (fd == -1) |
9460 file_found = Qnil; | 9460 file_found = Qnil; |
9461 else | 9461 else |
9462 close (fd); | 9462 close (fd); |