summaryrefslogtreecommitdiff
path: root/lisp/doc-view.el
diff options
context:
space:
mode:
authorElias Pipping <pipping@exherbo.org>2013-01-10 10:50:04 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2013-01-10 10:50:04 -0500
commit72781fefa6c91b51e44e7faed4b8792fbd65f345 (patch)
tree027773bfb2de039e24aa39291afd19160c04eff9 /lisp/doc-view.el
parente6ed8f08460d9bc9af7109c5a8619b3d1d407bdf (diff)
downloademacs-72781fefa6c91b51e44e7faed4b8792fbd65f345.tar.gz
* lisp/files.el (auto-mode-alist): Use doc-view for djvu files.
* lisp/doc-view.el (doc-view-document->bitmap): Use doc-view-single-page-converter-function instead of single-page-converter arg; adjust callers. Fixes: debbugs:13164
Diffstat (limited to 'lisp/doc-view.el')
-rw-r--r--lisp/doc-view.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 9748a5f5f72..fa54eef828d 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -942,7 +942,7 @@ is named like ODF with the extension turned to pdf."
(declare-function clear-image-cache "image.c" (&optional filter))
-(defun doc-view-document->bitmap (pdf png pages single-page-converter)
+(defun doc-view-document->bitmap (pdf png pages)
"Convert a document file to bitmap images asynchronously.
Start by converting PAGES, and then the rest."
(if (null pages)
@@ -952,7 +952,7 @@ Start by converting PAGES, and then the rest."
;; a single page anyway, and of the remaining 1%, few cases will have
;; consecutive pages, it's not worth the trouble.
(let ((rest (cdr pages)))
- (funcall single-page-converter
+ (funcall doc-view-single-page-converter-function
pdf (format png (car pages)) (car pages)
(lambda ()
(if rest
@@ -1066,8 +1066,7 @@ Those files are saved in the directory given by the function
((or `pdf `djvu)
(let ((pages (doc-view-active-pages)))
;; Convert doc to bitmap images starting with the active pages.
- (doc-view-document->bitmap doc-view-buffer-file-name png-file pages
- doc-view-single-page-converter-function)))
+ (doc-view-document->bitmap doc-view-buffer-file-name png-file pages)))
(_
;; Convert to PNG images.
(doc-view-pdf/ps->png doc-view-buffer-file-name png-file)))))