diff options
| author | Joakim Verona | 2013-08-26 16:17:54 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-26 16:17:54 +0200 |
| commit | a896e4c89e06e92a53317c72b2863b84bb585d4d (patch) | |
| tree | fcd5150203a9ccd5ac63bb12a0bfe3e2ea27f4d7 /src/ChangeLog | |
| parent | 93797975c60e1f1503f998be728ccbdbe1e86ab3 (diff) | |
| parent | e1d0341e25d588120cc58ec9114539afaf74e572 (diff) | |
| download | emacs-a896e4c89e06e92a53317c72b2863b84bb585d4d.tar.gz emacs-a896e4c89e06e92a53317c72b2863b84bb585d4d.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a017eaa62f0..a065a91d32b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2013-08-26 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * lisp.h (Mouse_HLInfo): Drop set-but-unused members | ||
| 4 | mouse_face_beg_y and mouse_face_end_y. | ||
| 5 | * xdisp.c (note_tool_bar_highlight, mouse_face_from_buffer_pos) | ||
| 6 | (mouse_face_from_string_pos, note_mode_line_or_margin_highlight): | ||
| 7 | Adjust users and update comment where appropriate. | ||
| 8 | |||
| 1 | 2013-08-26 Martin Rudalics <rudalics@gmx.at> | 9 | 2013-08-26 Martin Rudalics <rudalics@gmx.at> |
| 2 | 10 | ||
| 3 | * frame.c (check_minibuf_window): New function. | 11 | * frame.c (check_minibuf_window): New function. |