[Emacs-diffs] trunk r112955: image-dired-dired-toggle-marked-thumbs tiny change

[Glenn Morris]

------------------------------------------------------------
revno: 112955
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14548
author: E Sabof <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-06-12 22:10:48 -0700
message:
  image-dired-dired-toggle-marked-thumbs tiny change
  
  * lisp/image-dired.el (image-dired-dired-toggle-marked-thumbs):
  Only remove a `thumb-file' overlay.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/image-dired.el            
imagedired.el-20091113204419-o5vbwnq5f7feedwu-4485

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-12 16:08:17 +0000
+++ b/lisp/ChangeLog    2013-06-13 05:10:48 +0000
@@ -1,3 +1,8 @@
+2013-06-13  E Sabof  <address@hidden>  (tiny change)
+
+       * image-dired.el (image-dired-dired-toggle-marked-thumbs):
+       Only remove a `thumb-file' overlay.  (Bug#14548)
+
 2013-06-12  Grégoire Jadi  <address@hidden>
 
        * mail/reporter.el (reporter-submit-bug-report):

=== modified file 'lisp/image-dired.el'
--- a/lisp/image-dired.el       2013-02-17 00:45:53 +0000
+++ b/lisp/image-dired.el       2013-06-13 05:10:48 +0000
@@ -156,8 +156,9 @@
 (require 'format-spec)
 (require 'widget)
 
+(require 'cl-lib)
+
 (eval-when-compile
-  (require 'cl-lib)
   (require 'wid-edit))
 
 (defgroup image-dired nil
@@ -657,9 +658,12 @@
                 (string-match-p (image-file-name-regexp) image-file))
        (setq thumb-file (image-dired-get-thumbnail-image image-file))
        ;; If image is not already added, then add it.
-       (let ((cur-ov (overlays-in (point) (1+ (point)))))
-         (if cur-ov
-             (delete-overlay (car cur-ov))
+       (let* ((cur-ovs (overlays-in (point) (1+ (point))))
+              (thumb-ov (car (cl-remove-if-not
+                              (lambda (ov) (overlay-get ov 'thumb-file))
+                              cur-ovs))))
+         (if thumb-ov
+             (delete-overlay thumb-ov)
           (put-image thumb-file image-pos)
           (setq overlay
                  (cl-loop for o in (overlays-in (point) (1+ (point)))