[Emacs-diffs] /srv/bzr/emacs/trunk r112075: * doc-view.el (doc-view-new-window-function): Check the new window

[Tassilo Horn]

------------------------------------------------------------
revno: 112075
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Mon 2013-03-18 08:41:38 +0100
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/doc-view.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-03-18 04:30:20 +0000
+++ b/lisp/ChangeLog    2013-03-18 07:41:38 +0000
@@ -1,3 +1,13 @@
+2013-03-18  Tassilo Horn  <address@hidden>
+
+       * 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  <address@hidden>
 
        Automate the build of ja-dic.el (Bug#13984).

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2013-03-14 21:33:07 +0000
+++ b/lisp/doc-view.el  2013-03-18 07:41:38 +0000
@@ -326,7 +326,7 @@
       (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 @@
                              (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 @@
            ;; 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)))))))