Mercurial > emacs
diff src/ChangeLog @ 112330:56d3e9c28eb0
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 11:01:01 -0800 |
| parents | 17e0028efc29 61f7601898b1 |
| children | 28ca83ef1128 |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jan 16 18:35:15 2011 -0800 +++ b/src/ChangeLog Mon Jan 17 11:01:01 2011 -0800 @@ -1,4 +1,4 @@ -2011-01-11 Paul Eggert <eggert@cs.ucla.edu> +2011-01-17 Paul Eggert <eggert@cs.ucla.edu> 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 <rudalics@gmx.at> + + * 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 <tassilo@member.fsf.org> * image.c (imagemagick_load_image, Finit_image_library): Free @@ -29539,7 +29547,8 @@ ;; 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.