*** empty log message ***

2 files changed, 24 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 0c2cf6841b..27940ad53a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -20,6 +20,11 @@ Emacs to not use X Input Methods (XIM), if they these are available.
 
 * Changes in Emacs 21.1
 
+** The <delete> function key is now bound to `delete-char' by default.
+Note that this takes effect only on window systems.  On TTYs, Emacs
+will receive ASCII 127 when the DEL key is pressed.  This
+character is still bound as before.
+
 ** Item Save Options on the Options menu allows saving options set
 using that menu.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 73c225c3b3..5bd4a134b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2000-07-11  Gerd Moellmann  <[email protected]>
+
+	* doc.c (Fsubstitute_command_keys): Handle case that a GC
+	in Fwhere_is_internal or get_keymap_1 relocates string contents.
+
+	* dispnew.c (direct_output_forward_char): Give up if currently
+	displaying a message instead of the minibuffer contents.
+
+	* xterm.c (x_update_window_begin): No need to turn off the mouse
+	highlight here.
+	(show_mouse_face): Set the mouse_face_p flag of glyph rows
+	depending on whether they contain glyphs highlighted in
+	mouse-face.
+
+	* dispnew.c (row_equal_p): Add parameter MOUSE_FACE_P.  If set,
+	compare the mouse_face_p flags of both rows.
+
+	* dispextern.h (struct glyph_row): Add flag mouse_face_p.
+
 2000-07-11  Eli Zaretskii  <[email protected]>
 
 	* keyboard.c (show_help_echo): Accept additional parameter