diff options
| author | Glenn Morris | 2007-04-23 01:23:12 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-04-23 01:23:12 +0000 |
| commit | e7d313a0ad90e3adc4b3617a6a1261aee193faa2 (patch) | |
| tree | a9dc445ada5fad2eccc0cd41288db330bfcc9951 | |
| parent | 42d7477b7f7cee22912bad6f44c451efa7a596dc (diff) | |
| download | emacs-e7d313a0ad90e3adc4b3617a6a1261aee193faa2.tar.gz emacs-e7d313a0ad90e3adc4b3617a6a1261aee193faa2.zip | |
(magic-mode-alist): Allow for carriage-returns in sgml-mode entries.
| -rw-r--r-- | lisp/files.el | 4 |
1 files changed, 2 insertions, 2 deletions
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'.") | |||
| 2134 | ;; These two must come after html, because they are more general: | 2134 | ;; These two must come after html, because they are more general: |
| 2135 | ("<\\?xml " . xml-mode) | 2135 | ("<\\?xml " . xml-mode) |
| 2136 | (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") | 2136 | (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") |
| 2137 | (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\n]*<\\)"))) | 2137 | (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)"))) |
| 2138 | (concat "[ \t\n]*<" comment-re "*!DOCTYPE ")) | 2138 | (concat "[ \t\r\n]*<" comment-re "*!DOCTYPE ")) |
| 2139 | . sgml-mode) | 2139 | . sgml-mode) |
| 2140 | ("%!PS" . ps-mode) | 2140 | ("%!PS" . ps-mode) |
| 2141 | ("# xmcd " . conf-unix-mode)) | 2141 | ("# xmcd " . conf-unix-mode)) |