diff options
| author | Joakim Verona | 2013-08-23 16:42:37 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-23 16:42:37 +0200 |
| commit | f909b7cfa7ccac86db11ea8698d01b167a7f37d6 (patch) | |
| tree | f0e9593932db1cd32000337ff00699859a155c37 /src/ChangeLog | |
| parent | 95a60dc06b2d05485a702e62ee00834a71753922 (diff) | |
| parent | 6c6014d4cc93c33a964acd246e792e1bd73f910d (diff) | |
| download | emacs-f909b7cfa7ccac86db11ea8698d01b167a7f37d6.tar.gz emacs-f909b7cfa7ccac86db11ea8698d01b167a7f37d6.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e252e4a2f4f..bee477c745a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-23 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (handle_face_prop): If the default face was remapped use | ||
| 4 | the remapped face for strings from prefix properties. (Bug#15155) | ||
| 5 | |||
| 1 | 2013-08-23 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2013-08-23 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Minor cleanup for redisplay interface and few related functions. | 8 | Minor cleanup for redisplay interface and few related functions. |