Mercurial > emacs

changeset 77435:4de4184f1d6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(magic-mode-alist): Allow for carriage-returns in sgml-mode entries.
author Glenn Morris <rgm@gnu.org>
date Mon, 23 Apr 2007 01:23:12 +0000
parents 6c92e17d25c6
children ad082730f3d9
files lisp/files.el
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/files.el	Mon Apr 23 01:22:39 2007 +0000
+++ b/lisp/files.el	Mon Apr 23 01:23:12 2007 +0000
@@ -2134,8 +2134,8 @@
     ;; 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))