(x_create_bitmap_from_file, x_find_image_file): Update call to openp.

4 files changed, 25 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 998bdebb361..75f0ad9a9cd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,25 @@
 
 2002-04-29  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * lread.c (openp): Change arg exec_only to predicate.
+        (build_load_history): Use XCAR/XCDR.
+        (Flocate_file_internal): New fun.
+        (syms_of_lread): Defsubr it.
+        (Fload): Update call to openp.
+
+        * lisp.h (openp): Update prototype.
+
+        * xfns.c (x_create_bitmap_from_file, x_find_image_file):
+        * w32proc.c (sys_spawnve):
+        * w32fns.c (x_create_bitmap_from_file, x_find_image_file):
+        * w32.c (check_windows_init_file):
+        * sound.c (Fplay_sound_internal):
+        * process.c (Fstart_process):
+        * macfns.c (x_create_bitmap_from_file, x_find_image_file):
+        * mac.c (run_mac_command):
+        * emacs.c (init_cmdargs):
+        * callproc.c (Fcall_process): Update call to openp.
+
         * textprop.c (remove_properties): Don't use XCAR without CONSP.
 
         * xterm.c (XTread_socket): Disable the Xutf8LookupString code.
diff --git a/src/macfns.c b/src/macfns.c
index a4235d7c653..159b93971fa 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -539,7 +539,7 @@ x_create_bitmap_from_file (f, file)
     }
 
   /* Search bitmap-file-path for the file, if appropriate.  */
-  fd = openp (Vx_bitmap_file_path, file, "", &found, 0);
+  fd = openp (Vx_bitmap_file_path, file, "", &found, Qnil);
   if (fd < 0)
     return -1;
   /* LoadLibraryEx won't handle special files handled by Emacs handler.  */
@@ -5570,7 +5570,7 @@ x_find_image_file (file)
   GCPRO2 (file_found, search_path);
 
   /* Try to find FILE in data-directory, then x-bitmap-file-path.  */
-  fd = openp (search_path, file, Qnil, &file_found, 0);
+  fd = openp (search_path, file, Qnil, &file_found, Qnil);
   
   if (fd < 0)
     file_found = Qnil;
diff --git a/src/w32fns.c b/src/w32fns.c
index b3194b96055..2345b95bdcc 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -576,7 +576,7 @@ x_create_bitmap_from_file (f, file)
     }
 
   /* Search bitmap-file-path for the file, if appropriate.  */
-  fd = openp (Vx_bitmap_file_path, file, Qnil, &found, 0);
+  fd = openp (Vx_bitmap_file_path, file, Qnil, &found, Qnil);
   if (fd < 0)
     return -1;
   emacs_close (fd);
@@ -9454,7 +9454,7 @@ x_find_image_file (file)
   GCPRO2 (file_found, search_path);
 
   /* Try to find FILE in data-directory, then x-bitmap-file-path.  */
-  fd = openp (search_path, file, Qnil, &file_found, 0);
+  fd = openp (search_path, file, Qnil, &file_found, Qnil);
   
   if (fd == -1)
     file_found = Qnil;
diff --git a/src/xfns.c b/src/xfns.c
index e88421e73b0..7bf02c286a3 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -649,7 +649,7 @@ x_create_bitmap_from_file (f, file)
     }
 
   /* Search bitmap-file-path for the file, if appropriate.  */
-  fd = openp (Vx_bitmap_file_path, file, Qnil, &found, 0);
+  fd = openp (Vx_bitmap_file_path, file, Qnil, &found, Qnil);
   if (fd < 0)
     return -1;
   emacs_close (fd);
@@ -6674,7 +6674,7 @@ x_find_image_file (file)
   GCPRO2 (file_found, search_path);
 
   /* Try to find FILE in data-directory, then x-bitmap-file-path.  */
-  fd = openp (search_path, file, Qnil, &file_found, 0);
+  fd = openp (search_path, file, Qnil, &file_found, Qnil);
   
   if (fd == -1)
     file_found = Qnil;