(mm-hack-charsets, mm-iso-8859-15-compatible)

[bpt/emacs.git] / lisp / image-file.el

diff --git a/lisp/image-file.el b/lisp/image-file.el
index f8da174..87fd48a 100644 (file)
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -1,6 +1,6 @@
-;;; image-file.el --- Support for visiting image files
+;;; image-file.el --- support for visiting image files
 ;;
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: multimedia
@@ -25,7 +25,7 @@
 ;;; Commentary:
 
 ;; Defines a file-name-handler hook that transforms visited (or
-;; inserted) image files so that they are displayed by emacs as
+;; inserted) image files so that they are displayed by Emacs as
 ;; images.  This is done by putting a `display' text-property on the
 ;; image data, with the image-data still present underneath; if the
 ;; resulting buffer file is saved to another name it will correctly save
@@ -38,15 +38,15 @@
 
 ;;;###autoload
 (defcustom image-file-name-extensions
-  '("png" "jpeg" "jpg" "gif" "tiff" "xbm" "xpm" "pbm")
+  '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "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'.
 
 See `auto-image-file-mode'; if `auto-image-file-mode' is enabled,
 setting this variable directly does not take effect unless
-`auto-image-file-mode' is re-enabled; this happens automatically the
-variable is set using \\[customize]."
+`auto-image-file-mode' is re-enabled; this happens automatically when
+the variable is set using \\[customize]."
   :type '(repeat string)
   :set (lambda (sym val)
         (set-default sym val)
@@ -64,8 +64,8 @@ in addition to those with an extension in `image-file-name-extensions'.
 
 See function `auto-image-file-mode'; if `auto-image-file-mode' is
 enabled, setting this variable directly does not take effect unless
-`auto-image-file-mode' is re-enabled; this happens automatically the
-variable is set using \\[customize]."
+`auto-image-file-mode' is re-enabled; this happens automatically when
+the variable is set using \\[customize]."
   :type '(repeat regexp)
   :set (lambda (sym val)
         (set-default sym val)
@@ -82,7 +82,10 @@ variable is set using \\[customize]."
   (let ((exts-regexp
         (and image-file-name-extensions
              (concat "\\."
-                     (regexp-opt image-file-name-extensions t)
+                     (regexp-opt (nconc (mapcar #'upcase
+                                                image-file-name-extensions)
+                                        image-file-name-extensions)
+                                 t)
                      "\\'"))))
     (if image-file-name-regexps
        (mapconcat 'identity
@@ -107,6 +110,7 @@ the command `insert-file-contents'."
     (when (and (or (null beg) (zerop beg)) (null end))
       (let* ((ibeg (point))
             (iend (+ (point) (cadr rval)))
+            (visitingp (and visit (= ibeg (point-min)) (= iend (point-max))))
             (data
              (string-make-unibyte
               (buffer-substring-no-properties ibeg iend)))
@@ -119,11 +123,16 @@ the command `insert-file-contents'."
                        ;; This a cheap attempt to make the whole buffer
                        ;; read-only when we're visiting the file (as
                        ;; opposed to just inserting it).
-                       ,@(and visit
-                              (= ibeg (point-min))
-                              (= iend (point-max))
+                       ,@(and visitingp
                               '(read-only t front-sticky (read-only))))))
-       (add-text-properties ibeg iend props)))
+       (add-text-properties ibeg iend props)
+       (when visitingp
+         ;; Inhibit the cursor when the buffer contains only an image,
+         ;; because cursors look very strange on top of images.
+         (setq cursor-type nil)
+         ;; This just makes the arrow displayed in the right fringe
+         ;; area look correct when the image is wider than the window.
+         (setq truncate-lines t))))
     rval))
 
 (defun image-file-handler (operation &rest args)