diff options
| author | Joakim Verona | 2013-08-26 14:52:01 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-26 14:52:01 +0200 |
| commit | 22fee396d08f331f962d793203a5cbf1cb003836 (patch) | |
| tree | 36dd96876fe1e75eb5b72329f32738599506126d /src/ChangeLog | |
| parent | b4f7fcad493446e503f836ca936a878e54cc5f94 (diff) | |
| parent | bfff644518c1214eb5e037c7ff426af1e08628b5 (diff) | |
| download | emacs-22fee396d08f331f962d793203a5cbf1cb003836.tar.gz emacs-22fee396d08f331f962d793203a5cbf1cb003836.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6408397c13e..a017eaa62f0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-08-26 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * frame.c (check_minibuf_window): New function. | ||
| 4 | (delete_frame, Fmake_frame_invisible, Ficonify_frame): Call | ||
| 5 | check_minibuf_window (Bug#15183). | ||
| 6 | |||
| 1 | 2013-08-26 Dmitry Antipov <dmantipov@yandex.ru> | 7 | 2013-08-26 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 8 | ||
| 3 | * window.h (struct window): Replace last_cursor with last_cursor_vpos | 9 | * window.h (struct window): Replace last_cursor with last_cursor_vpos |