# HG changeset patch
# User Tassilo Horn <tassilo@member.fsf.org>
# Date 1236241466 0
# Node ID feece1082bed2f25a34b33066474c2e68cf00acd
# Parent  11e2d44c18ff5f8d452a1696b68475b7c54f11ec
(doc-view-convert-current-doc): Save the current
resolution in the cache directory.
(doc-view-initiate-display): Restore the saved resolution when
using cached image files.

diff -r 11e2d44c18ff -r feece1082bed lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Mar 05 07:09:33 2009 +0000
+++ b/lisp/ChangeLog	Thu Mar 05 08:24:26 2009 +0000
@@ -1,3 +1,10 @@
+2009-03-05  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* doc-view.el (doc-view-convert-current-doc): Save the current
+	resolution in the cache directory.
+	(doc-view-initiate-display): Restore the saved resolution when
+	using cached image files.
+
 2009-03-05  Glenn Morris  <rgm@gnu.org>
 
 	* mail/rmail.el (rmail-perm-variables): rmail-overlay-list needs to be
diff -r 11e2d44c18ff -r feece1082bed lisp/doc-view.el
--- a/lisp/doc-view.el	Thu Mar 05 07:09:33 2009 +0000
+++ b/lisp/doc-view.el	Thu Mar 05 08:24:26 2009 +0000
@@ -721,8 +721,16 @@
   ;; resets during the redisplay).
   (setq doc-view-pending-cache-flush t)
   (let ((png-file (expand-file-name "page-%d.png"
+                                    (doc-view-current-cache-dir)))
+	(res-file (expand-file-name "resolution.el"
                                     (doc-view-current-cache-dir))))
     (make-directory (doc-view-current-cache-dir) t)
+    ;; Save the used resolution so that it can be restored when
+    ;; reading the cached files.
+    (let ((res doc-view-resolution))
+      (with-temp-buffer
+	(princ res (current-buffer))
+	(write-file res-file)))
     (case doc-view-doc-type
       (dvi
        ;; DVI files have to be converted to PDF before Ghostscript can process
@@ -1045,6 +1053,16 @@
 	(if (doc-view-already-converted-p)
 	    (progn
 	      (message "DocView: using cached files!")
+	      ;; Load the saved resolution
+	      (let ((res-file (expand-file-name "resolution.el"
+						(doc-view-current-cache-dir)))
+		    (res doc-view-resolution))
+		(with-temp-buffer
+		  (when (file-exists-p res-file)
+		    (insert-file-contents res-file)
+		    (setq res (read (current-buffer)))))
+		(when (numberp res)
+		  (set (make-local-variable 'doc-view-resolution) res)))
 	      (doc-view-display (current-buffer) 'force))
 	  (doc-view-convert-current-doc))
 	(message