(doc-view-doc->txt, doc-view-convert-current-doc):

Create cache dir only if it doesn't already exist.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d3a16bde9b53b6227e7f2fce61e05d9e2d633f9..93edc4addcd65ad1f368890bd604b0844ad57ac9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-13  Tassilo Horn  <tassilo@member.fsf.org>
+
+       * doc-view.el (doc-view-doc->txt, doc-view-convert-current-doc):
+       Create cache dir only if it doesn't already exist.
+
 2008-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/sh-script.el (sh-font-lock-quoted-subshell): Fix handling

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 0ffc0471024a58d0fe857aa7ba4ed394795c3998..8c5fad4c3f0ccc8889a5463271ded59947f60061 100644 (file)
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -600,7 +600,8 @@ Should be invoked when the cached images aren't up-to-date."
 
 (defun doc-view-doc->txt (txt callback)
   "Convert the current document to text and call CALLBACK when done."
-  (make-directory (doc-view-current-cache-dir))
+  (unless (file-exists-p (doc-view-current-cache-dir))
+    (make-directory (doc-view-current-cache-dir)))
   (case doc-view-doc-type
     (pdf
      ;; Doc is a PDF, so convert it to TXT
@@ -649,7 +650,8 @@ Those files are saved in the directory given by the function
   (setq doc-view-pending-cache-flush t)
   (let ((png-file (expand-file-name "page-%d.png"
                                     (doc-view-current-cache-dir))))
-    (make-directory (doc-view-current-cache-dir))
+    (unless (file-exists-p (doc-view-current-cache-dir))
+      (make-directory (doc-view-current-cache-dir)))
     (case doc-view-doc-type
       (dvi
        ;; DVI files have to be converted to PDF before Ghostscript can process
@@ -1036,7 +1038,7 @@ toggle between displaying the document or editing it as text.
                            name-types content-types))
                   name-types content-types
                   (error "Cannot determine the document type")))))
-                  
+
   (doc-view-make-safe-dir doc-view-cache-directory)
   ;; Handle compressed files, remote files, files inside archives
   (set (make-local-variable 'doc-view-buffer-file-name)