# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 991057372 0
# Node ID 090e5993c4c752dc82a6afadb04bba1da18d81ac
# Parent  fcd11c3e63417fbf3f4906f868c3a8ee6a1a3ae2
*** empty log message ***

diff -r fcd11c3e6341 -r 090e5993c4c7 etc/TODO
--- a/etc/TODO	Mon May 28 13:42:21 2001 +0000
+++ b/etc/TODO	Mon May 28 13:42:52 2001 +0000
@@ -160,3 +160,7 @@
   programs to native code is probably the first thing to try, though.
 
 * Add a feature to Info similar to "info --apropos SUBJECT".
+
+* If you do an insert-file and that file is currently modified in
+  another buffer but not written yet, print a warning.
+
diff -r fcd11c3e6341 -r 090e5993c4c7 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon May 28 13:42:21 2001 +0000
+++ b/lisp/ChangeLog	Mon May 28 13:42:52 2001 +0000
@@ -1,3 +1,12 @@
+2001-05-28  Miles Bader  <miles@gnu.org>
+
+	* comint.el (comint-carriage-motion): Renamed from
+	`comint-cr-magic'.  Operate on the buffer instead of the string
+	(for use as a comint post-output filter, instead of as a
+	pre-output filter).  Handle backspaces too.  Add to the
+	`comint-output-filter-functions' hook instead of
+	`comint-preoutput-filter-functions'.
+
 2001-05-28  Gerd Moellmann  <gerd@gnu.org>
 
 	* language/japan-util.el (japanese-hankaku): Prefer the charset
diff -r fcd11c3e6341 -r 090e5993c4c7 src/ChangeLog
--- a/src/ChangeLog	Mon May 28 13:42:21 2001 +0000
+++ b/src/ChangeLog	Mon May 28 13:42:52 2001 +0000
@@ -1,5 +1,9 @@
 2001-05-28  Gerd Moellmann  <gerd@gnu.org>
 
+	* xterm.c (cursor_in_mouse_face_p): New function.
+	(x_draw_stretch_glyph_string): Use it to choose a different GC
+	when drawing a cursor within highlighted text.
+
 	* editfns.c (char_property_eq): Put in #if 0.
 
 	* indent.c (string_display_width): Put in #if 0.