# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1165601162 0
# Node ID 71ba31e3629675f54f58bce3d35b7d5f11c58723
# Parent  65224088bcb211d420d8710db20f09ca1321966f
*** empty log message ***

diff -r 65224088bcb2 -r 71ba31e36296 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 08 18:05:12 2006 +0000
+++ b/lisp/ChangeLog	Fri Dec 08 18:06:02 2006 +0000
@@ -1,3 +1,9 @@
+2006-12-08  Kevin Rodgers  <ihs_4664@yahoo.com>
+
+	* files.el (insert-file-1): Compare file size to
+	large-file-warning-threshold and request confirmation when
+	warranted.
+
 2006-12-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* net/browse-url.el (browse-url): Set DISPLAY to the one of the
diff -r 65224088bcb2 -r 71ba31e36296 man/ChangeLog
--- a/man/ChangeLog	Fri Dec 08 18:05:12 2006 +0000
+++ b/man/ChangeLog	Fri Dec 08 18:06:02 2006 +0000
@@ -1,3 +1,7 @@
+2006-12-08  Kevin Rodgers <ihs_4664@yahoo.com>
+
+	* files.texi (Misc File Ops): Document insert-file-literally.
+
 2006-12-08  Eli Zaretskii  <eliz@gnu.org>
 
 	* cmdargs.texi (Colors): Note that --color is intended for overriding
diff -r 65224088bcb2 -r 71ba31e36296 src/ChangeLog
--- a/src/ChangeLog	Fri Dec 08 18:05:12 2006 +0000
+++ b/src/ChangeLog	Fri Dec 08 18:06:02 2006 +0000
@@ -1,3 +1,10 @@
+2006-12-08  Eli Zaretskii  <eliz@gnu.org>
+
+	* frame.h (PIX_TYPE): Redefine as `unsigned long', for 64-bit
+	platforms where long is 64-bit.
+
+	* msdos.h (PIX_TYPE): Redefine as `unsigned long'.
+
 2006-12-08  NAKAJI Hiroyuki  <nakaji@jp.freebsd.org> (tiny change)
 
 	* m/amdx86-64.h: Add support for Solaris 10 on x86-64.