# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1099799411 0
# Node ID 5c2294856939dd377abf3117ee804cac61a018bb
# Parent  3166194a373f7a9be4cc08a4253a7f9ca91dae31
*** empty log message ***

diff -r 3166194a373f -r 5c2294856939 src/ChangeLog
--- a/src/ChangeLog	Sun Nov 07 03:49:38 2004 +0000
+++ b/src/ChangeLog	Sun Nov 07 03:50:11 2004 +0000
@@ -1,3 +1,14 @@
+2004-11-06  Richard M. Stallman  <rms@gnu.org>
+
+	* callint.c (Fcall_interactively): Avoid reusing EVENT for other data.
+
+	* xfaces.c (merge_named_face): GCPRO the face_name in the
+	named_merge_point struct that we make.
+	(merge_face_heights): Eliminate GCPRO arg.  All callers changed.
+
+	* keyboard.c (command_loop_1): Change Vtransient_mark_mode
+	before deciding whether to inactivate mark.
+
 2004-11-06  Lars Brinkhoff  <lars@nocrew.org>
 
 	* config.in: Regenerate (add HAVE_GETRUSAGE).
@@ -17,7 +28,6 @@
 	* xmenu.c (popup_get_selection, create_and_show_popup_menu)
 	(create_and_show_dialog): Revert change from 2004-10-31.
 	
-
 2004-11-05  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* macros.c (syms_of_macros) <defining-kbd-macro>: Doc fix.