*** empty log message ***

diff --git a/etc/TODO b/etc/TODO
index aed53514fe807c6ecb94a266fe03ac355e27521d..974b30bb2fcf46301fd584cfc590710496ba8a76 100644 (file)
--- a/etc/TODO
+++ b/etc/TODO
@@ -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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c14eaebc145e1a3ea46ebf63504b4e0164d2ee2..0c8ae27feff521bdcbcb46a167f10bd20bd51003 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index d7d070fe03dabbb32ff4cb3b661005f8515e74bc..e036c4c46e4d9d53460b7a4a38f78b705df5d14a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.