diff options
| author | Glenn Morris | 2011-01-22 11:36:45 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-22 11:36:45 -0800 |
| commit | 7c82f3e23e37cc848a38b1f8be7149fd672a6393 (patch) | |
| tree | e721d1d5361deeb04278045331d74e9c7f8b00f0 /src/ChangeLog | |
| parent | 80094035aff85d827e1ef65627974b34ad9fa8df (diff) | |
| parent | bd2a4b24c4a591240862704737b5bc696ff67cbf (diff) | |
| download | emacs-7c82f3e23e37cc848a38b1f8be7149fd672a6393.tar.gz emacs-7c82f3e23e37cc848a38b1f8be7149fd672a6393.zip | |
Merge from emacs-23
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fcf8218d670..355376a886b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2011-01-22 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.c (select_window): New function. | ||
| 4 | (Fselect_window): Call it. | ||
| 5 | (inhibit_point_swap): Variable deleted. | ||
| 6 | (Fset_window_configuration): Call select_window directly. | ||
| 7 | |||
| 1 | 2011-01-22 Jan Djärv <jan.h.d@swipnet.se> | 8 | 2011-01-22 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 9 | ||
| 3 | * nsterm.m (constrainFrameRect): Only constrain the first time called. | 10 | * nsterm.m (constrainFrameRect): Only constrain the first time called. |