procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
(x_find_image_file): Return an encoded file name.
This commit is contained in:
Kenichi Handa 2006-04-03 01:23:44 +00:00
parent 703890c3ee
commit 022af1243c
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.

11
src/image.c
View file

@ -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;