diff options
| author | Glenn Morris | 2020-11-13 09:00:26 -0800 |
|---|---|---|
| committer | Glenn Morris | 2020-11-13 09:00:26 -0800 |
| commit | d4e436e080e2157b7bc3353ca8d1cfcf1e17c79c (patch) | |
| tree | 726755bd30c3428974a4e8926c9ab90dfb0e5761 /src | |
| parent | 3d14ec52fbdc7162df56bcab70d330e061f9ca51 (diff) | |
| parent | ac1a2b216089b03c244c8e7ceb577198eb0dc2c2 (diff) | |
| download | emacs-d4e436e080e2157b7bc3353ca8d1cfcf1e17c79c.tar.gz 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 'src')
| -rw-r--r-- | src/xdisp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 32486eaa37b..2344fe70601 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -8324,10 +8324,10 @@ next_element_from_display_vector (struct it *it) | |||
| 8324 | next_face_id = it->dpvec_face_id; | 8324 | next_face_id = it->dpvec_face_id; |
| 8325 | else | 8325 | else |
| 8326 | { | 8326 | { |
| 8327 | int lface_id = | 8327 | Lisp_Object gc = it->dpvec[it->current.dpvec_index + 1]; |
| 8328 | GLYPH_CODE_FACE (it->dpvec[it->current.dpvec_index + 1]); | 8328 | int lface_id = GLYPH_CODE_P (gc) ? GLYPH_CODE_FACE (gc) : 0; |
| 8329 | 8329 | ||
| 8330 | if (lface_id > 0) | 8330 | if (lface_id > 0) |
| 8331 | next_face_id = merge_faces (it->w, Qt, lface_id, | 8331 | next_face_id = merge_faces (it->w, Qt, lface_id, |
| 8332 | it->saved_face_id); | 8332 | it->saved_face_id); |
| 8333 | } | 8333 | } |