# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1178808793 0
# Node ID cd8d5d9a645a99e2774141b6f81070b41a60a481
# Parent  6f93cd776ecf304f232307708e0c8cd412c7752e
*** empty log message ***

diff -r 6f93cd776ecf -r cd8d5d9a645a admin/FOR-RELEASE
--- a/admin/FOR-RELEASE	Thu May 10 14:51:08 2007 +0000
+++ b/admin/FOR-RELEASE	Thu May 10 14:53:13 2007 +0000
@@ -36,9 +36,6 @@
 
 * BUGS
 
-** python.el legal problem?
-http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
-
 ** rcyeske@gmail.com, April 22: Failure to build on OpenBSD macppc.
 OpenBSD compilation works on i386.
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00932.html
@@ -53,7 +50,9 @@
 ** Takaaki.Ota@am.sony.com, May 2: table cell menu does not appear at the menubar
    Bug is intermittent.
 
-** david.reitter@gmail.com, May 4: Euro sign bound, Pound sign not bound. (Bug?)
+** Install python.el `with' patch from trunk.
+
+** Install vc-hooks.el patch from trunk.
 
 * DOCUMENTATION
 
diff -r 6f93cd776ecf -r cd8d5d9a645a etc/NEWS
--- a/etc/NEWS	Thu May 10 14:51:08 2007 +0000
+++ b/etc/NEWS	Thu May 10 14:53:13 2007 +0000
@@ -5013,6 +5013,10 @@
 *** New variable `magic-mode-alist' determines major mode for a file by
 looking at the file contents.  It takes precedence over `auto-mode-alist'.
 
+*** New variable `file-start-mode-alist' determines major mode for a file by
+looking at the file contents.  It is handled after `auto-mode-alist',
+only if `auto-mode-alist' says nothing about the file.
+
 *** XML or SGML major mode is selected when file starts with an `<?xml'
 or `<!DOCTYPE' declaration.
 
diff -r 6f93cd776ecf -r cd8d5d9a645a lisp/ChangeLog
--- a/lisp/ChangeLog	Thu May 10 14:51:08 2007 +0000
+++ b/lisp/ChangeLog	Thu May 10 14:53:13 2007 +0000
@@ -1,3 +1,10 @@
+2007-05-10  Richard Stallman  <rms@gnu.org>
+
+	* files.el (file-start-mode-alist): New variable.
+	(magic-mode-regexp-match-limit): Doc fix.
+	(set-auto-mode): Handle file-start-mode-alist.
+	A little cleanup of structure.
+
 2007-05-08  Richard Stallman  <rms@gnu.org>
 
 	* mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook):
diff -r 6f93cd776ecf -r cd8d5d9a645a lispref/ChangeLog
--- a/lispref/ChangeLog	Thu May 10 14:51:08 2007 +0000
+++ b/lispref/ChangeLog	Thu May 10 14:53:13 2007 +0000
@@ -1,3 +1,7 @@
+2007-05-10  Richard Stallman  <rms@gnu.org>
+
+	* modes.texi (Auto Major Mode): Document file-start-mode-alist.
+
 2007-05-06  Richard Stallman  <rms@gnu.org>
 
 	* processes.texi (Accepting Output): Revert most of previous change.