[Emacs-diffs] /srv/bzr/emacs/trunk r107829: Make `put-image' return the overlay created

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 107829
fixes bug(s): http://debbugs.gnu.org/7834
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-10 04:34:57 +0200
message:
  Make `put-image' return the overlay created
  
  * image.el (put-image): Return the overlay created instead of the
  optional input string.  Note that this may break code
  that is (for some reason or other) depending on `put-image'
  returning the string.
modified:
  lisp/ChangeLog
  lisp/image.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-10 02:31:09 +0000
+++ b/lisp/ChangeLog    2012-04-10 02:34:57 +0000
@@ -1,5 +1,10 @@
 2012-04-10  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * image.el (put-image): Return the overlay created instead of the
+       optional input string (bug#7834).  Note that this may break code
+       that is (for some reason or other) depending on `put-image'
+       returning the string.
+
        * mouse-sel.el (mouse-sel-mode): Mark as obsolete (bug#6174).
 
        * simple.el (zap-to-char): Allow zapping using input methods

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2012-03-30 16:31:24 +0000
+++ b/lisp/image.el     2012-04-10 02:34:57 +0000
@@ -412,7 +412,8 @@
          (prop (if (null area) image (list (list 'margin area) image))))
       (put-text-property 0 (length string) 'display prop string)
       (overlay-put overlay 'put-image t)
-      (overlay-put overlay 'before-string string))))
+      (overlay-put overlay 'before-string string)
+      overlay)))
 
 
 ;;;###autoload