(auto-mode-alist): Move "\\.x[bp]m\\'" to image-mode.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e0fcef6fa442d35caeb347c0d5cc99e3c3ef33b..7566f05e6e30e2ade1aeb384988a25906126ef49 100644 (file)
--- 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 f2307b9d416f53450e13847ecde886a2747f3e18..d50e447aeb7c57a2076f4495c1931bb5b3e86a03 100644 (file)
--- 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)