1 files changed, 6 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index d7f59d22551..40b48bf30a1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -99,6 +99,12 @@ types any more.  Add -DUSE_LISP_UNION_TYPE if you want union types.
 * Changes in Emacs 21.4
 +++
+** `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, unless the file name leads to a mode in
+`xml-based-modes'.
+++
 ** New function `looking-back' checks whether a regular expression matches
 the text before point.  Specifying the LIMIT argument bounds how far
 back the match can start; this is a way to keep it from taking too long.

diff --git a/etc/NEWS b/etc/NEWS index d7f59d22551..40b48bf30a1 100644 --- a/etc/NEWS +++ b/etc/NEWS
@@ -99,6 +99,12 @@ types any more. Add -DUSE_LISP_UNION_TYPE if you want union types.
99	* Changes in Emacs 21.4	99	* Changes in Emacs 21.4
100		100
101	+++	101	+++
		102	** `set-auto-mode' now gives the interpreter magic line (if present)
		103	precedence over the file name. Likewise an <?xml or <!DOCTYPE declaration
		104	will give the buffer XML or SGML mode, unless the file name leads to a mode in
		105	`xml-based-modes'.
		106
		107	+++
102	** New function `looking-back' checks whether a regular expression matches	108	** New function `looking-back' checks whether a regular expression matches
103	the text before point. Specifying the LIMIT argument bounds how far	109	the text before point. Specifying the LIMIT argument bounds how far
104	back the match can start; this is a way to keep it from taking too long.	110	back the match can start; this is a way to keep it from taking too long.