diff options
| author | Stefan Monnier | 2001-10-12 03:37:43 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2001-10-12 03:37:43 +0000 |
| commit | c0ec53ad99ba41fca0f34440c232c8ad203f4259 (patch) | |
| tree | cad8633f767ceaed67cf3788e59e21c344ea695d /mac | |
| parent | b81a1b72a82185bc426d31f914a5d3d7fee14c4e (diff) | |
| download | emacs-c0ec53ad99ba41fca0f34440c232c8ad203f4259.tar.gz emacs-c0ec53ad99ba41fca0f34440c232c8ad203f4259.zip | |
Update calls to openp.
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/ChangeLog | 7 | ||||
| -rw-r--r-- | mac/src/mac.c | 2 | ||||
| -rw-r--r-- | mac/src/macfns.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index c171375dc0f..f0867e4fd43 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2001-10-11 Stefan Monnier <monnier@cs.yale.edu> | ||
| 2 | |||
| 3 | * src/macfns.c (x_create_bitmap_from_file, x_find_image_file): | ||
| 4 | * src/mac.c (run_mac_command): Update calls to openp. | ||
| 5 | |||
| 1 | 2001-10-08 Stefan Monnier <monnier@cs.yale.edu> | 6 | 2001-10-08 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 7 | ||
| 3 | * src/macmenu.c (Fx_popup_menu): Use Fkeymap_prompt. | 8 | * src/macmenu.c (Fx_popup_menu): Use Fkeymap_prompt. |
| @@ -8,7 +13,7 @@ | |||
| 8 | 2001-10-05 Gerd Moellmann <gerd@gnu.org> | 13 | 2001-10-05 Gerd Moellmann <gerd@gnu.org> |
| 9 | 14 | ||
| 10 | * Branch for 21.1. | 15 | * Branch for 21.1. |
| 11 | 16 | ||
| 12 | 2001-09-04 Andrew Choi <akochoi@cse.cuhk.edu.hk> | 17 | 2001-09-04 Andrew Choi <akochoi@cse.cuhk.edu.hk> |
| 13 | 18 | ||
| 14 | * src/macmenu.c (mac_menu_show): Use refcon of selected menu item. | 19 | * 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) | |||
| 2010 | strcat (t, newargv[0]); | 2010 | strcat (t, newargv[0]); |
| 2011 | #endif | 2011 | #endif |
| 2012 | Lisp_Object path; | 2012 | Lisp_Object path; |
| 2013 | openp (Vexec_path, build_string (newargv[0]), EXEC_SUFFIXES, &path, | 2013 | openp (Vexec_path, build_string (newargv[0]), Vexec_suffixes, &path, |
| 2014 | 1); | 2014 | 1); |
| 2015 | 2015 | ||
| 2016 | if (NILP (path)) | 2016 | 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) | |||
| 513 | } | 513 | } |
| 514 | 514 | ||
| 515 | /* Search bitmap-file-path for the file, if appropriate. */ | 515 | /* Search bitmap-file-path for the file, if appropriate. */ |
| 516 | fd = openp (Vx_bitmap_file_path, file, "", &found, 0); | 516 | fd = openp (Vx_bitmap_file_path, file, Qnil, &found, 0); |
| 517 | if (fd < 0) | 517 | if (fd < 0) |
| 518 | return -1; | 518 | return -1; |
| 519 | /* LoadLibraryEx won't handle special files handled by Emacs handler. */ | 519 | /* LoadLibraryEx won't handle special files handled by Emacs handler. */ |
| @@ -5367,7 +5367,7 @@ x_find_image_file (file) | |||
| 5367 | GCPRO2 (file_found, search_path); | 5367 | GCPRO2 (file_found, search_path); |
| 5368 | 5368 | ||
| 5369 | /* Try to find FILE in data-directory, then x-bitmap-file-path. */ | 5369 | /* Try to find FILE in data-directory, then x-bitmap-file-path. */ |
| 5370 | fd = openp (search_path, file, "", &file_found, 0); | 5370 | fd = openp (search_path, file, Qnil, &file_found, 0); |
| 5371 | 5371 | ||
| 5372 | if (fd < 0) | 5372 | if (fd < 0) |
| 5373 | file_found = Qnil; | 5373 | file_found = Qnil; |