* doc-view.el (doc-view-new-window-function): Check the new window

overlay's display property instead the char property of the
buffer's first char.  Use `with-selected-window' instead of
`save-window-excursion' with `select-window'.
(doc-view-document->bitmap): Check the current doc-view overlay's
display property instead the char property of the buffer's first
char.

2 files changed, 15 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2fcef66164..082054e5be5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-18  Tassilo Horn  <tsdh@gnu.org>
+
+        * doc-view.el (doc-view-new-window-function): Check the new window
+        overlay's display property instead the char property of the
+        buffer's first char.  Use `with-selected-window' instead of
+        `save-window-excursion' with `select-window'.
+        (doc-view-document->bitmap): Check the current doc-view overlay's
+        display property instead the char property of the buffer's first
+        char.
+
 2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
 
         Automate the build of ja-dic.el (Bug#13984).
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index ee77f397746..6217f5d0a3f 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -326,7 +326,7 @@ of the page moves to the previous page."
       (delete-overlay ol))
     (image-mode-window-put 'overlay ol winprops)
     (when (windowp (car winprops))
-      (if (stringp (get-char-property (point-min) 'display))
+      (if (stringp (overlay-get ol 'display))
           ;; We're not already displaying an image, so this is the
           ;; initial window showing the document.
           (run-with-timer nil nil
@@ -338,12 +338,11 @@ of the page moves to the previous page."
                               (with-selected-window (car winprops)
                                 (doc-view-goto-page 1)))))
         ;; We've split the window showing the document.  All we need
-        ;; to do is selecting the new window to make the image appear
-        ;; there, too.
+        ;; to do is selecting the new window to cause a redisplay to
+        ;; make the image appear there, too.
         (run-with-timer nil nil
                         (lambda ()
-                          (save-window-excursion
-                            (select-window (car winprops)))))))))
+                          (with-selected-window (car winprops))))))))
 
 (defvar doc-view-current-files nil
   "Only used internally.")
@@ -1026,7 +1025,7 @@ Start by converting PAGES, and then the rest."
            ;; not sufficient.
            (dolist (win (get-buffer-window-list (current-buffer) nil 'visible))
              (with-selected-window win
-               (when (stringp (get-char-property (point-min) 'display))
+               (when (stringp (overlay-get (doc-view-current-overlay) 'display))
                  (doc-view-goto-page (doc-view-current-page)))))
            ;; Convert the rest of the pages.
            (doc-view-pdf/ps->png pdf png)))))))