Mercurial > emacs

changeset 69771:fd6d18b61fa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include "charset.h" and "coding.h". (x_find_image_file): Return an encoded file name.
author Kenichi Handa <handa@m17n.org>
date Mon, 03 Apr 2006 01:23:03 +0000
parents 8b9279d58ebd
children c49031fc9870
files src/image.c
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/image.c	Mon Apr 03 00:26:06 2006 +0000
+++ b/src/image.c	Mon Apr 03 01:23:03 2006 +0000
@@ -39,6 +39,8 @@
 #include "blockinput.h"
 #include "systime.h"
 #include <epaths.h>
+#include "charset.h"
+#include "coding.h"
 
 
 #ifdef HAVE_X_WINDOWS
@@ -2246,8 +2248,8 @@
 
 
 /* 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 @@
   if (fd == -1)
     file_found = Qnil;
   else
-    close (fd);
+    {
+      file_found = ENCODE_FILE (file_found);
+      close (fd);
+    }
 
   UNGCPRO;
   return file_found;