diff options
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/doc-view.el | 7 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f74abc427af..da239252f7e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2013-01-10 Elias Pipping <pipping@exherbo.org> + + * files.el (auto-mode-alist): Use doc-view for djvu files (bug#13164). + * doc-view.el (doc-view-document->bitmap): + Use doc-view-single-page-converter-function instead of + single-page-converter arg; adjust callers. + 2013-01-10 Feng Li <fengli@gmail.com> (tiny change) * progmodes/which-func.el (which-function): Understand Semantic's use 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))))) diff --git a/lisp/files.el b/lisp/files.el index ca5a415fb8e..b015b53db3c 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2357,7 +2357,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode) ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MSDOG ("\\.[eE]?[pP][sS]\\'" . ps-mode) - ("\\.\\(?:PDF\\|DVI\\|OD[FGPST]\\|DOCX?\\|XLSX?\\|PPTX?\\|pdf\\|dvi\\|od[fgpst]\\|docx?\\|xlsx?\\|pptx?\\)\\'" . doc-view-mode-maybe) + ("\\.\\(?:PDF\\|DVI\\|OD[FGPST]\\|DOCX?\\|XLSX?\\|PPTX?\\|pdf\\|djvu\\|dvi\\|od[fgpst]\\|docx?\\|xlsx?\\|pptx?\\)\\'" . doc-view-mode-maybe) ("configure\\.\\(ac\\|in\\)\\'" . autoconf-mode) ("\\.s\\(v\\|iv\\|ieve\\)\\'" . sieve-mode) ("BROWSE\\'" . ebrowse-tree-mode) |