X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/1c7e37a93fbabf11548171aeb5ba6ad203a7ff34..6a6d7c3403e416a82705544e2d80eaf83f1b390e:/lisp/image-file.el

diff --git a/lisp/image-file.el b/lisp/image-file.el
index 3d47cc8a2e..4a13019a09 100644
--- 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)))
@@ -115,14 +119,20 @@ the command `insert-file-contents'."
 	     (props
 	      `(display ,image
 			intangible ,image
-			rear-nonsticky (display)
+			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)
@@ -146,10 +156,6 @@ Optional argument ARGS are the arguments to call FUNCTION with."
     (apply function args)))
 
 
-;;; Note this definition must be at the end of the file, because
-;;; `define-minor-mode' actually calls the mode-function if the
-;;; associated variable is non-nil, which requires that all needed
-;;; functions be already defined.  [This is arguably a bug in d-m-m]
 ;;;###autoload
 (define-minor-mode auto-image-file-mode
   "Toggle visiting of image files as images.
@@ -159,9 +165,6 @@ Returns non-nil if the new state is enabled.
 Image files are those whose name has an extension in
 `image-file-name-extensions', or matches a regexp in
 `image-file-name-regexps'."
-  nil
-  nil
-  nil
   :global t
   :group 'image
   ;; Remove existing handler
@@ -178,4 +181,5 @@ Image files are those whose name has an extension in
 
 (provide 'image-file)
 
+;;; arch-tag: 04cafe36-f7ba-4c80-9f47-4cb656520ce1
 ;;; image-file.el ends here