diff options
| author | Miles Bader <miles@gnu.org> | 2000-11-13 12:24:15 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2000-11-13 12:24:15 +0000 |
| commit | 939d6465fc54ccd74381dae6bba1dd416928e8b8 (patch) | |
| tree | 7fae9e0660113787fa9352b0c3568ebb48fce711 | |
| parent | 96dc0f4e12535b038c0f87838a03029a3ebb20fa (diff) | |
| download | emacs-939d6465fc54ccd74381dae6bba1dd416928e8b8.tar.gz | |
(x_create_bitmap_from_file, x_find_image_file): Use new openp return protocol.
| -rw-r--r-- | src/w32fns.c | 5 | ||||
| -rw-r--r-- | src/xfns.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index a0bd2b67451..4ff6065ef60 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -584,9 +584,6 @@ x_create_bitmap_from_file (f, file) fd = openp (Vx_bitmap_file_path, file, "", &found, 0); if (fd < 0) return -1; - /* LoadLibraryEx won't handle special files handled by Emacs handler. */ - if (fd == 0) - return -1; emacs_close (fd); filename = (char *) XSTRING (found)->data; @@ -8377,7 +8374,7 @@ x_find_image_file (file) /* Try to find FILE in data-directory, then x-bitmap-file-path. */ fd = openp (search_path, file, "", &file_found, 0); - if (fd < 0) + if (fd == -1) file_found = Qnil; else close (fd); diff --git a/src/xfns.c b/src/xfns.c index 2b5ff4cc9fa..1a45b20c984 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -663,9 +663,6 @@ x_create_bitmap_from_file (f, file) fd = openp (Vx_bitmap_file_path, file, "", &found, 0); if (fd < 0) return -1; - /* XReadBitmapFile won't handle magic file names. */ - if (fd == 0) - return -1; emacs_close (fd); filename = (char *) XSTRING (found)->data; @@ -6110,7 +6107,7 @@ x_find_image_file (file) /* Try to find FILE in data-directory, then x-bitmap-file-path. */ fd = openp (search_path, file, "", &file_found, 0); - if (fd < 0) + if (fd == -1) file_found = Qnil; else close (fd); |