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

diff --git a/lisp/files.el b/lisp/files.el
index 8aa06ddc877cb79a0f3a6490afc987c424d6a704..5f600dcf167dcb5c21d71edc30d1f4c9f411a5ca 100644 (file)
--- 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))