Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 771-772)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 26-27)

   - Update from CVS
   - lisp/vc-hooks.el (vc-find-root): Fix file attribute test

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-210

2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 54970e7ecf3..bafb3991d2e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,10 @@
         * macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):
         Call mac_wakeup_from_rne on window size change.
 
+2007-05-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (uncache_image): Fix typo.
+
 2007-05-23  Johannes Weiner <hannes@saeurebad.de> (tiny change)
 
         * keyboard.c (make_lispy_movement): Condition on HAVE_GPM too.
diff --git a/src/image.c b/src/image.c
index 6858675d9e4..11f4425136c 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1639,7 +1639,7 @@ uncache_image (f, spec)
      Lisp_Object spec;
 {
   struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
-  struct image *img = IMAGE_FROM_ID (f, lookup_image (f, spec));
+  struct image *img;
   unsigned hash = sxhash (spec, 0);
   int i = hash % IMAGE_CACHE_BUCKETS_SIZE;