Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
de2413e9
Commit
de2413e9
authored
Apr 30, 2002
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(x_create_bitmap_from_file, x_find_image_file): Update call to openp.
parent
44c7a526
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
6 deletions
+25
-6
src/ChangeLog
src/ChangeLog
+19
-0
src/macfns.c
src/macfns.c
+2
-2
src/w32fns.c
src/w32fns.c
+2
-2
src/xfns.c
src/xfns.c
+2
-2
No files found.
src/ChangeLog
View file @
de2413e9
...
@@ -5,6 +5,25 @@
...
@@ -5,6 +5,25 @@
2002-04-29 Stefan Monnier <monnier@cs.yale.edu>
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.
* textprop.c (remove_properties): Don't use XCAR without CONSP.
* xterm.c (XTread_socket): Disable the Xutf8LookupString code.
* xterm.c (XTread_socket): Disable the Xutf8LookupString code.
...
...
src/macfns.c
View file @
de2413e9
...
@@ -539,7 +539,7 @@ x_create_bitmap_from_file (f, file)
...
@@ -539,7 +539,7 @@ x_create_bitmap_from_file (f, file)
}
}
/* Search bitmap-file-path for the file, if appropriate. */
/* 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)
if (fd < 0)
return -1;
return -1;
/* LoadLibraryEx won't handle special files handled by Emacs handler. */
/* LoadLibraryEx won't handle special files handled by Emacs handler. */
...
@@ -5570,7 +5570,7 @@ x_find_image_file (file)
...
@@ -5570,7 +5570,7 @@ x_find_image_file (file)
GCPRO2 (file_found, search_path);
GCPRO2 (file_found, search_path);
/* Try to find FILE in data-directory, then x-bitmap-file-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)
if (fd < 0)
file_found = Qnil;
file_found = Qnil;
...
...
src/w32fns.c
View file @
de2413e9
...
@@ -576,7 +576,7 @@ x_create_bitmap_from_file (f, file)
...
@@ -576,7 +576,7 @@ x_create_bitmap_from_file (f, file)
}
}
/* Search bitmap-file-path for the file, if appropriate. */
/* 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)
if (fd < 0)
return -1;
return -1;
emacs_close (fd);
emacs_close (fd);
...
@@ -9454,7 +9454,7 @@ x_find_image_file (file)
...
@@ -9454,7 +9454,7 @@ x_find_image_file (file)
GCPRO2 (file_found, search_path);
GCPRO2 (file_found, search_path);
/* Try to find FILE in data-directory, then x-bitmap-file-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)
if (fd == -1)
file_found = Qnil;
file_found = Qnil;
...
...
src/xfns.c
View file @
de2413e9
...
@@ -649,7 +649,7 @@ x_create_bitmap_from_file (f, file)
...
@@ -649,7 +649,7 @@ x_create_bitmap_from_file (f, file)
}
}
/* Search bitmap-file-path for the file, if appropriate. */
/* 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)
if (fd < 0)
return -1;
return -1;
emacs_close (fd);
emacs_close (fd);
...
@@ -6674,7 +6674,7 @@ x_find_image_file (file)
...
@@ -6674,7 +6674,7 @@ x_find_image_file (file)
GCPRO2 (file_found, search_path);
GCPRO2 (file_found, search_path);
/* Try to find FILE in data-directory, then x-bitmap-file-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)
if (fd == -1)
file_found = Qnil;
file_found = Qnil;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment