changeset 39812:66e0816837a8

Update calls to openp.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 12 Oct 2001 03:37:43 +0000
parents 9f7e72fba3d2
children 638b60fd98d0
files mac/ChangeLog mac/src/mac.c mac/src/macfns.c src/ChangeLog src/emacs.c src/process.c src/sound.c src/w32.c src/w32fns.c src/w32proc.c src/xfns.c
diffstat 11 files changed, 43 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/mac/ChangeLog	Fri Oct 12 03:23:25 2001 +0000
+++ b/mac/ChangeLog	Fri Oct 12 03:37:43 2001 +0000
@@ -1,3 +1,8 @@
+2001-10-11  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* src/macfns.c (x_create_bitmap_from_file, x_find_image_file):
+	* src/mac.c (run_mac_command): Update calls to openp.
+
 2001-10-08  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* src/macmenu.c (Fx_popup_menu): Use Fkeymap_prompt.
@@ -8,7 +13,7 @@
 2001-10-05  Gerd Moellmann  <gerd@gnu.org>
 
 	* Branch for 21.1.
-	
+
 2001-09-04  Andrew Choi  <akochoi@cse.cuhk.edu.hk>
 
 	* src/macmenu.c (mac_menu_show): Use refcon of selected menu item.
--- a/mac/src/mac.c	Fri Oct 12 03:23:25 2001 +0000
+++ b/mac/src/mac.c	Fri Oct 12 03:37:43 2001 +0000
@@ -2010,7 +2010,7 @@
 	  strcat (t, newargv[0]);
 #endif
 	  Lisp_Object path;
-	  openp (Vexec_path, build_string (newargv[0]), EXEC_SUFFIXES, &path,
+	  openp (Vexec_path, build_string (newargv[0]), Vexec_suffixes, &path,
 		 1);
 
 	  if (NILP (path))
--- a/mac/src/macfns.c	Fri Oct 12 03:23:25 2001 +0000
+++ b/mac/src/macfns.c	Fri Oct 12 03:37:43 2001 +0000
@@ -513,7 +513,7 @@
     }
 
   /* 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, Qnil, &found, 0);
   if (fd < 0)
     return -1;
   /* LoadLibraryEx won't handle special files handled by Emacs handler.  */
@@ -5367,7 +5367,7 @@
   GCPRO2 (file_found, search_path);
 
   /* Try to find FILE in data-directory, then x-bitmap-file-path.  */
-  fd = openp (search_path, file, "", &file_found, 0);
+  fd = openp (search_path, file, Qnil, &file_found, 0);
   
   if (fd < 0)
     file_found = Qnil;
--- a/src/ChangeLog	Fri Oct 12 03:23:25 2001 +0000
+++ b/src/ChangeLog	Fri Oct 12 03:37:43 2001 +0000
@@ -1,8 +1,29 @@
 2001-10-11  Stefan Monnier  <monnier@cs.yale.edu>
 
+	* 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):
+	* process.c (Fstart_process): Update calls to openp.
+
+	* callproc.c (Vexec_suffixes): New var.
+	(Fcall_process): Update call to openp.
+	(decode_suffixes): New function.
+	(syms_of_callproc): Init exec-suffixes.
+
+	* lread.c (Vload_suffixes, default_suffixes): New vars.
+	(openp): Take a lisp list of suffixes.
+	Check for file-name-handlers even if the file was absolute already.
+	(syms_of_lread): Declare load-suffixes.
+	(Fload): Fix up call to openp.
+	Don't bother checking for file-name-handler at the very beginning.
+
 	* keymap.h (Fcopy_keymap): Don't export.
 
 	* lisp.h (empty_string): Declare.
+	(Vload_suffixes, Vexec_suffixes): Declare.
+	(openp): Update prototype.
 
 	* emacs.c (empty_string): New var.
 	(syms_of_emacs): Initialize it.
