diff options
| author | Joakim Verona | 2013-08-15 17:42:45 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-15 17:42:45 +0200 |
| commit | 50bedb930dc5a15cb7cb5d689d9f1726a14fb158 (patch) | |
| tree | 09e387368614b0dfa01933a232c096e4dfb8b4f3 /src/ChangeLog | |
| parent | a2125dbbe302d08c182ae8878077e2b288efe4fd (diff) | |
| parent | 42fe2e88d62c3ff866317f3252f1e78ed0b066a2 (diff) | |
| download | emacs-50bedb930dc5a15cb7cb5d689d9f1726a14fb158.tar.gz emacs-50bedb930dc5a15cb7cb5d689d9f1726a14fb158.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 77c37864b00..888db1f8cf4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-15 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | Fix infinite frame selection loop (Bug#15025). | ||
| 4 | * frame.c (delete_frame): Prefer fast ad-hoc loop to next_frame. | ||
| 5 | |||
| 1 | 2013-08-15 Eli Zaretskii <eliz@gnu.org> | 6 | 2013-08-15 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (compute_window_start_on_continuation_line): When | 8 | * xdisp.c (compute_window_start_on_continuation_line): When |