# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1177291271 0
# Node ID d7a12919dfe55609b6713e796df6db615facf911
# Parent  ce79e069b7983ce6eb3b92f091fe2d18f5d9a9e4
(magic-mode-alist): Allow for carriage-returns in html-mode entry.

diff -r ce79e069b798 -r d7a12919dfe5 lisp/files.el
--- a/lisp/files.el	Mon Apr 23 01:20:02 2007 +0000
+++ b/lisp/files.el	Mon Apr 23 01:21:11 2007 +0000
@@ -2123,12 +2123,12 @@
   `((image-type-auto-detected-p . image-mode)
     ;; The < comes before the groups (but the first) to reduce backtracking.
     ;; TODO: UTF-16 <?xml may be preceded by a BOM 0xff 0xfe or 0xfe 0xff.
-    ;; We use [ \t\n] instead of `\\s ' to make regex overflow less likely.
+    ;; We use [ \t\r\n] instead of `\\s ' to make regex overflow less likely.
     (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
-	     (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\n]*<\\)")))
-	(concat "\\(?:<\\?xml[ \t\n]+[^>]*>\\)?[ \t\n]*<"
+	     (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
+	(concat "\\(?:<\\?xml[ \t\r\n]+[^>]*>\\)?[ \t\r\n]*<"
 		comment-re "*"
-		"\\(?:!DOCTYPE[ \t\n]+[^>]*>[ \t\n]*<[ \t\n]*" comment-re "*\\)?"
+		"\\(?:!DOCTYPE[ \t\r\n]+[^>]*>[ \t\r\n]*<[ \t\r\n]*" comment-re "*\\)?"
 		"[Hh][Tt][Mm][Ll]"))
      . html-mode)
     ;; These two must come after html, because they are more general: