andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve doc-view wrt. auto-revert-mode

Browse source 
* 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.
This commit is contained in:
Tassilo Horn 2015-10-22 17:01:57 +02:00
parent 717e7a4e8f
commit 11d14229dc
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/doc-view.el
View file

@ -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)