diff options
| author | Chong Yidong <[email protected]> | 2008-04-28 23:49:02 +0000 |
|---|---|---|
| committer | Chong Yidong <[email protected]> | 2008-04-28 23:49:02 +0000 |
| commit | 10b6e7c189a99d892d7f3c329745c1360f3ebaa4 (patch) | |
| tree | 79d22099ccfd21c83d160c041d45f68258208094 /lisp/doc-view.el | |
| parent | 6593e735a34ed0204de2afd864064629fb08d978 (diff) | |
(doc-view-new-window-function): Avoid using WINDOW
argument to get-char-property, in case the current buffer hasn't
been assigned to that window yet.
(doc-view-display): Default to selected window if the current
buffer hasn't been assigned to a window yet.
Diffstat (limited to 'lisp/doc-view.el')
| -rw-r--r-- | lisp/doc-view.el | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lisp/doc-view.el b/lisp/doc-view.el index 7d2988f971..f7cabbe42a 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -230,7 +230,7 @@ has finished." (let ((ol (image-mode-window-get 'overlay winprops))) (if ol (setq ol (copy-overlay ol)) - (assert (not (get-char-property (point-min) 'display (car winprops)))) + (assert (not (get-char-property (point-min) 'display))) (setq ol (make-overlay (point-min) (point-max) nil t)) (overlay-put ol 'doc-view t)) (overlay-put ol 'window (car winprops)) @@ -845,16 +845,17 @@ have the page we want to view." (sort (directory-files (doc-view-current-cache-dir) t "page-[0-9]+\\.png" t) 'doc-view-sort)) - (dolist (win (get-buffer-window-list buffer nil t)) - (let* ((page (doc-view-current-page win)) - (pagefile (expand-file-name (format "page-%d.png" page) - (doc-view-current-cache-dir)))) - (when (or force - (and (not (member pagefile prev-pages)) - (member pagefile doc-view-current-files))) - (with-selected-window win - (assert (eq (current-buffer) buffer)) - (doc-view-goto-page page)))))))) + (dolist (win (or (get-buffer-window-list buffer nil t) + (list (selected-window)))) + (let* ((page (doc-view-current-page win)) + (pagefile (expand-file-name (format "page-%d.png" page) + (doc-view-current-cache-dir)))) + (when (or force + (and (not (member pagefile prev-pages)) + (member pagefile doc-view-current-files))) + (with-selected-window win + (assert (eq (current-buffer) buffer)) + (doc-view-goto-page page)))))))) (defun doc-view-buffer-message () ;; Only show this message initially, not when refreshing the buffer (in which |