--- a/src/emacs.c	Fri Oct 12 03:23:25 2001 +0000
+++ b/src/emacs.c	Fri Oct 12 03:37:43 2001 +0000
@@ -438,7 +438,7 @@
     {
       Lisp_Object found;
       int yes = openp (Vexec_path, Vinvocation_name,
-		       EXEC_SUFFIXES, &found, 1);
+		       Vexec_suffixes, &found, 1);
       if (yes == 1)
 	{
 	  /* Add /: to the front of the name
--- a/src/process.c	Fri Oct 12 03:23:25 2001 +0000
+++ b/src/process.c	Fri Oct 12 03:37:43 2001 +0000
@@ -1196,7 +1196,7 @@
 
       tem = Qnil;
       GCPRO4 (name, program, buffer, current_dir);
-      openp (Vexec_path, program, EXEC_SUFFIXES, &tem, 1);
+      openp (Vexec_path, program, Vexec_suffixes, &tem, 1);
       UNGCPRO;
       if (NILP (tem))
 	report_file_error ("Searching for program", Fcons (program, Qnil));
@@ -3386,8 +3386,8 @@
 	     Long lines need to be split into multiple batches.  */
 	  if (!NILP (XPROCESS (proc)->pty_flag))
 	    {
-	      /* Starting this at zero is always correct when not the first iteration
-		 because the previous iteration ended by sending C-d.
+	      /* Starting this at zero is always correct when not the first
+                 iteration because the previous iteration ended by sending C-d.
 		 It may not be correct for the first iteration
 		 if a partial line was sent in a separate send_process call.
 		 If that proves worth handling, we need to save linepos
--- a/src/sound.c	Fri Oct 12 03:23:25 2001 +0000
+++ b/src/sound.c	Fri Oct 12 03:37:43 2001 +0000
@@ -412,7 +412,7 @@
     {
       /* Open the sound file.  */
       s.fd = openp (Fcons (Vdata_directory, Qnil),
-		    attrs[SOUND_FILE], "", &file, 0);
+		    attrs[SOUND_FILE], Qnil, &file, 0);
       if (s.fd < 0)
 	sound_perror ("Open sound file");
 
--- a/src/w32.c	Fri Oct 12 03:23:25 2001 +0000
+++ b/src/w32.c	Fri Oct 12 03:37:43 2001 +0000
@@ -3329,7 +3329,7 @@
       objs[1] = decode_env_path (0, (getenv ("EMACSLOADPATH")));
       full_load_path = Fappend (2, objs);
       init_file = build_string ("term/w32-win");
-      fd = openp (full_load_path, init_file, ".el:.elc", NULL, 0);
+      fd = openp (full_load_path, init_file, Vload_suffixes, NULL, 0);
       if (fd < 0) 
 	{
 	  Lisp_Object load_path_print = Fprin1_to_string (full_load_path, Qnil);
--- a/src/w32fns.c	Fri Oct 12 03:23:25 2001 +0000
+++ b/src/w32fns.c	Fri Oct 12 03:37:43 2001 +0000
@@ -551,7 +551,7 @@
     }
 
   /* 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, Qnil, &found, 0);
   if (fd < 0)
     return -1;
   emacs_close (fd);
@@ -8654,7 +8654,7 @@
   GCPRO2 (file_found, search_path);
 
   /* Try to find FILE in data-directory, then x-bitmap-file-path.  */
-  fd = openp (search_path, file, "", &file_found, 0);
+  fd = openp (search_path, file, Qnil, &file_found, 0);
   
   if (fd == -1)
     file_found = Qnil;
--- a/src/w32proc.c	Fri Oct 12 03:23:25 2001 +0000
+++ b/src/w32proc.c	Fri Oct 12 03:37:43 2001 +0000
@@ -744,7 +744,7 @@
       
       full = Qnil;
       GCPRO1 (program);
-      openp (Vexec_path, program, EXEC_SUFFIXES, &full, 1);
+      openp (Vexec_path, program, Vexec_suffixes, &full, 1);
       UNGCPRO;
       if (NILP (full))
 	{
--- a/src/xfns.c	Fri Oct 12 03:23:25 2001 +0000
+++ b/src/xfns.c	Fri Oct 12 03:37:43 2001 +0000
@@ -641,7 +641,7 @@
     }
 
   /* 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, Qnil, &found, 0);
   if (fd < 0)
     return -1;
   emacs_close (fd);
@@ -2970,9 +2970,9 @@
 				    build_string (foreground_p
 						  ? "foreground"
 						  : "background"),
-				    build_string (""),
+				    empty_string,
 				    build_string ("verticalScrollBar"),
-				    build_string (""));
+				    empty_string);
       if (!STRINGP (tem))
 	{
 	  /* If nothing has been specified, scroll bars will use a
@@ -6359,7 +6359,7 @@
   GCPRO2 (file_found, search_path);
 
   /* Try to find FILE in data-directory, then x-bitmap-file-path.  */
-  fd = openp (search_path, file, "", &file_found, 0);
+  fd = openp (search_path, file, Qnil, &file_found, 0);
   
   if (fd == -1)
     file_found = Qnil;