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
This commit is contained in:
Glenn Morris 2020-11-13 09:00:26 -08:00
commit d4e436e080
2 changed files with 9 additions and 7 deletions

View file

@ -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: