summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2008-03-27 14:59:30 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2008-03-27 14:59:30 +0000
commitc313b5febc718c68bb4ad869fc437a0373700de6 (patch)
treed832fee2dac206a0264f069e01926f11a366f099 /lisp
parent65bc892f6329b58e2e1416e1076dc8ee2f357d59 (diff)
downloademacs-c313b5febc718c68bb4ad869fc437a0373700de6.tar.gz
(image-mode-reapply-winprops): Fix last change.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/image-mode.el6
2 files changed, 7 insertions, 3 deletions
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.