From: E Sabof <esabof@gmail.com>
Date: Thu, 13 Jun 2013 05:10:48 +0000 (-0700)
Subject: image-dired-dired-toggle-marked-thumbs tiny change
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2016^2~139
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1261d2daeecea574cac763e3e7b729e6b6b36dad;p=emacs.git

image-dired-dired-toggle-marked-thumbs tiny change

* lisp/image-dired.el (image-dired-dired-toggle-marked-thumbs):
Only remove a `thumb-file' overlay.

Fixes: debbugs:14548
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48124b85fe4..5ff36f1539c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-13  E Sabof  <esabof@gmail.com>  (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  <daimrod@gmail.com>
 
 	* mail/reporter.el (reporter-submit-bug-report):
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index bbb41d49a1d..afb940fe337 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -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 @@ previous -ARG, if ARG<0) files."
                 (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)))