# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 997350504 0
# Node ID b9f580ca37a01dbba2fadfa2d47c8a985ab9d855
# Parent  24e6b905a458283b08e049a87c362080a01b9c6a
*** empty log message ***

diff -r 24e6b905a458 -r b9f580ca37a0 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Aug 09 09:48:04 2001 +0000
+++ b/lisp/ChangeLog	Thu Aug 09 09:48:24 2001 +0000
@@ -1,3 +1,10 @@
+2001-08-09  Gerd Moellmann  <gerd@gnu.org>
+
+	* image.el (image-type-regexps): Allow whitespace at the start
+	of the image data for XPM, XBM and Postscript, which are
+	text files.
+	(image-jpeg-p): Correct calculation of next field offset.
+
 2001-08-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
 	* battery.el: Fix typo.
diff -r 24e6b905a458 -r b9f580ca37a0 src/ChangeLog
--- a/src/ChangeLog	Thu Aug 09 09:48:04 2001 +0000
+++ b/src/ChangeLog	Thu Aug 09 09:48:24 2001 +0000
@@ -1,3 +1,17 @@
+2001-08-09  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfns.c (x_create_im): Remove prototype.
+
+	* xdisp.c (mark_window_display_accurate_1): Remove an assertion.
+
+	* dispnew.c (adjust_glyph_matrix): Undo last change.
+	
+2001-08-08  Gerd Moellmann  <gerd@gnu.org>
+
+	* dispnew.c (adjust_glyph_matrix): In the optimization for
+	windows whose height has changed, disable partially visible
+	lines.
+
 2001-08-07  Gerd Moellmann  <gerd@gnu.org>
 
 	* window.c (Frecenter): If ARG < 0, and on a window system