diff src/ChangeLog @ 106941:6132b66d6b9d

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 19 Jan 2010 22:05:33 +0000
parents 00e805a10065
children 6881eb43ae95
line wrap: on
line diff
--- a/src/ChangeLog	Mon Jan 18 23:30:50 2010 +0000
+++ b/src/ChangeLog	Tue Jan 19 22:05:33 2010 +0000
@@ -1,3 +1,9 @@
+2010-01-19  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xsettings.c (apply_xft_settings): Save settings in Vxft_settings
+	for debug purpose.
+	(syms_of_xsettings): Declare xft-settings.
+
 2010-01-18  Chong Yidong  <cyd@stupidchicken.com>
 
 	* editfns.c (Fcurrent_time_string): Doc fix (Bug#5408).
@@ -176,6 +182,13 @@
 	* dispnew.c (change_frame_size_1): newwidth == FRAME_COLS  (f) must
 	also be true before we can return early (bug #5339).
 
+2010-01-08  Alan Mackenzie  <acm@muc.de>
+
+	Fix spurious before-change-functions invocation from (insert ?\n).
+	* textprop.c (set_text_properties): rename parameter
+	`signal_after_change_p' to `coherent_change_p', and make the
+	invocation of `modify_region' conditional on it.
+
 2010-01-06  David Reitter  <david.reitter@gmail.com>
 
 	* nsfns.m (ns_get_screen): Rewrite, returning NULL for non-NS.