]> git.eshelyaron.com Git - emacs.git/commitdiff
* doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS Office) files also...
authorTassilo Horn <tassilo@member.fsf.org>
Thu, 30 Dec 2010 13:53:22 +0000 (14:53 +0100)
committerTassilo Horn <tassilo@member.fsf.org>
Thu, 30 Dec 2010 13:53:22 +0000 (14:53 +0100)
lisp/ChangeLog
lisp/doc-view.el

index e86f316ac22a3081183f000626c9d8e8cf069dcc..8717bb441b72bbcc2c82fd51146a44e4991ccfd9 100644 (file)
@@ -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
index 9d0f6a3af6336c101d9b4ce98c49a546a7c7643e..9f5826484e585540a9a35352b02eff7a6a0ce01c 100644 (file)
@@ -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)