From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 27 Mar 2008 14:59:30 +0000 (+0000)
Subject: (image-mode-reapply-winprops): Fix last change.
X-Git-Tag: emacs-pretest-23.0.90~6860
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c313b5febc718c68bb4ad869fc437a0373700de6;p=emacs.git

(image-mode-reapply-winprops): Fix last change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31637cbc0c1..13c5932abb6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* image-mode.el (image-mode-reapply-winprops): Fix last change.
+
 2008-03-27  Kenichi Handa  <handa@ni.aist.go.jp>
 
 	* international/mule-conf.el (define-iso-single-byte-charset):
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index b5cfe57ed18..fc38f045ff9 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -97,11 +97,11 @@ A winprops object has the shape (WINDOW . ALIST)."
   ;; When set-window-buffer, set hscroll and vscroll to what they were
   ;; last time the image was displayed in this window.
   (when (listp image-mode-winprops-alist)
-    (let* ((winprops (image-mode-winprops win))
+    (let* ((winprops (image-mode-winprops))
            (hscroll (image-mode-window-get 'hscroll winprops))
            (vscroll (image-mode-window-get 'vscroll winprops)))
-      (if hscroll (set-window-hscroll win hscroll))
-      (if vscroll (set-window-vscroll win vscroll)))))
+      (if hscroll (set-window-hscroll (selected-window) hscroll))
+      (if vscroll (set-window-vscroll (selected-window) vscroll)))))
 
 (defun image-mode-setup-winprops ()
   ;; Record current scroll settings.