From: Glenn Morris <rgm@gnu.org>
Date: Mon, 23 Apr 2007 01:23:12 +0000 (+0000)
Subject: (magic-mode-alist): Allow for carriage-returns in sgml-mode entries.
X-Git-Tag: emacs-pretest-22.0.99~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7d313a0ad90e3adc4b3617a6a1261aee193faa2;p=emacs.git

(magic-mode-alist): Allow for carriage-returns in sgml-mode entries.
---

diff --git a/lisp/files.el b/lisp/files.el
index 8aa06ddc877..5f600dcf167 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2134,8 +2134,8 @@ associated with that interpreter in `interpreter-mode-alist'.")
     ;; These two must come after html, because they are more general:
     ("<\\?xml " . xml-mode)
     (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
-	     (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\n]*<\\)")))
-	(concat "[ \t\n]*<" comment-re "*!DOCTYPE "))
+	     (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
+	(concat "[ \t\r\n]*<" comment-re "*!DOCTYPE "))
      . sgml-mode)
     ("%!PS" . ps-mode)
     ("# xmcd " . conf-unix-mode))