diff options
| author | Stefan Monnier | 2008-03-27 14:59:30 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-03-27 14:59:30 +0000 |
| commit | c313b5febc718c68bb4ad869fc437a0373700de6 (patch) | |
| tree | d832fee2dac206a0264f069e01926f11a366f099 | |
| parent | 65bc892f6329b58e2e1416e1076dc8ee2f357d59 (diff) | |
| download | emacs-c313b5febc718c68bb4ad869fc437a0373700de6.tar.gz emacs-c313b5febc718c68bb4ad869fc437a0373700de6.zip | |
(image-mode-reapply-winprops): Fix last change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/image-mode.el | 6 |
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 @@ | |||
| 1 | 2008-03-27 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * image-mode.el (image-mode-reapply-winprops): Fix last change. | ||
| 4 | |||
| 1 | 2008-03-27 Kenichi Handa <handa@ni.aist.go.jp> | 5 | 2008-03-27 Kenichi Handa <handa@ni.aist.go.jp> |
| 2 | 6 | ||
| 3 | * international/mule-conf.el (define-iso-single-byte-charset): | 7 | * 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)." | |||
| 97 | ;; When set-window-buffer, set hscroll and vscroll to what they were | 97 | ;; When set-window-buffer, set hscroll and vscroll to what they were |
| 98 | ;; last time the image was displayed in this window. | 98 | ;; last time the image was displayed in this window. |
| 99 | (when (listp image-mode-winprops-alist) | 99 | (when (listp image-mode-winprops-alist) |
| 100 | (let* ((winprops (image-mode-winprops win)) | 100 | (let* ((winprops (image-mode-winprops)) |
| 101 | (hscroll (image-mode-window-get 'hscroll winprops)) | 101 | (hscroll (image-mode-window-get 'hscroll winprops)) |
| 102 | (vscroll (image-mode-window-get 'vscroll winprops))) | 102 | (vscroll (image-mode-window-get 'vscroll winprops))) |
| 103 | (if hscroll (set-window-hscroll win hscroll)) | 103 | (if hscroll (set-window-hscroll (selected-window) hscroll)) |
| 104 | (if vscroll (set-window-vscroll win vscroll))))) | 104 | (if vscroll (set-window-vscroll (selected-window) vscroll))))) |
| 105 | 105 | ||
| 106 | (defun image-mode-setup-winprops () | 106 | (defun image-mode-setup-winprops () |
| 107 | ;; Record current scroll settings. | 107 | ;; Record current scroll settings. |