# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1167156619 0
# Node ID c41a1b0f518e0ac4b27db93dc6f4194a90d6b543
# Parent  898edc5838144be3ddccc134d24dac0d02dea21f
*** empty log message ***

diff -r 898edc583814 -r c41a1b0f518e admin/FOR-RELEASE
--- a/admin/FOR-RELEASE	Tue Dec 26 18:02:27 2006 +0000
+++ b/admin/FOR-RELEASE	Tue Dec 26 18:10:19 2006 +0000
@@ -62,8 +62,6 @@
 
 ** allout problem because pgg ignores its passphrases.
 
-** Reconsider using Image mode for eps files?
-
 ** How should C-x C-v ask about saving?
 
 ** Delete prematurely applied allout.el changes.
diff -r 898edc583814 -r c41a1b0f518e lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Dec 26 18:02:27 2006 +0000
+++ b/lisp/ChangeLog	Tue Dec 26 18:10:19 2006 +0000
@@ -1,3 +1,11 @@
+2006-12-26  Richard Stallman  <rms@gnu.org>
+
+	* image.el (image-type-header-regexps): Change element format
+	to include third item NOT-ALWAYS.
+	(image-type-from-data): Handle new format.
+	(image-type-from-buffer): Handle new format.  New arg INCLUDE-MAYBES.
+	(image-type-from-file-header): Pass t for INCLUDE-MAYBES.
+
 2006-12-26  Guanpeng Xu  <herberteuler@hotmail.com> (tiny change)
 
 	* add-log.el (add-log-current-defun): Call `forward-sexp'
diff -r 898edc583814 -r c41a1b0f518e src/ChangeLog
--- a/src/ChangeLog	Tue Dec 26 18:02:27 2006 +0000
+++ b/src/ChangeLog	Tue Dec 26 18:10:19 2006 +0000
@@ -1,5 +1,7 @@
 2006-12-26  Richard Stallman  <rms@gnu.org>
 
+	* search.c (Fsearch_forward): Doc fix.
+
 	* callint.c (Finteractive): Doc fix.
 
 2006-12-25  Kim F. Storm  <storm@cua.dk>