From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 8 Dec 2006 18:06:02 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.92~230
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e67e94f830dac86bc4086129ba797ec39bb0acc;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c641766360d..1c85c23e720 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index cda1e14d8f8..179cd2104fe 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index bae86f83fc2..c43e647bccd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.