From: Tassilo Horn <tassilo@member.fsf.org>
Date: Sat, 8 Jan 2011 22:57:07 +0000 (+0100)
Subject: * doc-view.el (doc-view-mode-p): Check for png or imagemagick
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~239^2~27
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c44d54b34f92eee175957a548becf9f63a81eaef;p=emacs.git

* 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 2df31ccbe7e..7823c36e378 100644
--- 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 fce3597409c..636f78031fa 100644
--- 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)