[Emacs-diffs] emacs/lisp ChangeLog doc-view.el

[Tassilo Horn]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Tassilo Horn <tsdh>     09/02/09 15:33:49

Modified files:
        lisp           : ChangeLog doc-view.el 

Log message:
        (doc-view-scroll-up-or-next-page)
        (doc-view-scroll-down-or-previous-page, doc-view-goto-page): Reset
        the old hscroll value after switching pages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15285&r2=1.15286
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/doc-view.el?cvsroot=emacs&r1=1.80&r2=1.81

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15285
retrieving revision 1.15286
diff -u -b -r1.15285 -r1.15286
--- ChangeLog   9 Feb 2009 07:52:54 -0000       1.15285
+++ ChangeLog   9 Feb 2009 15:33:47 -0000       1.15286
@@ -1,3 +1,9 @@
+2009-02-09  Tassilo Horn  <address@hidden>
+
+       * doc-view.el (doc-view-scroll-up-or-next-page)
+       (doc-view-scroll-down-or-previous-page, doc-view-goto-page): Reset
+       the old hscroll value after switching pages.
+
 2009-02-09  Glenn Morris  <address@hidden>
 
        * calendar/calendar.el (diary-entry-marker, calendar-today-marker)

Index: doc-view.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/doc-view.el,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- doc-view.el 28 Jan 2009 20:33:47 -0000      1.80
+++ doc-view.el 9 Feb 2009 15:33:49 -0000       1.81
@@ -346,7 +346,8 @@
 (defun doc-view-goto-page (page)
   "View the page given by PAGE."
   (interactive "nPage: ")
-  (let ((len (length doc-view-current-files)))
+  (let ((len (length doc-view-current-files))
+       (hscroll (window-hscroll)))
     (if (< page 1)
        (setq page 1)
       (when (and (> page len)
@@ -379,6 +380,7 @@
     (let ((file (expand-file-name (format "page-%d.png" page)
                                   (doc-view-current-cache-dir))))
       (doc-view-insert-image file :pointer 'arrow)
+      (set-window-hscroll (selected-window) hscroll)
       (when (and (not (file-exists-p file))
                  doc-view-current-converter-processes)
         ;; The PNG file hasn't been generated yet.
@@ -418,22 +420,26 @@
 (defun doc-view-scroll-up-or-next-page ()
   "Scroll page up if possible, else goto next page."
   (interactive)
+  (let ((hscroll (window-hscroll))
+       (cur-page (doc-view-current-page)))
   (when (= (window-vscroll) (image-scroll-up nil))
-    (let ((cur-page (doc-view-current-page)))
       (doc-view-next-page)
       (when (/= cur-page (doc-view-current-page))
        (image-bob)
-       (image-bol 1)))))
+       (image-bol 1))
+      (set-window-hscroll (selected-window) hscroll))))
 
 (defun doc-view-scroll-down-or-previous-page ()
   "Scroll page down if possible, else goto previous page."
   (interactive)
+  (let ((hscroll (window-hscroll))
+       (cur-page (doc-view-current-page)))
   (when (= (window-vscroll) (image-scroll-down nil))
-    (let ((cur-page (doc-view-current-page)))
       (doc-view-previous-page)
       (when (/= cur-page (doc-view-current-page))
        (image-eob)
-       (image-bol 1)))))
+       (image-bol 1))
+      (set-window-hscroll (selected-window) hscroll))))
 
 ;;;; Utility Functions