* doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS Office) files also for searching.

2 files changed, 11 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e86f316ac22..8717bb441b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
 
+        * doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS
+        Office) files also for searching.
+
+2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
+
         * 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.
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 9d0f6a3af63..9f5826484e5 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -813,6 +813,12 @@ Start by converting PAGES, and then the rest."
      (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)