aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2007-06-04 20:41:15 +0000
committerChong Yidong2007-06-04 20:41:15 +0000
commit407876dad2cfe64b3d93bbc64f2e0e60dac4861e (patch)
treedfc38d12876c2be1c6e45d94957eaac2198c5ca7
parentada9718d0fac370e92650e914f43f099f07a0753 (diff)
downloademacs-407876dad2cfe64b3d93bbc64f2e0e60dac4861e.tar.gz
emacs-407876dad2cfe64b3d93bbc64f2e0e60dac4861e.zip
(magic-mode-alist): Remove image-type-auto-detected-p.
(magic-fallback-mode-alist): Add image-type-auto-detected-p.
-rw-r--r--lisp/files.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 2dbc0c2791a..5693e40ced5 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2119,8 +2119,7 @@ is assumed to be interpreted by the interpreter matched by the second group
2119of the regular expression. The mode is then determined as the mode 2119of the regular expression. The mode is then determined as the mode
2120associated with that interpreter in `interpreter-mode-alist'.") 2120associated with that interpreter in `interpreter-mode-alist'.")
2121 2121
2122(defvar magic-mode-alist 2122(defvar magic-mode-alist nil
2123 `((image-type-auto-detected-p . image-mode))
2124 "Alist of buffer beginnings vs. corresponding major mode functions. 2123 "Alist of buffer beginnings vs. corresponding major mode functions.
2125Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION). 2124Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION).
2126After visiting a file, if REGEXP matches the text at the beginning of the 2125After visiting a file, if REGEXP matches the text at the beginning of the
@@ -2133,7 +2132,8 @@ If FUNCTION is nil, then it is not called. (That is a way of saying
2133(put 'magic-mode-alist 'risky-local-variable t) 2132(put 'magic-mode-alist 'risky-local-variable t)
2134 2133
2135(defvar magic-fallback-mode-alist 2134(defvar magic-fallback-mode-alist
2136 `(;; The < comes before the groups (but the first) to reduce backtracking. 2135 `((image-type-auto-detected-p . image-mode)
2136 ;; The < comes before the groups (but the first) to reduce backtracking.
2137 ;; TODO: UTF-16 <?xml may be preceded by a BOM 0xff 0xfe or 0xfe 0xff. 2137 ;; TODO: UTF-16 <?xml may be preceded by a BOM 0xff 0xfe or 0xfe 0xff.
2138 ;; We use [ \t\r\n] instead of `\\s ' to make regex overflow less likely. 2138 ;; We use [ \t\r\n] instead of `\\s ' to make regex overflow less likely.
2139 (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") 2139 (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")