diff options
| author | Joakim Verona | 2013-09-12 09:41:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-12 09:41:49 +0200 |
| commit | 64a5e06b03dc129445712cfca770b886e5f1285f (patch) | |
| tree | 93443b31ffda0001e42960b5aaf711086a82f584 /src/ChangeLog | |
| parent | 376499bab806ced18cc52fd7101a2eb70a61a9cc (diff) | |
| parent | 27e90f7752ed9d02cb98dd2dc2886a4f052240ab (diff) | |
| download | emacs-64a5e06b03dc129445712cfca770b886e5f1285f.tar.gz emacs-64a5e06b03dc129445712cfca770b886e5f1285f.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 88aa22b30dc..069a9885b4c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2013-09-12 Dmitry Antipov <dmantipov@yandex.ru> | 1 | 2013-09-12 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 2 | ||
| 3 | * xterm.h (x_display_info): New field last_user_time... | ||
| 4 | * xterm.c (toplevel): ...to replace static last_user_time. | ||
| 5 | (handle_one_xevent, x_ewmh_activate_frame): Adjust users. | ||
| 6 | |||
| 7 | 2013-09-12 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 8 | |||
| 3 | * xterm.c (x_set_scroll_bar_thumb) [USE_LUCID && !HAVE_XAW3D]: Clip | 9 | * xterm.c (x_set_scroll_bar_thumb) [USE_LUCID && !HAVE_XAW3D]: Clip |
| 4 | scroll bar values to prevent thumb from disappear and update comment. | 10 | scroll bar values to prevent thumb from disappear and update comment. |
| 5 | 11 | ||