(read_minibuf): Clean up the binding stack if

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

diff --git a/lisp/image-file.el b/lisp/image-file.el
index 2e1ac44..7875314 100644 (file)
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -1,6 +1,6 @@
 ;;; 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
@@ -38,7 +38,7 @@
 
 ;;;###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")
   "*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'.
@@ -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)))
@@ -115,14 +119,20 @@ the command `insert-file-contents'."
             (props
              `(display ,image
                        intangible ,image
-                       rear-nonsticky (display intangible read-only)
+                       rear-nonsticky (display intangible)
                        ;; This a cheap attempt to make the whole buffer
-                       ;; read-only when we're visiting the file.
-                       ,@(and visit
-                              (= ibeg (point-min))
-                              (= iend (point-max))
+                       ;; read-only when we're visiting the file (as
+                       ;; opposed to just inserting it).
+                       ,@(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)