[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/files.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/files.el |
Date: |
Wed, 10 Nov 2004 23:58:43 -0500 |
Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.724 emacs/lisp/files.el:1.725
*** emacs/lisp/files.el:1.724 Wed Nov 10 09:53:24 2004
--- emacs/lisp/files.el Thu Nov 11 04:52:27 2004
***************
*** 1866,1875 ****
with that interpreter in `interpreter-mode-alist'.")
(defvar magic-mode-alist
! '(;; The < comes before the groups (but the first) to reduce backtracking.
! ;; Is there a nicer way of getting . including \n like Perl's //s?
;; TODO: UTF-16 <?xml may be preceded by a BOM 0xff 0xfe or 0xfe 0xff.
! ("\\(?:<\\?xml\\s +[^>]*>\\)?\\s *<\\(?:!--\\(?:.\\|\n\\)*?-->\\s
*<\\)*\\(?:!DOCTYPE\\s +[^>]*>\\s *<\\)?\\s *\\(?:!--\\(?:.\\|\n\\)*?-->\\s
*<\\)*[Hh][Tt][Mm][Ll]" . html-mode)
;; These two must come after html, because they are more general:
("<\\?xml " . xml-mode)
("\\s *<\\(?:!--\\(?:.\\|\n\\)*?-->\\s *<\\)*!DOCTYPE " . sgml-mode)
--- 1866,1879 ----
with that interpreter in `interpreter-mode-alist'.")
(defvar magic-mode-alist
! `(;; 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.
! (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
! (comment-re (concat "\\(?:!--" incomment-re "*-->\\s *<\\)")))
! (concat "\\(?:<\\?xml\\s +[^>]*>\\)?\\s *<"
! comment-re "*"
! "\\(?:!DOCTYPE\\s +[^>]*>\\s *<\\s *" comment-re "*\\)?"
! "[Hh][Tt][Mm][Ll]")) . html-mode)
;; These two must come after html, because they are more general:
("<\\?xml " . xml-mode)
("\\s *<\\(?:!--\\(?:.\\|\n\\)*?-->\\s *<\\)*!DOCTYPE " . sgml-mode)
- [Emacs-diffs] Changes to emacs/lisp/files.el, John Paul Wallington, 2004/11/01
- [Emacs-diffs] Changes to emacs/lisp/files.el, Kim F . Storm, 2004/11/01
- [Emacs-diffs] Changes to emacs/lisp/files.el, Jan Djärv, 2004/11/02
- [Emacs-diffs] Changes to emacs/lisp/files.el, Daniel Pfeiffer, 2004/11/03
- [Emacs-diffs] Changes to emacs/lisp/files.el, Richard M . Stallman, 2004/11/04
- [Emacs-diffs] Changes to emacs/lisp/files.el, Daniel Pfeiffer, 2004/11/04
- [Emacs-diffs] Changes to emacs/lisp/files.el, Daniel Pfeiffer, 2004/11/09
- [Emacs-diffs] Changes to emacs/lisp/files.el, Daniel Pfeiffer, 2004/11/10
- [Emacs-diffs] Changes to emacs/lisp/files.el,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/files.el, Juri Linkov, 2004/11/11
- [Emacs-diffs] Changes to emacs/lisp/files.el, Daniel Pfeiffer, 2004/11/14
- [Emacs-diffs] Changes to emacs/lisp/files.el, Luc Teirlinck, 2004/11/14
- [Emacs-diffs] Changes to emacs/lisp/files.el, Richard M . Stallman, 2004/11/19
- [Emacs-diffs] Changes to emacs/lisp/files.el, Daniel Pfeiffer, 2004/11/30