diff src/ChangeLog @ 92692:d999f30304bc

Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1095
author Miles Bader <miles@gnu.org>
date Mon, 10 Mar 2008 00:49:47 +0000
parents 4b12e6633ee4 842d7b2745f7
children 2a2d2de297db
line wrap: on
line diff
--- a/src/ChangeLog	Sun Mar 09 21:37:16 2008 +0000
+++ b/src/ChangeLog	Mon Mar 10 00:49:47 2008 +0000
@@ -1,3 +1,18 @@
+2008-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* fileio.c (Fsubstitute_in_file_name): Fix up computation of maximum
+	size of resulting string.
+
+2008-03-05  Jason Rumney  <jasonr@gnu.org>
+
+	* dispnew.c (adjust_glyph_matrix): Initialize window_height.
+
+2008-03-03  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* xdisp.c (handle_single_display_spec): Undo 2007-10-16 changes.
+	Don't pretend as if characters with display property haven't been
+	consumed for string-replacing-string case.
+
 2008-03-08  Kim F. Storm  <storm@cua.dk>
 
 	* xdisp.c (GET_NEXT_DISPLAY_ELEMENT): New macro.