[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 50e913c9569: Fix a couple of doc-view user options
From: |
Basil L. Contovounesios |
Subject: |
master 50e913c9569: Fix a couple of doc-view user options |
Date: |
Mon, 25 Sep 2023 15:46:26 -0400 (EDT) |
branch: master
commit 50e913c956924fe7b6799ed1d42e02a707b83eb6
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>
Fix a couple of doc-view user options
* lisp/doc-view.el (doc-view-pdf->png-converter-function): Fix
placement and formatting of function-item :doc strings.
(doc-view-odf->pdf-converter-program): Ditto. Tweak initialization
logic to ensure initial value is non-nil and matches :type. Mention
preferred executable soffice first.
(doc-view-mode-p): Assume doc-view-odf->pdf-converter-program is
always non-nil.
---
lisp/doc-view.el | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index b856b09c8b7..a2ad4660f73 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -204,10 +204,10 @@ are available (see Info node `(emacs)Document View')."
#'doc-view-pdf->png-converter-ghostscript)
"Function to call to convert a PDF file into a PNG file."
:type '(radio
- (function-item doc-view-pdf->png-converter-ghostscript
- :doc "Use ghostscript")
- (function-item doc-view-pdf->png-converter-mupdf
- :doc "Use mupdf")
+ (function-item :doc "Use Ghostscript"
+ doc-view-pdf->png-converter-ghostscript)
+ (function-item :doc "Use MuPDF"
+ doc-view-pdf->png-converter-mupdf)
function)
:version "24.4")
@@ -375,17 +375,15 @@ Needed for viewing OpenOffice.org (and MS Office) files."
:type 'file)
(defcustom doc-view-odf->pdf-converter-function
- (cond
- ((string-match "unoconv\\'" doc-view-odf->pdf-converter-program)
- #'doc-view-odf->pdf-converter-unoconv)
- ((string-match "soffice\\'" doc-view-odf->pdf-converter-program)
- #'doc-view-odf->pdf-converter-soffice))
- "Function to call to convert a ODF file into a PDF file."
+ (if (string-suffix-p "unoconv" doc-view-odf->pdf-converter-program)
+ #'doc-view-odf->pdf-converter-unoconv
+ #'doc-view-odf->pdf-converter-soffice)
+ "Function to call to convert an ODF file into a PDF file."
:type '(radio
- (function-item doc-view-odf->pdf-converter-unoconv
- :doc "Use unoconv")
- (function-item doc-view-odf->pdf-converter-soffice
- :doc "Use LibreOffice")
+ (function-item :doc "Use LibreOffice"
+ doc-view-odf->pdf-converter-soffice)
+ (function-item :doc "Use unoconv"
+ doc-view-odf->pdf-converter-unoconv)
function)
:version "24.4")
@@ -940,8 +938,7 @@ Document types are symbols like `dvi', `ps', `pdf', `epub',
(and doc-view-pdfdraw-program
(executable-find doc-view-pdfdraw-program)))))
((eq type 'odf)
- (and doc-view-odf->pdf-converter-program
- (executable-find doc-view-odf->pdf-converter-program)
+ (and (executable-find doc-view-odf->pdf-converter-program)
(doc-view-mode-p 'pdf)))
((eq type 'djvu)
(executable-find "ddjvu"))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 50e913c9569: Fix a couple of doc-view user options,
Basil L. Contovounesios <=