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

(x_find_image_file): Return an encoded file name.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3f2bae5540871f63237184f771cba5c7b791bee7..fcb678d0707afbf412bdebfce50b320ee1da8151 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
        * configure: Regenerated.

diff --git a/src/image.c b/src/image.c
index d8a1bc8028bdbea9df5b2a86ce4d7d89f5c1c1f1..6f2e93a591a5e7c05f9a2e5e5a064b92f1c1139c 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -39,6 +39,8 @@ Boston, MA 02110-1301, USA.  */
 #include "blockinput.h"
 #include "systime.h"
 #include <epaths.h>
+#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;