Mercurial > emacs
changeset 82736:ece5e5e6398e
(x_find_image_file): Search in etc/images/ rather than etc/.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 22 Aug 2007 07:51:39 +0000 |
| parents | b5682656f2d4 |
| children | 19ce914bac2f |
| files | src/image.c |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image.c Wed Aug 22 07:50:47 2007 +0000 +++ b/src/image.c Wed Aug 22 07:51:39 2007 +0000 @@ -1,6 +1,7 @@ /* Functions for image support on window system. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2353,7 +2354,7 @@ 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/images, then x-bitmap-file-path. Value is the encoded full name of the file found, or nil if not found. */ @@ -2366,7 +2367,11 @@ int fd; file_found = Qnil; - search_path = Fcons (Vdata_directory, Vx_bitmap_file_path); + /* TODO I think this should use something like image-load-path + instead. Unfortunately, that can contain non-string elements. */ + search_path = Fcons (Fexpand_file_name (build_string ("images"), + Vdata_directory), + Vx_bitmap_file_path); GCPRO2 (file_found, search_path); /* Try to find FILE in data-directory, then x-bitmap-file-path. */