summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2007-08-25 14:09:24 +0000
committerJuri Linkov <juri@jurta.org>2007-08-25 14:09:24 +0000
commit1ae0abbc93d80ea8ccd81894ae104ed9ab865a20 (patch)
treeb7a02467738761fa02bd8396374dc1c4580a840f /lisp
parent4a2f0e9922ebc453318a8d0040e9043d97066c53 (diff)
downloademacs-1ae0abbc93d80ea8ccd81894ae104ed9ab865a20.tar.gz
emacs-1ae0abbc93d80ea8ccd81894ae104ed9ab865a20.tar.bz2
emacs-1ae0abbc93d80ea8ccd81894ae104ed9ab865a20.zip
(auto-mode-alist): Move "\\.x[bp]m\\'" to image-mode.el.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/files.el1
2 files changed, 17 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e0fcef6fa4..7566f05e6e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2007-08-25 Juri Linkov <juri@jurta.org>
+
+ * files.el (auto-mode-alist): Move "\\.x[bp]m\\'" to image-mode.el.
+
+ * image-mode.el: Add autoloads to put associations in auto-mode-alist:
+ associate "\\.x[bp]m\\'" with c-mode and image-mode-maybe, and
+ "\\.svgz?\\'" with xml-mode and image-mode-maybe.
+
+ * image.el (image-type-header-regexps): Use more complex regexp for svg.
+ (image-type-file-name-regexps): Add ("\\.svgz?\\'" . svg).
+ (image-type-auto-detectable): Add (svg . maybe).
+
+ * jka-cmpr-hook.el (jka-compr-compression-info-list): Add .svgz
+ to treat it like .tgz.
+
+ * calendar/cal-bahai.el: Add file coding cookie.
+
2007-08-25 Reiner Steib <Reiner.Steib@gmx.de>
* pcvs.el (cvs-query-directory): Only prompt when prefix is given.
diff --git a/lisp/files.el b/lisp/files.el
index f2307b9d416..d50e447aeb7 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2026,7 +2026,6 @@ since only a single case-insensitive search through the alist is made."
("\\.dtd\\'" . sgml-mode)
("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
("\\.js\\'" . java-mode) ; javascript-mode would be better
- ("\\.x[bp]m\\'" . c-mode)
;; .emacs or .gnus or .viper following a directory delimiter in
;; Unix, MSDOG or VMS syntax.
("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode)