summaryrefslogtreecommitdiff
path: root/lisp/image-mode.el
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2007-01-31 12:37:08 +0000
committerJason Rumney <jasonr@gnu.org>2007-01-31 12:37:08 +0000
commit9fce2d717b7ee8ed4326ebb99505eb84ee6535d3 (patch)
tree08e8986f16cf54126c9660a40433f7735bc693a6 /lisp/image-mode.el
parentedcacc1c14b566ccf4f9eae149e57b276bdacafd (diff)
downloademacs-9fce2d717b7ee8ed4326ebb99505eb84ee6535d3.tar.gz
(image-mode-maybe): Prevent magic-mode-alist from
interfering with attempt to set major mode from modified auto-mode-alist.
Diffstat (limited to 'lisp/image-mode.el')
-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."
elt))
auto-mode-alist))))
(if (assoc-default buffer-file-name mode-alist 'string-match)
- (let ((auto-mode-alist mode-alist))
+ (let ((auto-mode-alist mode-alist)
+ (magic-mode-alist nil))
(set-auto-mode)
(image-minor-mode t))
(image-mode))))