From: Tassilo Horn <tassilo@member.fsf.org>
Date: Thu, 30 Dec 2010 13:53:22 +0000 (+0100)
Subject: * doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS Office) files also... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~278^2~46
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b71b7803226e0214d235e6ab4d8fab1e873571ae;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e86f316ac22..8717bb441b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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
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)