[Emacs-diffs] /srv/bzr/emacs/trunk r102796: * doc-view.el (doc-view-mode-p): Check for png or imagemagick

[Tassilo Horn]

------------------------------------------------------------
revno: 102796
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-08 23:57:07 +0100
message:
  * doc-view.el (doc-view-mode-p): Check for png or imagemagick
  image backend support.  Either of them is fine.
modified:
  lisp/ChangeLog
  lisp/doc-view.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-08 21:17:58 +0000
+++ b/lisp/ChangeLog    2011-01-08 22:57:07 +0000
@@ -1,3 +1,8 @@
+2011-01-08  Tassilo Horn  <address@hidden>
+
+       * 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  <address@hidden>
 
        * subr.el (y-or-n-p): Doc fix.

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2011-01-05 21:54:23 +0000
+++ b/lisp/doc-view.el  2011-01-08 22:57:07 +0000
@@ -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)