diff options
| author | Joakim Verona | 2013-08-13 11:11:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 11:11:49 +0200 |
| commit | f1742c473f7bc90dbe65d523a895187b5e72853a (patch) | |
| tree | 0f09c0363c6adaa6c3d5535466a7ed04d90f0395 /src/ChangeLog | |
| parent | 6eb8619434f2278f3e56663bc7bbb31043b6146b (diff) | |
| parent | 9cda66e432f4f17a9aa150a56de389df5577c914 (diff) | |
| download | emacs-f1742c473f7bc90dbe65d523a895187b5e72853a.tar.gz emacs-f1742c473f7bc90dbe65d523a895187b5e72853a.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 6a3b7cf9cee..c8735ab96ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,10 @@ | |||
| 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. | 3 | * keyboard.c (Fdiscard_input): Do not increment update_mode_lines. |
| 4 | * nsfns.m (x_set_cursor_type): | ||
| 5 | * w32fns.c (x_set_cursor_type): | ||
| 6 | * xfns.m (x_set_cursor_type): Do not set cursor_type_changed here... | ||
| 7 | * xdisp.c (set_frame_cursor_types): ...but in common code. | ||
| 4 | 8 | ||
| 5 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> | 9 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> |
| 6 | 10 | ||