From 022af1243cf04c67caf119e0156bf4de577cf126 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 3 Apr 2006 01:23:44 +0000 Subject: [PATCH] Include "charset.h" and "coding.h". (x_find_image_file): Return an encoded file name. --- src/ChangeLog | 5 +++++ src/image.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3f2bae55408..fcb678d0707 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-04-03 Kenichi Handa + + * image.c: Include "charset.h" and "coding.h". + (x_find_image_file): Return an encoded file name. + 2006-04-01 Eli Zaretskii * configure: Regenerated. diff --git a/src/image.c b/src/image.c index d8a1bc8028b..6f2e93a591a 100644 --- a/src/image.c +++ b/src/image.c @@ -39,6 +39,8 @@ Boston, MA 02110-1301, USA. */ #include "blockinput.h" #include "systime.h" #include +#include "charset.h" +#include "coding.h" #ifdef HAVE_X_WINDOWS @@ -2246,8 +2248,8 @@ static unsigned char *slurp_file P_ ((char *, int *)); /* Find image file FILE. Look in data-directory, then - x-bitmap-file-path. Value is the full name of the file found, or - nil if not found. */ + x-bitmap-file-path. Value is the encoded full name of the file + found, or nil if not found. */ Lisp_Object x_find_image_file (file) @@ -2267,7 +2269,10 @@ x_find_image_file (file) if (fd == -1) file_found = Qnil; else - close (fd); + { + file_found = ENCODE_FILE (file_found); + close (fd); + } UNGCPRO; return file_found; -- 2.39.2