diff options
| author | Alan Mackenzie | 2012-01-18 11:50:27 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2012-01-18 11:50:27 +0000 |
| commit | e8afb1265f8067d360f03c514603223cde92ffeb (patch) | |
| tree | 94797628f6e0a13874730f266fe5de3a0ee90ac9 /src/ChangeLog | |
| parent | 44b0225ed09cfbc6cee7ed53c630988c342df806 (diff) | |
| parent | 3fcca64dce0c0e9f6c6fc55f19ce47fe9e861352 (diff) | |
| download | emacs-e8afb1265f8067d360f03c514603223cde92ffeb.tar.gz emacs-e8afb1265f8067d360f03c514603223cde92ffeb.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 eb03ef1357f..aa4e92b4134 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-01-16 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.c (Vwindow_persistent_parameters): New variable. | ||
| 4 | (Fset_window_configuration, save_window_save): Handle persistent | ||
| 5 | window parameters. | ||
| 6 | |||
| 1 | 2012-01-14 Eli Zaretskii <eliz@gnu.org> | 7 | 2012-01-14 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * w32fns.c (signal_user_input): Don't do a QUIT, to avoid | 9 | * w32fns.c (signal_user_input): Don't do a QUIT, to avoid |