Mercurial > emacs
comparison src/w32fns.c @ 39812:66e0816837a8
Update calls to openp.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 12 Oct 2001 03:37:43 +0000 |
| parents | 6192be048459 |
| children | 579177964efa |
comparison
equal
deleted
inserted
replaced
| 39811:9f7e72fba3d2 | 39812:66e0816837a8 |
|---|---|
| 549 return id + 1; | 549 return id + 1; |
| 550 } | 550 } |
| 551 } | 551 } |
| 552 | 552 |
| 553 /* Search bitmap-file-path for the file, if appropriate. */ | 553 /* Search bitmap-file-path for the file, if appropriate. */ |
| 554 fd = openp (Vx_bitmap_file_path, file, "", &found, 0); | 554 fd = openp (Vx_bitmap_file_path, file, Qnil, &found, 0); |
| 555 if (fd < 0) | 555 if (fd < 0) |
| 556 return -1; | 556 return -1; |
| 557 emacs_close (fd); | 557 emacs_close (fd); |
| 558 | 558 |
| 559 filename = (char *) XSTRING (found)->data; | 559 filename = (char *) XSTRING (found)->data; |
| 8652 file_found = Qnil; | 8652 file_found = Qnil; |
| 8653 search_path = Fcons (Vdata_directory, Vx_bitmap_file_path); | 8653 search_path = Fcons (Vdata_directory, Vx_bitmap_file_path); |
| 8654 GCPRO2 (file_found, search_path); | 8654 GCPRO2 (file_found, search_path); |
| 8655 | 8655 |
| 8656 /* Try to find FILE in data-directory, then x-bitmap-file-path. */ | 8656 /* Try to find FILE in data-directory, then x-bitmap-file-path. */ |
| 8657 fd = openp (search_path, file, "", &file_found, 0); | 8657 fd = openp (search_path, file, Qnil, &file_found, 0); |
| 8658 | 8658 |
| 8659 if (fd == -1) | 8659 if (fd == -1) |
| 8660 file_found = Qnil; | 8660 file_found = Qnil; |
| 8661 else | 8661 else |
| 8662 close (fd); | 8662 close (fd); |