* doc-view.el (doc-view-mode-p): Check for png or imagemagick

image backend support.  Either of them is fine.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2df31ccbe7e3596b8de06ef8d94d61ff920804b7..7823c36e3788f01ce61f06bbac81b77c33968498 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-08  Tassilo Horn  <tassilo@member.fsf.org>
+
+       * doc-view.el (doc-view-mode-p): Check for png or imagemagick
+       image backend support.  Either of them is fine.
+
 2011-01-08  Chong Yidong  <cyd@stupidchicken.com>
 
        * subr.el (y-or-n-p): Doc fix.

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index fce3597409c719448e0a9a85e19481ed3a48c3d2..636f78031faa83ecaba6356c94a16866f6eae95c 100644 (file)
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -621,7 +621,8 @@ It's a subdirectory of `doc-view-cache-directory'."
 Document types are symbols like `dvi', `ps', `pdf', or `odf' (any
 OpenDocument format)."
   (and (display-graphic-p)
-       (image-type-available-p 'png)
+       (or (image-type-available-p 'imagemagick)
+          (image-type-available-p 'png))
        (cond
        ((eq type 'dvi)
         (and (doc-view-mode-p 'pdf)