Merge from emacs--rel--22

[gnu-emacs] / lisp / image-file.el

diff --git a/lisp/image-file.el b/lisp/image-file.el
index e5f1203e2b076b3b63400fe184383d0d094b5634..3084c4a1c2dee137669b05314f1e678bee65a421 100644 (file)
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -1,16 +1,17 @@
-;;; image-file.el --- Support for visiting image files
+;;; image-file.el --- support for visiting image files
 ;;
-;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: multimedia
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,14 +19,12 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; 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,7 +37,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" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")
   "*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'.
@@ -118,6 +117,8 @@ the command `insert-file-contents'."
              (create-image data nil t))
             (props
              `(display ,image
+                       yank-handler
+                       (image-file-yank-handler nil t)
                        intangible ,image
                        rear-nonsticky (display intangible)
                        ;; This a cheap attempt to make the whole buffer
@@ -135,6 +136,26 @@ the command `insert-file-contents'."
          (setq truncate-lines t))))
     rval))
 
+;; We use a yank-handler to make yanked images unique, so that
+;; yanking two copies of the same image next to each other are
+;; recognized as two different images.
+(defun image-file-yank-handler (string)
+  "Yank handler for inserting an image into a buffer."
+  (let ((len (length string))
+       (image (get-text-property 0 'display string)))
+    (remove-text-properties 0 len yank-excluded-properties string)
+    (if (consp image)
+       (add-text-properties 0
+                            (or (next-single-property-change 0 'image-counter string)
+                                (length string))
+                            `(display
+                              ,(cons (car image) (cdr image))
+                              yank-handler
+                              ,(cons 'image-file-yank-handler '(nil t)))
+                            string))
+    (insert string)))
+
+(put 'image-file-handler 'safe-magic t)
 (defun image-file-handler (operation &rest args)
   "Filename handler for inserting image files.
 OPERATION is the operation to perform, on ARGS.
@@ -156,10 +177,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.
@@ -185,4 +202,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