# HG changeset patch
# User Tassilo Horn <tassilo@member.fsf.org>
# Date 1294527427 -3600
# Node ID 40ab7b8eb7a4e7dc7d8226621a41c7c7a40f9616
# Parent  81b6e1261c36fdda9db67556c971fbccebf9b60b
* doc-view.el (doc-view-mode-p): Check for png or imagemagick
image backend support.  Either of them is fine.

diff -r 81b6e1261c36 -r 40ab7b8eb7a4 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 08 16:22:19 2011 -0500
+++ b/lisp/ChangeLog	Sat Jan 08 23:57:07 2011 +0100
@@ -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 -r 81b6e1261c36 -r 40ab7b8eb7a4 lisp/doc-view.el
--- a/lisp/doc-view.el	Sat Jan 08 16:22:19 2011 -0500
+++ b/lisp/doc-view.el	Sat Jan 08 23:57:07 2011 +0100
@@ -621,7 +621,8 @@
 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)