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

diff --cc lisp/doc-view.el
index 73483b25796583801dc1b853d5f3a6eccb417904,b895377f8dcd4b73c18abe41a93d6a5a9d1e8998..9997c1ae7b80adfd8201ff55d9e22d33cdf1c3c9
--- 1/lisp/doc-view.el
--- 2/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:
  

diff --cc src/xdisp.c
Simple merge