[Emacs-diffs] Changes to emacs/lisp/doc-view.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/01/18 20:09:28

Index: doc-view.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/doc-view.el,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- doc-view.el 10 Jan 2008 15:08:10 -0000      1.38
+++ doc-view.el 18 Jan 2008 20:09:26 -0000      1.39
@@ -100,10 +100,9 @@
 ;;; Todo:
 
 ;; - better menu.
-;; - don't use `find-file'.
 ;; - Bind slicing to a drag event.
 ;; - doc-view-fit-doc-to-window and doc-view-fit-window-to-doc.
-;; - zoom a the region around the cursor (like xdvi).
+;; - zoom the region around the cursor (like xdvi).
 ;; - get rid of the silly arrow in the fringe.
 ;; - improve anti-aliasing (pdf-utils gets it better).
 
@@ -558,13 +557,16 @@
 (defun doc-view-pdf/ps->png (pdf-ps png)
   "Convert PDF-PS to PNG asynchronously."
   (setq doc-view-current-converter-process
+        ;; Make sure the process is started in an existing directory,
+        ;; (rather than some file-name-handler-managed dir, for example).
+        (let ((default-directory (file-name-directory pdf-ps)))
        (apply 'start-process
               (append (list "pdf/ps->png" doc-view-conversion-buffer
                             doc-view-ghostscript-program)
                       doc-view-ghostscript-options
                        (list (format "-r%d" (round doc-view-resolution)))
                       (list (concat "-sOutputFile=" png))
-                      (list pdf-ps)))
+                         (list pdf-ps))))
        mode-line-process (list (format ":%s" 
doc-view-current-converter-process)))
   (process-put doc-view-current-converter-process
               'buffer (current-buffer))
@@ -705,13 +707,23 @@
   (when doc-view-pending-cache-flush
     (clear-image-cache)
     (setq doc-view-pending-cache-flush nil))
+  (if (null file)
+      ;; We're trying to display a page that doesn't exist.  Typically happens
+      ;; if the conversion process somehow failed.  Better not signal an
+      ;; error here because it could prevent a subsequent reconversion from
+      ;; fixing the problem.
+      (progn
+        (setq doc-view-current-image nil)
+        (move-overlay doc-view-current-overlay (point-min) (point-max))
+        (overlay-put doc-view-current-overlay 'display
+                     "Cannot display this page!  Probably a conversion 
failure!"))
   (let ((image (apply 'create-image file 'png nil args)))
     (setq doc-view-current-image image)
     (move-overlay doc-view-current-overlay (point-min) (point-max))
     (overlay-put doc-view-current-overlay 'display
                  (if doc-view-current-slice
                      (list (cons 'slice doc-view-current-slice) image)
-                   image))))
+                     image)))))
 
 (defun doc-view-sort (a b)
   "Return non-nil if A should be sorted before B.
@@ -952,9 +964,12 @@
          (file-name-nondirectory
           (file-name-sans-extension buffer-file-name))
          doc-view-cache-directory))
-       ((or
-         (not (file-exists-p buffer-file-name))
-         (file-remote-p buffer-file-name))
+        ;; Is the file readable by local processes?
+        ;; We used to use `file-remote-p' but it's unclear what it's
+        ;; supposed to return nil for things like local files accessed via
+        ;; `su' or via file://...
+       ((let ((file-name-handler-alist nil))
+           (not (file-readable-p buffer-file-name)))
         (expand-file-name
          (file-name-nondirectory buffer-file-name)
          doc-view-cache-directory))