diff options
| author | Glenn Morris <rgm@gnu.org> | 2007-04-23 01:21:11 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2007-04-23 01:21:11 +0000 |
| commit | efaa82ff8d18f8ca58105abb639cb57ca626ebe9 (patch) | |
| tree | b2dd50c409319bd7e0bb1937e54643185682bc50 /lisp/files.el | |
| parent | a5d0382b4e6e9db656350248d8d7ee1fb46c405d (diff) | |
| download | emacs-efaa82ff8d18f8ca58105abb639cb57ca626ebe9.tar.gz | |
(magic-mode-alist): Allow for carriage-returns in html-mode entry.
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/files.el b/lisp/files.el index 9f3a73439a9..8aa06ddc877 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2123,12 +2123,12 @@ associated with that interpreter in `interpreter-mode-alist'.") `((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: |