diff options
| author | Tassilo Horn <tsdh@gnu.org> | 2015-10-22 17:01:57 +0200 |
|---|---|---|
| committer | Tassilo Horn <tsdh@gnu.org> | 2015-10-22 17:04:35 +0200 |
| commit | 11d14229dc96d8b44b78a2f35ac0011fbd0f527f (patch) | |
| tree | 746de37795ea79018d6c7086c3eb8b1cff94d769 /lisp/doc-view.el | |
| parent | 717e7a4e8f2f6aa6ae0be33783d208394eef4a0f (diff) | |
| download | emacs-11d14229dc96d8b44b78a2f35ac0011fbd0f527f.tar.gz | |
Improve doc-view wrt. auto-revert-mode
* lisp/doc-view.el (doc-view-revert-buffer): Don't revert when file is
corrupted (bug#21729).
(doc-view-mode): Set doc-view-revert-buffer as revert-buffer-function.
Diffstat (limited to 'lisp/doc-view.el')
| -rw-r--r-- | lisp/doc-view.el | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/lisp/doc-view.el b/lisp/doc-view.el index 9227b82a975..edc001455c9 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -440,10 +440,23 @@ Typically \"page-%s.png\".") (defun doc-view-revert-buffer (&optional ignore-auto noconfirm) "Like `revert-buffer', but preserves the buffer's current modes." - ;; FIXME: this should probably be moved to files.el and used for - ;; most/all "g" bindings to revert-buffer. (interactive (list (not current-prefix-arg))) - (revert-buffer ignore-auto noconfirm 'preserve-modes)) + (cl-labels ((revert () + (let (revert-buffer-function) + (revert-buffer ignore-auto noconfirm 'preserve-modes)))) + (if (and (eq 'pdf doc-view-doc-type) + (executable-find "pdfinfo")) + ;; We don't want to revert if the PDF file is corrupted which + ;; might happen when it it currently recompiled from a tex + ;; file. (TODO: We'd like to have something like that also + ;; for other types, at least PS, but I don't know a good way + ;; to test if a PS file is complete.) + (if (= 0 (call-process (executable-find "pdfinfo") nil nil nil + doc-view--buffer-file-name)) + (revert) + (when (called-interactively-p 'interactive) + (message "Can't revert right now because the file is corrupted."))) + (revert)))) (easy-menu-define doc-view-menu doc-view-mode-map @@ -1766,6 +1779,8 @@ toggle between displaying the document or editing it as text. (when (not (string= doc-view--buffer-file-name buffer-file-name)) (write-region nil nil doc-view--buffer-file-name)) + (setq-local revert-buffer-function #'doc-view-revert-buffer) + (add-hook 'change-major-mode-hook (lambda () (doc-view-kill-proc) |