diff options
| author | Paul Eggert <[email protected]> | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/ChangeLog | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2265f12138..8f3c405649 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,4 @@ -2011-01-11 Paul Eggert <[email protected]> +2011-01-17 Paul Eggert <[email protected]> Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350. * lisp.h (FLOAT_TO_STRING_BUFSIZE): New macro. @@ -33,6 +33,14 @@ ($(lib)/libgnu.a): New rule. (temacs$(EXEEXT)): Also link $(lib)/libgnu.a. +2011-01-15 Martin Rudalics <[email protected]> + + * window.c (inhibit_point_swap): New variable. + (Fselect_window): If inhibit_point_swap is nonzero, avoid swapping + point this time. + (Fset_window_configuration): Set inhibit_point_swap to 1 instead + of setting selected_window to nil (Bug#7728). + 2011-01-11 Tassilo Horn <[email protected]> * image.c (imagemagick_load_image, Finit_image_library): Free @@ -29539,7 +29547,8 @@ See ChangeLog.10 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. This file is part of GNU Emacs. |