From: Glenn Morris <rgm@gnu.org>
Date: Fri, 13 Nov 2020 17:00:26 +0000 (-0800)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~5165
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4e436e080e2157b7bc3353ca8d1cfcf1e17c79c;p=emacs.git

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

d4e436e080e2157b7bc3353ca8d1cfcf1e17c79c
diff --cc lisp/doc-view.el
index 73483b25796,b895377f8dc..9997c1ae7b8
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@@ -22,10 -22,12 +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 (http://www.foolabs.com/xpdf/)
 -;; or poppler (http://poppler.freedesktop.org/).
++;; `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: