# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: shyam@swathanthran.in-20100715075217-cvwlhocdru9xcxkh
# author: Shyam Karanatt<shyam@swathanthran.in>
# target_branch: file:///media/sda5/home/shyam/bazaar-\
#   emacs/emacs/clean-trunk/
# testament_sha1: d49bcb73c9113f671bfbafd26c333a809b85cbec
# timestamp: 2010-07-15 13:29:40 +0530
# base_revision_id: yamaoka@jpl.org-20100715005613-1hdb4741v79szq8v
# 
# Begin patch
=== modified file 'lisp/image-mode.el'
--- lisp/image-mode.el	2010-07-14 15:57:54 +0000
+++ lisp/image-mode.el	2010-07-15 07:52:17 +0000
@@ -157,9 +157,15 @@
 	((< n 0)
 	 (image-set-window-vscroll (max 0 (+ (window-vscroll) n))))
 	(t
-	 (let* ((image (image-get-display-property))
+	 (let* ((image-display (image-get-display-property))
+		(image (if (eq (car image-display) 'image) 
+			   image-display
+			 (assoc 'image image-display)))
+		(slice (assoc 'slice image-display))
 		(edges (window-inside-edges))
 		(win-height (- (nth 3 edges) (nth 1 edges)))
-		(img-height (ceiling (cdr (image-size image)))))
+		(img-height (if slice 
+				(nth 4 slice)
+			      (ceiling (cdr (image-size image))))))
 	   (image-set-window-vscroll (min (max 0 (- img-height win-height))
 					  (+ n (window-vscroll))))))))