* doc-view.el (doc-view-mode): Adapt to i-m-current-[vh]scroll

	being an alist now.

2 files changed, 15 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3525398265..00e102729c0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-29  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * doc-view.el (doc-view-mode): Adapt to i-m-current-[vh]scroll
+        being an alist now.
+
+        * image-mode.el (image-mode-current-vscroll)
+        (image-mode-current-hscroll): Add doc strings.
+        (image-set-window-vscroll, image-set-window-hscroll)
+        (image-reset-current-vhscroll, image-mode): Adapt to
+        i-m-current-[vh]scroll being an alist now.
+
 2008-01-29  Martin Rudalics  <rudalics@gmx.at>
 
         * emacs-lisp/find-func.el (find-function-search-for-symbol):
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 047785e844c..aaa68bf6387 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -989,10 +989,10 @@ toggle between displaying the document or editing it as text."
             nil t)
 
   ;; Keep track of [vh]scroll when switching buffers
-  (set (make-local-variable 'image-mode-current-hscroll)
-       (window-hscroll (selected-window)))
-  (set (make-local-variable 'image-mode-current-vscroll)
-       (window-vscroll (selected-window)))
+  (make-local-variable 'image-mode-current-hscroll)
+  (make-local-variable 'image-mode-current-vscroll)
+  (image-set-window-hscroll (selected-window) (window-hscroll))
+  (image-set-window-vscroll (selected-window) (window-vscroll))
   (add-hook 'window-configuration-change-hook
             'image-reset-current-vhscroll nil t)