From: Lars Ingebrigtsen Date: Fri, 28 Jan 2022 13:47:15 +0000 (+0100) Subject: Fix merge error in doc-view-pdf/ps->png X-Git-Tag: emacs-29.0.90~2689 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ba197a163ddf4002253d7b9a26fb28076e1cef7;p=emacs.git Fix merge error in doc-view-pdf/ps->png * lisp/doc-view.el (doc-view-pdf/ps->png): Fix merge error from previous epub patch. --- diff --git a/lisp/doc-view.el b/lisp/doc-view.el index b222096ac68..4979a2c0e24 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -1217,7 +1217,8 @@ is named like ODF with the extension turned to pdf." "Convert PDF-PS to PNG asynchronously." (funcall (pcase doc-view-doc-type - ((or 'pdf 'odf) doc-view-pdf->png-converter-function) + ((or 'pdf 'odf 'epub 'cbz 'fb2 'xps 'oxps) + doc-view-pdf->png-converter-function) ('djvu #'doc-view-djvu->tiff-converter-ddjvu) (_ #'doc-view-ps->png-converter-ghostscript)) pdf-ps png nil