diff options
| author | Tassilo Horn <tassilo@member.fsf.org> | 2011-01-08 23:57:07 +0100 |
|---|---|---|
| committer | Tassilo Horn <tassilo@member.fsf.org> | 2011-01-08 23:57:07 +0100 |
| commit | c44d54b34f92eee175957a548becf9f63a81eaef (patch) | |
| tree | 8a152ca3652ab298896c63c70142b1962a1f8384 | |
| parent | 2b9f65621bbd3565a402a17ece337352c10f1488 (diff) | |
| download | emacs-c44d54b34f92eee175957a548becf9f63a81eaef.tar.gz emacs-c44d54b34f92eee175957a548becf9f63a81eaef.tar.bz2 emacs-c44d54b34f92eee175957a548becf9f63a81eaef.zip | |
* doc-view.el (doc-view-mode-p): Check for png or imagemagick
image backend support. Either of them is fine.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/doc-view.el | 3 |
2 files changed, 7 insertions, 1 deletions
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) |