Mercurial > emacs
diff lisp/files.el @ 83626:7489e9d44b85
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 762-764)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 22-23)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-15
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 24 May 2007 02:14:22 +0000 |
parents | 0a3247aa24a4 947265eed15c |
children | 422451dd396a |
line wrap: on
line diff
--- a/lisp/files.el Mon May 21 12:16:07 2007 +0000 +++ b/lisp/files.el Thu May 24 02:14:22 2007 +0000 @@ -2119,8 +2119,7 @@ of the regular expression. The mode is then determined as the mode associated with that interpreter in `interpreter-mode-alist'.") -(defvar magic-mode-alist - `((image-type-auto-detected-p . image-mode)) +(defvar magic-mode-alist nil "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 @@ -2133,7 +2132,8 @@ (put 'magic-mode-alist 'risky-local-variable t) (defvar magic-fallback-mode-alist - `(;; The < comes before the groups (but the first) to reduce backtracking. + `((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\r\n] instead of `\\s ' to make regex overflow less likely. (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")