Changed requirements section to tell that only one

of dvipdf or dvipdfm is needed.
(doc-view-already-converted-p): Fix bug that forced reconversion
if doc was already converted.

2 files changed, 11 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc9ee1d1f7a..5607a501ef3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-15  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * doc-view.el: Changed requirements section to tell that only one
+        of dvipdf or dvipdfm is needed.
+        (doc-view-already-converted-p): Fix bug that forced reconversion
+        if doc was already converted.
+
 2008-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuffer.el (minibuffer-message): Make sure we can put-text-property.
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 4e095c0e676..834c661af43 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -26,8 +26,9 @@
 ;;; Requirements:
 
 ;; doc-view.el requires GNU Emacs 22.1 or newer.  You also need Ghostscript,
-;; `dvipdfm' which comes with teTeX and `pdftotext', which comes with xpdf
-;; (http://www.foolabs.com/xpdf/) or poppler (http://poppler.freedesktop.org/).
+;; `dvipdf' (comes with Ghostscript) or `dvipdfm' (comes with teTeX or TeXLive)
+;; and `pdftotext', which comes with xpdf (http://www.foolabs.com/xpdf/) or
+;; poppler (http://poppler.freedesktop.org/).
 
 ;;; Commentary:
 
@@ -1026,7 +1027,7 @@ If BACKWARD is non-nil, jump to the previous match."
 (defun doc-view-already-converted-p ()
   "Return non-nil if the current doc was already converted."
   (and (file-exists-p (doc-view-current-cache-dir))
-       (> 0 (length (directory-files (doc-view-current-cache-dir) nil "\\.png$")))))
+       (> (length (directory-files (doc-view-current-cache-dir) nil "\\.png$")) 0)))
 
 (defun doc-view-initiate-display ()
   ;; Switch to image display if possible