diff options
| author | Joakim Verona | 2013-08-24 18:18:46 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-24 18:18:46 +0200 |
| commit | b8e2acdd013a259b64c97292d229d78e9da2e3cd (patch) | |
| tree | b0bbe7abe5318a1d8b5c62f2269c51605e6ce1a2 | |
| parent | 8131fcfd622dd2b7fccf09b0f6a1c3f4747619a7 (diff) | |
| parent | 6dc695d1e31fe51e6f15993d998540875b3ae881 (diff) | |
| download | emacs-b8e2acdd013a259b64c97292d229d78e9da2e3cd.tar.gz emacs-b8e2acdd013a259b64c97292d229d78e9da2e3cd.zip | |
merge from trunk
| -rw-r--r-- | src/xdisp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 67d386a93e2..3879fa37242 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -7090,6 +7090,8 @@ get_next_display_element (struct it *it) | |||
| 7090 | } | 7090 | } |
| 7091 | } | 7091 | } |
| 7092 | } | 7092 | } |
| 7093 | /* next_element_from_display_vector sets this flag according to | ||
| 7094 | faces of the display vector glyphs, see there. */ | ||
| 7093 | else if (it->method != GET_FROM_DISPLAY_VECTOR) | 7095 | else if (it->method != GET_FROM_DISPLAY_VECTOR) |
| 7094 | { | 7096 | { |
| 7095 | int face_id = face_after_it_pos (it); | 7097 | int face_id = face_after_it_pos (it); |