aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2007-02-09 16:49:29 +0000
committerChong Yidong2007-02-09 16:49:29 +0000
commitca878c38f4330989fcbaba529bea2a6a1dbb9373 (patch)
tree6a66e19f9f1a0db3dd419f4481015e4f83169ea0
parentc3290b5393f7f4a1f25a393d19d7fc96c15410c7 (diff)
downloademacs-ca878c38f4330989fcbaba529bea2a6a1dbb9373.tar.gz
emacs-ca878c38f4330989fcbaba529bea2a6a1dbb9373.zip
* image-mode.el (image-mode): Revert 2007-01-30 changes.
* image.el (image-type-auto-detectable): Don't autodetect x[pb]m. (image-type-auto-detected-p): Fail if another match is found in auto-mode-alist. * files.el (magic-mode-alist): Call image-mode instead of image-mode-maybe for autodetected images.
-rw-r--r--lisp/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94ee4cd0258..262533c82f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
12007-02-09 Chong Yidong <cyd@stupidchicken.com>
2
3 * image-mode.el (image-mode): Revert 2007-01-30 changes.
4
5 * image.el (image-type-auto-detectable): Don't autodetect x[pb]m.
6 (image-type-auto-detected-p): Fail if another match is found in
7 auto-mode-alist.
8
9 * files.el (magic-mode-alist): Call image-mode instead of
10 image-mode-maybe for autodetected images.
11
12007-02-09 Juanma Barranquero <lekktu@gmail.com> 122007-02-09 Juanma Barranquero <lekktu@gmail.com>
2 13
3 * mail/smtpmail.el (smtpmail-smtp-service, smtpmail-queue-index-file): 14 * mail/smtpmail.el (smtpmail-smtp-service, smtpmail-queue-index-file):