[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/image.c,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/src/image.c,v |
Date: |
Wed, 22 Aug 2007 07:51:40 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/08/22 07:51:40
Index: image.c
===================================================================
RCS file: /sources/emacs/emacs/src/image.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- image.c 22 Aug 2007 04:01:39 -0000 1.78
+++ image.c 22 Aug 2007 07:51:39 -0000 1.79
@@ -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. */
- [Emacs-diffs] Changes to emacs/src/image.c,v, Chong Yidong, 2007/08/06
- [Emacs-diffs] Changes to emacs/src/image.c,v, Chong Yidong, 2007/08/07
- [Emacs-diffs] Changes to emacs/src/image.c,v, Glenn Morris, 2007/08/22
- [Emacs-diffs] Changes to emacs/src/image.c,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/src/image.c,v, YAMAMOTO Mitsuharu, 2007/08/23
- [Emacs-diffs] Changes to emacs/src/image.c,v, Jason Rumney, 2007/08/23
- [Emacs-diffs] Changes to emacs/src/image.c,v, Juanma Barranquero, 2007/08/24
- [Emacs-diffs] Changes to emacs/src/image.c,v, Miles Bader, 2007/08/29
- [Emacs-diffs] Changes to emacs/src/image.c,v, Stefan Monnier, 2007/08/29
- [Emacs-diffs] Changes to emacs/src/image.c,v, Glenn Morris, 2007/08/30