Commit 022af124 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

Include "charset.h" and "coding.h".

(x_find_image_file): Return an encoded file name.
parent 703890c3
2006-04-03 Kenichi Handa <handa@m17n.org>
* image.c: Include "charset.h" and "coding.h".
(x_find_image_file): Return an encoded file name.
2006-04-01 Eli Zaretskii <eliz@gnu.org> 2006-04-01 Eli Zaretskii <eliz@gnu.org>
   
* configure: Regenerated. * configure: Regenerated.
......
...@@ -39,6 +39,8 @@ Boston, MA 02110-1301, USA. */ ...@@ -39,6 +39,8 @@ Boston, MA 02110-1301, USA. */
#include "blockinput.h" #include "blockinput.h"
#include "systime.h" #include "systime.h"
#include <epaths.h> #include <epaths.h>
#include "charset.h"
#include "coding.h"
#ifdef HAVE_X_WINDOWS #ifdef HAVE_X_WINDOWS
...@@ -2246,8 +2248,8 @@ static unsigned char *slurp_file P_ ((char *, int *)); ...@@ -2246,8 +2248,8 @@ static unsigned char *slurp_file P_ ((char *, int *));
/* Find image file FILE. Look in data-directory, then /* Find image file FILE. Look in data-directory, then
x-bitmap-file-path. Value is the full name of the file found, or x-bitmap-file-path. Value is the encoded full name of the file
nil if not found. */ found, or nil if not found. */
Lisp_Object Lisp_Object
x_find_image_file (file) x_find_image_file (file)
...@@ -2267,7 +2269,10 @@ x_find_image_file (file) ...@@ -2267,7 +2269,10 @@ x_find_image_file (file)
if (fd == -1) if (fd == -1)
file_found = Qnil; file_found = Qnil;
else else
close (fd); {
file_found = ENCODE_FILE (file_found);
close (fd);
}
UNGCPRO; UNGCPRO;
return file_found; return file_found;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment