diff options
| author | Joakim Verona | 2013-08-13 10:31:40 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 10:31:40 +0200 |
| commit | 8cd462fd025ea06895b9e4508c869b61d6be28d3 (patch) | |
| tree | 6faec45674f50844187625fe96977fff6b790f08 /src/ChangeLog | |
| parent | c84d5d936dbda2084b2c08364c8c0d5e514fc1b6 (diff) | |
| parent | a45543bc75e845c9217130c65ddd00a81c18ffd1 (diff) | |
| download | emacs-8cd462fd025ea06895b9e4508c869b61d6be28d3.tar.gz emacs-8cd462fd025ea06895b9e4508c869b61d6be28d3.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3b8dfe011ee..74af248575a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,16 @@ | |||
| 1 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * font.c (clear_font_cache): New function, stripped from... | ||
| 4 | (Fclear_font_cache): ...here, which now uses the function | ||
| 5 | above. Adjust comment. | ||
| 6 | * font.h (clear_font_cache): Add prototype. | ||
| 7 | * xfaces.c (clear_face_cache): Use clear_font_cache. | ||
| 8 | |||
| 9 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 10 | |||
| 11 | * window.c (Fset_window_start): Compare `w', not `window' because | ||
| 12 | `w' might not be equal to `window' after call to decode_live_window. | ||
| 13 | |||
| 1 | 2013-08-12 Paul Eggert <eggert@cs.ucla.edu> | 14 | 2013-08-12 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 15 | ||
| 3 | * process.c (deactivate_process): Reset fds to -1 (Bug#15035). | 16 | * process.c (deactivate_process): Reset fds to -1 (Bug#15035). |