changeset 112167:40ab7b8eb7a4

* doc-view.el (doc-view-mode-p): Check for png or imagemagick image backend support. Either of them is fine.
author Tassilo Horn <tassilo@member.fsf.org>
date Sat, 08 Jan 2011 23:57:07 +0100
parents 81b6e1261c36
children 744d9787c683
files lisp/ChangeLog lisp/doc-view.el
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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)