Mercurial > emacs
comparison lisp/doc-view.el @ 94443:f41f8f74c3cb
(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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 28 Apr 2008 23:49:02 +0000 |
| parents | 0496bdb638d8 |
| children | ee5932bf781d |
comparison
equal
deleted
inserted
replaced
| 94442:245b6ba7c339 | 94443:f41f8f74c3cb |
|---|---|
| 228 | 228 |
| 229 (defun doc-view-new-window-function (winprops) | 229 (defun doc-view-new-window-function (winprops) |
| 230 (let ((ol (image-mode-window-get 'overlay winprops))) | 230 (let ((ol (image-mode-window-get 'overlay winprops))) |
| 231 (if ol | 231 (if ol |
| 232 (setq ol (copy-overlay ol)) | 232 (setq ol (copy-overlay ol)) |
| 233 (assert (not (get-char-property (point-min) 'display (car winprops)))) | 233 (assert (not (get-char-property (point-min) 'display))) |
| 234 (setq ol (make-overlay (point-min) (point-max) nil t)) | 234 (setq ol (make-overlay (point-min) (point-max) nil t)) |
| 235 (overlay-put ol 'doc-view t)) | 235 (overlay-put ol 'doc-view t)) |
| 236 (overlay-put ol 'window (car winprops)) | 236 (overlay-put ol 'window (car winprops)) |
| 237 (image-mode-window-put 'overlay ol winprops))) | 237 (image-mode-window-put 'overlay ol winprops))) |
| 238 | 238 |
| 843 (let ((prev-pages doc-view-current-files)) | 843 (let ((prev-pages doc-view-current-files)) |
| 844 (setq doc-view-current-files | 844 (setq doc-view-current-files |
| 845 (sort (directory-files (doc-view-current-cache-dir) t | 845 (sort (directory-files (doc-view-current-cache-dir) t |
| 846 "page-[0-9]+\\.png" t) | 846 "page-[0-9]+\\.png" t) |
| 847 'doc-view-sort)) | 847 'doc-view-sort)) |
| 848 (dolist (win (get-buffer-window-list buffer nil t)) | 848 (dolist (win (or (get-buffer-window-list buffer nil t) |
| 849 (let* ((page (doc-view-current-page win)) | 849 (list (selected-window)))) |
| 850 (pagefile (expand-file-name (format "page-%d.png" page) | 850 (let* ((page (doc-view-current-page win)) |
| 851 (doc-view-current-cache-dir)))) | 851 (pagefile (expand-file-name (format "page-%d.png" page) |
| 852 (when (or force | 852 (doc-view-current-cache-dir)))) |
| 853 (and (not (member pagefile prev-pages)) | 853 (when (or force |
| 854 (member pagefile doc-view-current-files))) | 854 (and (not (member pagefile prev-pages)) |
| 855 (with-selected-window win | 855 (member pagefile doc-view-current-files))) |
| 856 (assert (eq (current-buffer) buffer)) | 856 (with-selected-window win |
| 857 (doc-view-goto-page page)))))))) | 857 (assert (eq (current-buffer) buffer)) |
| 858 (doc-view-goto-page page)))))))) | |
| 858 | 859 |
| 859 (defun doc-view-buffer-message () | 860 (defun doc-view-buffer-message () |
| 860 ;; Only show this message initially, not when refreshing the buffer (in which | 861 ;; Only show this message initially, not when refreshing the buffer (in which |
| 861 ;; case it's better to keep displaying the "stale" page while computing | 862 ;; case it's better to keep displaying the "stale" page while computing |
| 862 ;; the fresh new ones). | 863 ;; the fresh new ones). |