diff options
| author | Glenn Morris | 2007-08-30 05:08:24 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-08-30 05:08:24 +0000 |
| commit | 050b82f6f513d71be620fc3b5bb38d87826857fb (patch) | |
| tree | 92f0141639a8f259bf6669a96dad47d0ae9dc857 | |
| parent | 0f1444e1e179240df3fe4a1a82561c4010cda285 (diff) | |
| download | emacs-050b82f6f513d71be620fc3b5bb38d87826857fb.tar.gz emacs-050b82f6f513d71be620fc3b5bb38d87826857fb.zip | |
Comment.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 2 |
2 files changed, 6 insertions, 1 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-08-30 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * configure.in (AH_BOTTOM): Copy some manual changes made to | ||
| 4 | src/config.in here so they are not lost when it regenerates. | ||
| 5 | |||
| 1 | 2007-08-29 Glenn Morris <rgm@gnu.org> | 6 | 2007-08-29 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * README: Increase version to 23.0.50. | 8 | * README: Increase version to 23.0.50. |
diff --git a/src/image.c b/src/image.c index fcfddd7f5dc..7a258df5a3b 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -2377,7 +2377,7 @@ x_find_image_file (file) | |||
| 2377 | Vx_bitmap_file_path); | 2377 | Vx_bitmap_file_path); |
| 2378 | GCPRO2 (file_found, search_path); | 2378 | GCPRO2 (file_found, search_path); |
| 2379 | 2379 | ||
| 2380 | /* Try to find FILE in data-directory, then x-bitmap-file-path. */ | 2380 | /* Try to find FILE in data-directory/images, then x-bitmap-file-path. */ |
| 2381 | fd = openp (search_path, file, Qnil, &file_found, Qnil); | 2381 | fd = openp (search_path, file, Qnil, &file_found, Qnil); |
| 2382 | 2382 | ||
| 2383 | if (fd == -1) | 2383 | if (fd == -1) |