From d0af9f775a5bc9adec00a0e1de43f809852ae247 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 28 Oct 2011 20:39:57 -0400 Subject: [PATCH] * lisp/doc-view.el: Avoid ugly errors about not finding nil. (doc-view-ghostscript-program, doc-view-dvipdfm-program) (doc-view-dvipdf-program, doc-view-unoconv-program) (doc-view-ps2pdf-program, doc-view-pdftotext-program): Avoid nil or absolute file name as default value. (doc-view-pdf->txt, doc-view-ps->pdf): Use executable-find here. --- lisp/ChangeLog | 21 +++++++++++++++------ lisp/doc-view.el | 16 ++++++++-------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 44f39383139..4fd8422108e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2011-10-28 Stefan Monnier + + * doc-view.el: Avoid ugly errors about not finding nil. + (doc-view-ghostscript-program, doc-view-dvipdfm-program) + (doc-view-dvipdf-program, doc-view-unoconv-program) + (doc-view-ps2pdf-program, doc-view-pdftotext-program): + Avoid nil or absolute file name as default value. + (doc-view-pdf->txt, doc-view-ps->pdf): Use executable-find here. + 2011-10-28 Alan Mackenzie * progmodes/cc-defs.el (c-version). -> 5.32.2. @@ -14,8 +23,8 @@ cc-vars.el. (c-nonlabel-token-2-key): New variable for change in cc-engine.el. - * progmodes/cc-engine.el (c-beginning-of-statement-1): Prevent - "class foo : bar" being spuriously recognized as a label. + * progmodes/cc-engine.el (c-beginning-of-statement-1): + Prevent "class foo : bar" being spuriously recognized as a label. * progmodes/cc-cmds.el (c-narrow-to-most-enclosing-decl-block): Add parameter `inclusive' (to include enclosing braces in the @@ -39,8 +48,8 @@ * progmodes/cc-defs.el: Update "virtual semicolon" comments. - * progmodes/cc-engine.el (c-crosses-statement-barrier-p): Recoded - to scan one line at at time rather than having \n and \r + * progmodes/cc-engine.el (c-crosses-statement-barrier-p): + Recoded to scan one line at at time rather than having \n and \r explicitly in c-stmt-delim-chars (for some modes, e.g. AWK). (c-forward-label): Amend for virtual semicolons. @@ -56,8 +65,8 @@ (c-stmt-delim-chars, c-stmt-delim-chars-with-comma): Special value for AWK Mode (including \n, \r) removed, no longer needed. - * progmodes/cc-mode.el (c-mode, c++-mode, objc-mode): Invoke - c-make-macro-with-semi-re. + * progmodes/cc-mode.el (c-mode, c++-mode, objc-mode): + Invoke c-make-macro-with-semi-re. * progmodes/cc-vars.el (c-macro-with-semi-re): (c-macro-names-with-semicolon): New variables. diff --git a/lisp/doc-view.el b/lisp/doc-view.el index ceaad83cd7c..d16d8c6f62d 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -149,7 +149,7 @@ :group 'multimedia :prefix "doc-view-") -(defcustom doc-view-ghostscript-program (executable-find "gs") +(defcustom doc-view-ghostscript-program "gs" "Program to convert PS and PDF files to PNG." :type 'file :group 'doc-view) @@ -175,7 +175,7 @@ Has only an effect if imagemagick support is compiled into emacs." :type 'number :group 'doc-view) -(defcustom doc-view-dvipdfm-program (executable-find "dvipdfm") +(defcustom doc-view-dvipdfm-program "dvipdfm" "Program to convert DVI files to PDF. DVI file will be converted to PDF before the resulting PDF is @@ -186,7 +186,7 @@ If this and `doc-view-dvipdf-program' are set, :type 'file :group 'doc-view) -(defcustom doc-view-dvipdf-program (executable-find "dvipdf") +(defcustom doc-view-dvipdf-program "dvipdf" "Program to convert DVI files to PDF. DVI file will be converted to PDF before the resulting PDF is @@ -197,21 +197,21 @@ If this and `doc-view-dvipdfm-program' are set, :type 'file :group 'doc-view) -(defcustom doc-view-unoconv-program (executable-find "unoconv") +(defcustom doc-view-unoconv-program "unoconv" "Program to convert any file type readable by OpenOffice.org to PDF. Needed for viewing OpenOffice.org (and MS Office) files." :type 'file :group 'doc-view) -(defcustom doc-view-ps2pdf-program (executable-find "ps2pdf") +(defcustom doc-view-ps2pdf-program "ps2pdf" "Program to convert PS files to PDF. PS files will be converted to PDF before searching is possible." :type 'file :group 'doc-view) -(defcustom doc-view-pdftotext-program (executable-find "pdftotext") +(defcustom doc-view-pdftotext-program "pdftotext" "Program to convert PDF files to plain text. Needed for searching." @@ -881,7 +881,7 @@ Start by converting PAGES, and then the rest." (defun doc-view-pdf->txt (pdf txt callback) "Convert PDF to TXT asynchronously and call CALLBACK when finished." - (or doc-view-pdftotext-program + (or (executable-find doc-view-pdftotext-program) (error "You need the `pdftotext' program to convert a PDF to text")) (doc-view-start-process "pdf->txt" doc-view-pdftotext-program (list "-raw" pdf txt) @@ -917,7 +917,7 @@ Start by converting PAGES, and then the rest." (defun doc-view-ps->pdf (ps pdf callback) "Convert PS to PDF asynchronously and call CALLBACK when finished." - (or doc-view-ps2pdf-program + (or (executable-find doc-view-ps2pdf-program) (error "You need the `ps2pdf' program to convert PS to PDF")) (doc-view-start-process "ps->pdf" doc-view-ps2pdf-program (list -- 2.39.5