;;; 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
(require 'image)
+;;;###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'.
:initialize 'custom-initialize-default
:group 'image)
+;;;###autoload
(defcustom image-file-name-regexps nil
"*List of regexps matching image-file filenames.
Filenames matching one of these regexps are considered image files,
(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
exts-regexp)))
-;;;###autoload
-(define-minor-mode auto-image-file-mode
- "Toggle visiting of image files as images.
-With prefix argument ARG, turn on if positive, otherwise off.
-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
- (let ((existing-entry
- (rassq 'image-file-handler file-name-handler-alist)))
- (when existing-entry
- (setq file-name-handler-alist
- (delq existing-entry file-name-handler-alist))))
- ;; Add new handler, if enabled
- (when auto-image-file-mode
- (push (cons (image-file-name-regexp) 'image-file-handler)
- file-name-handler-alist)))
-
-
;;;###autoload
(defun insert-image-file (file &optional visit beg end replace)
"Insert the image file FILE into the current buffer.
(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)))
(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)
(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.
+With prefix argument ARG, turn on if positive, otherwise off.
+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'."
+ :global t
+ :group 'image
+ ;; Remove existing handler
+ (let ((existing-entry
+ (rassq 'image-file-handler file-name-handler-alist)))
+ (when existing-entry
+ (setq file-name-handler-alist
+ (delq existing-entry file-name-handler-alist))))
+ ;; Add new handler, if enabled
+ (when auto-image-file-mode
+ (push (cons (image-file-name-regexp) 'image-file-handler)
+ file-name-handler-alist)))
+
+
(provide 'image-file)
;;; image-file.el ends here