diff options
| author | Miles Bader | 2007-05-30 14:44:47 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-05-30 14:44:47 +0000 |
| commit | 34c6724464237db4bfd5b3fa57e8b0f66a92f618 (patch) | |
| tree | bbfe4aea433c943f0f6a67b3e49ee31647e12d92 /src/image.c | |
| parent | 30790a37efea5c6fed87ee0dd0d54c31ac9eea11 (diff) | |
| parent | 7a781a5480b9a1f55d28a76e1d1f89aaa2421f97 (diff) | |
| download | emacs-34c6724464237db4bfd5b3fa57e8b0f66a92f618.tar.gz emacs-34c6724464237db4bfd5b3fa57e8b0f66a92f618.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 771-780)
- Update from CVS
- Merge from emacs--rel--22
- Merge from emacs--rel--22, gnus--rel--5.10
- Fix tq.el edge case
* emacs--rel--22 (patch 26-32)
- Update from CVS
- lisp/vc-hooks.el (vc-find-root): Fix file attribute test
* gnus--rel--5.10 (patch 224-225)
- Merge from emacs--devo--0, emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-18
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image.c b/src/image.c index dbe200195d0..fbd2f4e6a51 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -1639,7 +1639,7 @@ uncache_image (f, spec) | |||
| 1639 | Lisp_Object spec; | 1639 | Lisp_Object spec; |
| 1640 | { | 1640 | { |
| 1641 | struct image_cache *c = FRAME_X_IMAGE_CACHE (f); | 1641 | struct image_cache *c = FRAME_X_IMAGE_CACHE (f); |
| 1642 | struct image *img = IMAGE_FROM_ID (f, lookup_image (f, spec)); | 1642 | struct image *img; |
| 1643 | unsigned hash = sxhash (spec, 0); | 1643 | unsigned hash = sxhash (spec, 0); |
| 1644 | int i = hash % IMAGE_CACHE_BUCKETS_SIZE; | 1644 | int i = hash % IMAGE_CACHE_BUCKETS_SIZE; |
| 1645 | 1645 | ||