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

	being an alist now.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d35253982655de382bc67a856d2ba00dd93c8f0b..00e102729c07e657a4db1ca2fabd93d9f7f5218a 100644 (file)
--- 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 047785e844c632de4e871b17d3e7bd2f027650b6..aaa68bf6387e0cc7de5a5c5ed1b4ef66a29ea85f 100644 (file)
--- 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)