# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1102033833 0
# Node ID 168cca775cafc69a48cf26aced5b473ffb6ac97c
# Parent  cb83859af19ea22c5cd5ea3a97aa6bed9eeef887
*** empty log message ***

diff -r cb83859af19e -r 168cca775caf lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 03 00:27:43 2004 +0000
+++ b/lisp/ChangeLog	Fri Dec 03 00:30:33 2004 +0000
@@ -113,13 +113,11 @@
 
 	* man.el (Man-fontify-manpage): Improve handling of ANSI escapes.
 
->>>>>>> 1.6708
 2004-11-30  Markus Rost  <rost@ias.edu>
 
 	* textmodes/tex-mode.el (tex-main-file): Add a compatibility with
 	AUCTeX.
 
->>>>>>> 1.6704
 2004-11-30  Jay Belanger  <belanger@truman.edu>
 
 	* calc/calc-arith.el (math-possible-signs): Made stronger checks
diff -r cb83859af19e -r 168cca775caf src/ChangeLog
--- a/src/ChangeLog	Fri Dec 03 00:27:43 2004 +0000
+++ b/src/ChangeLog	Fri Dec 03 00:30:33 2004 +0000
@@ -1,3 +1,20 @@
+2004-12-02  Richard M. Stallman  <rms@gnu.org>
+
+	* config.in (RE_TRANSLATE_P): If make_number is not a macro,
+	don't use it here.
+
+	* eval.c (Fcalled_interactively_p): Don't check INTERACTIVE.
+	(interactive_p): Skip Scalled_interactively_p frames
+	like Sinteractive_p frames.
+
+	* data.c (Fmake_variable_buffer_local): Doc fix.
+	(Fmake_local_variable): Doc fix.
+
+	* insdel.c (insert_from_string_before_markers)
+	(insert_from_string): Don't modify buffer on empty insertion.
+
+	* window.c (Fget_lru_window, Fget_largest_window): Doc fixes.
+
 2004-12-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macmenu.c (add_menu_item): Fallback on MacRoman if encoding