[Emacs-diffs] /srv/bzr/emacs/trunk r111475: * lisp/files.el (auto-mode-alist): Use doc-view for djvu files.

[Stefan Monnier]

------------------------------------------------------------
revno: 111475
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13164
author: Elias Pipping <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-01-10 10:50:04 -0500
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/doc-view.el
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-10 15:36:01 +0000
+++ b/lisp/ChangeLog    2013-01-10 15:50:04 +0000
@@ -1,3 +1,10 @@
+2013-01-10  Elias Pipping  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * progmodes/which-func.el (which-function): Understand Semantic's use

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2013-01-10 05:05:24 +0000
+++ b/lisp/doc-view.el  2013-01-10 15:50:04 +0000
@@ -942,7 +942,7 @@
 
 (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 @@
     ;; 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 @@
       ((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)))))

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2013-01-04 02:53:48 +0000
+++ b/lisp/files.el     2013-01-10 15:50:04 +0000
@@ -2357,7 +2357,7 @@
      ("\\.\\(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)