From c0ec53ad99ba41fca0f34440c232c8ad203f4259 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 12 Oct 2001 03:37:43 +0000 Subject: [PATCH] Update calls to openp. --- mac/ChangeLog | 7 ++++++- mac/src/mac.c | 2 +- mac/src/macfns.c | 4 ++-- src/ChangeLog | 21 +++++++++++++++++++++ src/emacs.c | 2 +- src/process.c | 6 +++--- src/sound.c | 2 +- src/w32.c | 2 +- src/w32fns.c | 4 ++-- src/w32proc.c | 2 +- src/xfns.c | 8 ++++---- 11 files changed, 43 insertions(+), 17 deletions(-) diff --git a/mac/ChangeLog b/mac/ChangeLog index c171375dc0f..f0867e4fd43 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,8 @@ +2001-10-11 Stefan Monnier + + * 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 * src/macmenu.c (Fx_popup_menu): Use Fkeymap_prompt. @@ -8,7 +13,7 @@ 2001-10-05 Gerd Moellmann * Branch for 21.1. - + 2001-09-04 Andrew Choi * src/macmenu.c (mac_menu_show): Use refcon of selected menu item. diff --git a/mac/src/mac.c b/mac/src/mac.c index d0c9d1a36c3..473273f13b7 100644 --- a/mac/src/mac.c +++ b/mac/src/mac.c @@ -2010,7 +2010,7 @@ run_mac_command (argv, workdir, infn, outfn, errfn) 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)) diff --git a/mac/src/macfns.c b/mac/src/macfns.c index 851b4d98036..9969ead9503 100644 --- a/mac/src/macfns.c +++ b/mac/src/macfns.c @@ -513,7 +513,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, Qnil, &found, 0); if (fd < 0) return -1; /* LoadLibraryEx won't handle special files handled by Emacs handler. */ @@ -5367,7 +5367,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, "", &file_found, 0); + fd = openp (search_path, file, Qnil, &file_found, 0); if (fd < 0) file_found = Qnil; diff --git a/src/ChangeLog b/src/ChangeLog index 7ee74db35e8..4bf6ae794e2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,29 @@ 2001-10-11 Stefan Monnier + * 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. diff --git a/src/emacs.c b/src/emacs.c index f79b094f93a..64446fecb2b 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -438,7 +438,7 @@ init_cmdargs (argc, argv, skip_args) { 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 diff --git a/src/process.c b/src/process.c index 474b21f2476..d9eab3f097b 100644 --- a/src/process.c +++ b/src/process.c @@ -1196,7 +1196,7 @@ Remaining arguments are strings to give program as arguments.") 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 @@ send_process (proc, buf, len, object) 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 diff --git a/src/sound.c b/src/sound.c index 1c2d59e05b6..2a7be3ea86d 100644 --- a/src/sound.c +++ b/src/sound.c @@ -412,7 +412,7 @@ a system-dependent default device name is used.") { /* 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"); diff --git a/src/w32.c b/src/w32.c index 3703347d810..dbdd13d4d33 100644 --- a/src/w32.c +++ b/src/w32.c @@ -3329,7 +3329,7 @@ check_windows_init_file () 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); diff --git a/src/w32fns.c b/src/w32fns.c index 5173a25fe93..f1884e0f4e5 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -551,7 +551,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, Qnil, &found, 0); if (fd < 0) return -1; emacs_close (fd); @@ -8654,7 +8654,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, "", &file_found, 0); + fd = openp (search_path, file, Qnil, &file_found, 0); if (fd == -1) file_found = Qnil; diff --git a/src/w32proc.c b/src/w32proc.c index 8d5890b86dd..d2eb38fbfbd 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -744,7 +744,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) full = Qnil; GCPRO1 (program); - openp (Vexec_path, program, EXEC_SUFFIXES, &full, 1); + openp (Vexec_path, program, Vexec_suffixes, &full, 1); UNGCPRO; if (NILP (full)) { diff --git a/src/xfns.c b/src/xfns.c index c28a2f801eb..f08dddaad6e 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -641,7 +641,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, Qnil, &found, 0); if (fd < 0) return -1; emacs_close (fd); @@ -2970,9 +2970,9 @@ x_default_scroll_bar_color_parameter (f, alist, prop, xprop, xclass, 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 @@ 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, "", &file_found, 0); + fd = openp (search_path, file, Qnil, &file_found, 0); if (fd == -1) file_found = Qnil; -- 2.39.2