From: Kim F. Storm <storm@cua.dk>
Date: Tue, 19 Dec 2006 09:24:45 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.92~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c5f6230ac1d5e8346ab74cef5ca5b15854ac2a4c;p=emacs.git

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

diff --git a/etc/NEWS b/etc/NEWS
index f67227d008c..643b635e28e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -5517,10 +5517,16 @@ of multiline constructs so that such constructs get properly recognized.
 ** Major mode mechanism changes:
 
 +++
-*** `set-auto-mode' now gives the interpreter magic line (if present)
-precedence over the file name.  Likewise an `<?xml' or `<!DOCTYPE'
-declaration will give the buffer XML or SGML mode, based on the new
-variable `magic-mode-alist'.
+*** New variable `magic-mode-alist' determines major mode for a file by
+looking the file contents.  It take precedence over `auto-mode-alist'.
+
++++
+*** An interpreter magic line (if present) takes precedence over the
+file name when setting the major mode.
+
++++
+*** XML or SGML major mode is selected when file starts with an `<?xml'
+or `<!DOCTYPE' declaration.
 
 +++
 *** Use the new function `run-mode-hooks' to run the major mode's mode hook.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0edd5da954..91509af0190 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-19  Kim F. Storm  <storm@cua.dk>
+
+	* files.el (magic-mode-alist): Allow matching file type by
+	calling a function at bob.  Check for image types by calling
+	image-type-from-buffer.  Suggested by Juanma Barranquero.
+	(set-auto-mode): Do it.
+
 2006-12-19  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-methods): Introduce new method `scpc'.
diff --git a/man/ChangeLog b/man/ChangeLog
index 6584b9cef92..96f88717e5c 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-19  Kim F. Storm  <storm@cua.dk>
+
+	* major.texi (Choosing Modes): Describe match-function elements for
+	magic-mode-alist.
+
 2006-12-19  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.texi (External transfer methods): Describe new method `scpc'.