diff options
| author | Joakim Verona | 2013-08-13 10:51:44 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 10:51:44 +0200 |
| commit | 6eb8619434f2278f3e56663bc7bbb31043b6146b (patch) | |
| tree | f89b07d3ad81baaeed1ce399739acda5c626c0c2 /src/ChangeLog | |
| parent | 8cd462fd025ea06895b9e4508c869b61d6be28d3 (diff) | |
| parent | e4375ca7e087cb2ad74f0a3b9fb893500837f9c3 (diff) | |
| download | emacs-6eb8619434f2278f3e56663bc7bbb31043b6146b.tar.gz emacs-6eb8619434f2278f3e56663bc7bbb31043b6146b.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 74af248575a..6a3b7cf9cee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> | 1 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 2 | ||
| 3 | * keyboard.c (Fdiscard_input): Do not increment update_mode_lines. | ||
| 4 | |||
| 5 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 6 | |||
| 3 | * font.c (clear_font_cache): New function, stripped from... | 7 | * font.c (clear_font_cache): New function, stripped from... |
| 4 | (Fclear_font_cache): ...here, which now uses the function | 8 | (Fclear_font_cache): ...here, which now uses the function |
| 5 | above. Adjust comment. | 9 | above. Adjust comment. |