procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-27

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
lisp/doc-view.el
View file

@ -22,10 +22,12 @@
;;; Requirements: ;;; Requirements:
;; doc-view.el requires GNU Emacs 22.1 or newer. You also need Ghostscript, ;; Viewing PS/PDF/DVI files requires Ghostscript, `dvipdf' (comes with
;; `dvipdf' (comes with Ghostscript) or `dvipdfm' (comes with teTeX or TeXLive) ;; Ghostscript) or `dvipdfm' (comes with teTeX or TeXLive) and
;; and `pdftotext', which comes with xpdf (https://www.foolabs.com/xpdf/) or ;; `pdftotext', which comes with xpdf (https://www.foolabs.com/xpdf/)
;; poppler (https://poppler.freedesktop.org/). ;; or poppler (https://poppler.freedesktop.org/).
;; Djvu documents require `ddjvu' (from DjVuLibre).
;; ODF files require `soffice' (from LibreOffice).
;;; Commentary: ;;; Commentary:

4
src/xdisp.c
View file

@ -8324,8 +8324,8 @@ next_element_from_display_vector (struct it *it)
next_face_id = it->dpvec_face_id; next_face_id = it->dpvec_face_id;
else else
{ {
int lface_id = Lisp_Object gc = it->dpvec[it->current.dpvec_index + 1];
GLYPH_CODE_FACE (it->dpvec[it->current.dpvec_index + 1]); int lface_id = GLYPH_CODE_P (gc) ? GLYPH_CODE_FACE (gc) : 0;
if (lface_id > 0) if (lface_id > 0)
next_face_id = merge_faces (it->w, Qt, lface_id, next_face_id = merge_faces (it->w, Qt, lface_id,