diff options
| author | Joakim Verona | 2013-08-15 17:32:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-15 17:32:29 +0200 |
| commit | a2125dbbe302d08c182ae8878077e2b288efe4fd (patch) | |
| tree | fcad20861e230bb9cc4c64352258d4148c4e2428 /src/ChangeLog | |
| parent | 98f2993e4d15fc5b57cdbe212634527c630b919d (diff) | |
| parent | 0542623943803e346aec839369e399e4b0ff43ad (diff) | |
| download | emacs-a2125dbbe302d08c182ae8878077e2b288efe4fd.tar.gz emacs-a2125dbbe302d08c182ae8878077e2b288efe4fd.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1a83531ad10..77c37864b00 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | visible character of the display line. This avoids funky | 6 | visible character of the display line. This avoids funky |
| 7 | horizontal shifting because the window start is not kept on the | 7 | horizontal shifting because the window start is not kept on the |
| 8 | same position. (Bug#15090) | 8 | same position. (Bug#15090) |
| 9 | (next_element_from_display_vector): Support 'box' face attribute | ||
| 10 | in the face definitions of a display vector. (Bug#15099) | ||
| 9 | 11 | ||
| 10 | 2013-08-15 Lars Magne Ingebrigtsen <larsi@gnus.org> | 12 | 2013-08-15 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 11 | 13 | ||