summaryrefslogtreecommitdiff
path: root/lisp/doc-view.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-11-13 09:00:26 -0800
committerGlenn Morris <rgm@gnu.org>2020-11-13 09:00:26 -0800
commitd4e436e080e2157b7bc3353ca8d1cfcf1e17c79c (patch)
tree726755bd30c3428974a4e8926c9ab90dfb0e5761 /lisp/doc-view.el
parent3d14ec52fbdc7162df56bcab70d330e061f9ca51 (diff)
parentac1a2b216089b03c244c8e7ceb577198eb0dc2c2 (diff)
downloademacs-d4e436e080e2157b7bc3353ca8d1cfcf1e17c79c.tar.gz
emacs-d4e436e080e2157b7bc3353ca8d1cfcf1e17c79c.tar.bz2
emacs-d4e436e080e2157b7bc3353ca8d1cfcf1e17c79c.zip
Merge from origin/emacs-27
ac1a2b2160 Add more doc-view requirements 109eb1e7e2 Fix undefined behavior when fetching glyphs from the displ... # Conflicts: # lisp/doc-view.el
Diffstat (limited to 'lisp/doc-view.el')
-rw-r--r--lisp/doc-view.el10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 73483b25796..9997c1ae7b8 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -22,10 +22,12 @@
;;; Requirements:
-;; doc-view.el requires GNU Emacs 22.1 or newer. You also need Ghostscript,
-;; `dvipdf' (comes with Ghostscript) or `dvipdfm' (comes with teTeX or TeXLive)
-;; and `pdftotext', which comes with xpdf (https://www.foolabs.com/xpdf/) or
-;; poppler (https://poppler.freedesktop.org/).
+;; Viewing PS/PDF/DVI files requires Ghostscript, `dvipdf' (comes with
+;; Ghostscript) or `dvipdfm' (comes with teTeX or TeXLive) and
+;; `pdftotext', which comes with xpdf (https://www.foolabs.com/xpdf/)
+;; or poppler (https://poppler.freedesktop.org/).
+;; Djvu documents require `ddjvu' (from DjVuLibre).
+;; ODF files require `soffice' (from LibreOffice).
;;; Commentary: