[Emacs-diffs] /srv/bzr/emacs/trunk r102726: * doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS Office) files also for searching.

[Tassilo Horn]

------------------------------------------------------------
revno: 102726
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Thu 2010-12-30 14:53:22 +0100
message:
  * doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS Office) files 
also for searching.
modified:
  lisp/ChangeLog
  lisp/doc-view.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-30 13:45:09 +0000
+++ b/lisp/ChangeLog    2010-12-30 13:53:22 +0000
@@ -1,5 +1,10 @@
 2010-12-30  Tassilo Horn  <address@hidden>
 
+       * doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS
+       Office) files also for searching.
+
+2010-12-30  Tassilo Horn  <address@hidden>
+
        * doc-view.el: Implement viewing of OpenDocument (and Microsoft
        Office) files.  Not yet enabled via auto-mode-list.
        (doc-view-unoconv-program): New custom variable.

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2010-12-30 13:45:09 +0000
+++ b/lisp/doc-view.el  2010-12-30 13:53:22 +0000
@@ -813,6 +813,12 @@
      (doc-view-pdf->txt (expand-file-name "doc.pdf"
                                           (doc-view-current-cache-dir))
                         txt callback))
+    (odf
+     ;; Doc is some ODF (or MS Office) doc.  This means that a doc.pdf
+     ;; already exists in its cache subdirectory.
+     (doc-view-pdf->txt (expand-file-name "doc.pdf"
+                                          (doc-view-current-cache-dir))
+                        txt callback))
     (t (error "DocView doesn't know what to do"))))
 
 (defun doc-view-ps->pdf (ps pdf callback)