(image-file-name-extensions): Remove .xbm and .xpm

associated with c-mode in `auto-mode-alist'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e28870a2074598bc3e9aecb616114b8a3c7401f5..586b613f4fd26b81744af01775b9481c146d7456 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2005-03-25  Juri Linkov  <juri@jurta.org>
+
+       * image-mode.el: Optimize image filename extension regexps in
+       autoload cookies.  Associate .x[bp]m with `image-mode-maybe'
+       in `auto-mode-alist'.
+       (image-mode): Add `image-toggle-display-text' to local hook
+       `change-major-mode-hook'.  Display the image as an image by
+       default.  Set `cursor-type' and `truncate-lines' if the image
+       is already displayed.  Take into account the current mode (image
+       or text) in message.
+       (image-minor-mode): New minor mode.
+       (image-mode-maybe, image-toggle-display-text): New functions.
+       (image-toggle-display): Use called-interactively-p.
+       Let-bind `inhibit-read-only' to t.
+
+       * image-file.el (image-file-name-extensions): Remove .xbm and .xpm
+       associated with c-mode in `auto-mode-alist'.
+
 2005-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * international/mule-cmds.el (set-locale-environment): For Mac OS X's

diff --git a/lisp/image-file.el b/lisp/image-file.el
index 11676021afd276df0fc33a8b87d3a7ecba124f5f..c9bb6f0d0c06a6630a846045f9d584944789ecb8 100644 (file)
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -38,7 +38,7 @@
 
 ;;;###autoload
 (defcustom image-file-name-extensions
-  '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm")
+  '("png" "jpeg" "jpg" "gif" "tiff" "tif" "pbm" "pgm" "ppm" "pnm")
   "*A list of image-file filename extensions.
 Filenames having one of these extensions are considered image files,
 in addition to those matching `image-file-name-regexps'.