Mercurial > emacs
changeset 77726:f0732d60c635
(magic-mode-alist, magic-fallback-mode-alist):
Move the *ml, Postscript, and XmCD entries to the fallback part.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 16 May 2007 16:13:12 +0000 |
| parents | 2f4cc000e4de |
| children | 02de25cb97f4 |
| files | lisp/ChangeLog lisp/files.el |
| diffstat | 2 files changed, 17 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed May 16 16:07:15 2007 +0000 +++ b/lisp/ChangeLog Wed May 16 16:13:12 2007 +0000 @@ -1,5 +1,8 @@ 2007-05-16 Stefan Monnier <monnier@iro.umontreal.ca> + * files.el (magic-mode-alist, magic-fallback-mode-alist): + Move the *ml, Postscript, and XmCD entries to the fallback part. + * files.el (magic-fallback-mode-alist): Rename from file-start-mode-alist.
--- a/lisp/files.el Wed May 16 16:07:15 2007 +0000 +++ b/lisp/files.el Wed May 16 16:13:12 2007 +0000 @@ -2120,8 +2120,20 @@ associated with that interpreter in `interpreter-mode-alist'.") (defvar magic-mode-alist - `((image-type-auto-detected-p . image-mode) - ;; The < comes before the groups (but the first) to reduce backtracking. + `((image-type-auto-detected-p . image-mode)) + "Alist of buffer beginnings vs. corresponding major mode functions. +Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION). +After visiting a file, if REGEXP matches the text at the beginning of the +buffer, or calling MATCH-FUNCTION returns non-nil, `normal-mode' will +call FUNCTION rather than allowing `auto-mode-alist' to decide the buffer's +major mode. + +If FUNCTION is nil, then it is not called. (That is a way of saying +\"allow `auto-mode-alist' to decide for these files.\")") +(put 'magic-mode-alist 'risky-local-variable t) + +(defvar magic-fallback-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. ;; We use [ \t\r\n] instead of `\\s ' to make regex overflow less likely. (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") @@ -2140,19 +2152,6 @@ . sgml-mode) ("%!PS" . ps-mode) ("# xmcd " . conf-unix-mode)) - "Alist of buffer beginnings vs. corresponding major mode functions. -Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION). -After visiting a file, if REGEXP matches the text at the beginning of the -buffer, or calling MATCH-FUNCTION returns non-nil, `normal-mode' will -call FUNCTION rather than allowing `auto-mode-alist' to decide the buffer's -major mode. - -If FUNCTION is nil, then it is not called. (That is a way of saying -\"allow `auto-mode-alist' to decide for these files.\")") -(put 'magic-mode-alist 'risky-local-variable t) - -(defvar magic-fallback-mode-alist - nil "Like `magic-mode-alist' but has lower priority than `auto-mode-alist'. Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION). After visiting a file, if REGEXP matches the text at the beginning of the