aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJason Rumney2007-01-31 12:37:08 +0000
committerJason Rumney2007-01-31 12:37:08 +0000
commit9fce2d717b7ee8ed4326ebb99505eb84ee6535d3 (patch)
tree08e8986f16cf54126c9660a40433f7735bc693a6 /lisp
parentedcacc1c14b566ccf4f9eae149e57b276bdacafd (diff)
downloademacs-9fce2d717b7ee8ed4326ebb99505eb84ee6535d3.tar.gz
emacs-9fce2d717b7ee8ed4326ebb99505eb84ee6535d3.zip
(image-mode-maybe): Prevent magic-mode-alist from
interfering with attempt to set major mode from modified auto-mode-alist.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/image-mode.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 3e10afcbfeb..13a689b6061 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -105,7 +105,8 @@ information on these modes."
105 elt)) 105 elt))
106 auto-mode-alist)))) 106 auto-mode-alist))))
107 (if (assoc-default buffer-file-name mode-alist 'string-match) 107 (if (assoc-default buffer-file-name mode-alist 'string-match)
108 (let ((auto-mode-alist mode-alist)) 108 (let ((auto-mode-alist mode-alist)
109 (magic-mode-alist nil))
109 (set-auto-mode) 110 (set-auto-mode)
110 (image-minor-mode t)) 111 (image-minor-mode t))
111 (image-mode)))) 112 (image-mode))))