diff options
| author | Eli Zaretskii | 2014-02-27 19:42:00 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2014-02-27 19:42:00 +0200 |
| commit | 11de63ede082fe5913f9714f4bba05ac6e6b984c (patch) | |
| tree | 0b015bd6df7141b1b283857336ba82bbca3cb344 /src/ChangeLog | |
| parent | 79fc11918a932cfa20abf489267f4d88b48c7bd1 (diff) | |
| download | emacs-11de63ede082fe5913f9714f4bba05ac6e6b984c.tar.gz emacs-11de63ede082fe5913f9714f4bba05ac6e6b984c.zip | |
Fix bug #16870 with 'box' face in display strings.
src/xdisp.c (pop_it): Restore the it->face_box_p flag which could be
reset by the face of the object just displayed. See also bug#76.
(get_next_display_element): If the string came from a display
property, examine the box face attribute at it->position, not at
it->current.pos, since the latter was not updated yet.
(handle_face_prop): Improve commentary.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 88458de6b01..5850431cf93 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2014-02-27 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (pop_it): Restore the it->face_box_p flag which could be | ||
| 4 | reset by the face of the object just displayed. See also bug#76. | ||
| 5 | (get_next_display_element): If the string came from a display | ||
| 6 | property, examine the box face attribute at it->position, not at | ||
| 7 | it->current.pos, since the latter was not updated yet. (Bug#16870) | ||
| 8 | (handle_face_prop): Improve commentary. | ||
| 9 | |||
| 1 | 2014-02-27 Michael Albinus <michael.albinus@gmx.de> | 10 | 2014-02-27 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 11 | ||
| 3 | * dbusbind.c (Fdbus__init_bus, Qdbus__init_bus, Sdbus__init_bus): | 12 | * dbusbind.c (Fdbus__init_bus, Qdbus__init_bus, Sdbus__init_bus): |