*** empty log message ***

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index b794006a4932c5ed6e9a8e59273d0f986631744a..22f5d390dd8d18a518633b1c301fb429aa26d9b3 100644 (file)
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -36,9 +36,6 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
 * 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 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
 ** 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 --git a/etc/NEWS b/etc/NEWS
index 3c73ec6ee584ab128d2bc06d24bfd0c2082f9e75..87c42c0106798884fd25e5435c4c5f1dc4986672 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -5013,6 +5013,10 @@ of multiline constructs so that such constructs get properly recognized.
 *** 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc66478ebee936709551e8b29afbf720d03c8d0b..f751e6787c4c157aeecbfd5140162fe26847047f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lispref/ChangeLog b/lispref/ChangeLog
index 9941422d366f1bb5d8b6207f70d3aff15cee0976..59430c5a82eabf5b5bf442c1f10814a86a666bb9 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -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.