Subject: bug#14548: closed (Re: bug#14548: 24.3.1; [PATCH] image-dired-dired-toggle-marked-thumbs conflicts with other modes using overlays)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 13 Jun 2013 05:12:04 +0000

Your bug report

#14548: 24.3.1; [PATCH] image-dired-dired-toggle-marked-thumbs conflicts with other modes using overlays

which was filed against the emacs package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
14548: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14548
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#14548: 24.3.1; [PATCH] image-dired-dired-toggle-marked-thumbs conflicts with other modes using overlays
From: Glenn Morris <[email-masked]>
To: [email-masked]
Date: Thu, 13 Jun 2013 01:11:10 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

Version: 24.4

Applied in this form.

> *** lisp/image-dired.el	2013-02-17 00:45:53 +0000
> --- lisp/image-dired.el	2013-06-11 19:00:18 +0000
> ***************
> *** 657,665 ****
>                   (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))
>   	   (put-image thumb-file image-pos)
>   	   (setq overlay
>                    (cl-loop for o in (overlays-in (point) (1+ (point)))
> --- 657,668 ----
>                   (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-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)))

Subject: 24.3.1; [PATCH] image-dired-dired-toggle-marked-thumbs conflicts with other modes using overlays
From: E Sabof <[email-masked]>
To: [email-masked]
Date: Mon, 3 Jun 2013 14:28:28 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

One such mode is stripe-buffer, which can be fonud here:

https://github.com/sabof/stripe-buffer

the definition below fixes the problem.

Evgeni

(ad-unadvise 'image-dired-dired-toggle-marked-thumbs) ; stripe-buffer
monkey-patches the function.

 (defun image-dired-dired-toggle-marked-thumbs (&optional arg)
    "Toggle thumbnails in front of file names in the dired buffer.
If no marked file could be found, insert or hide thumbnails on the
current line.  ARG, if non-nil, specifies the files to use instead
of the marked files.  If ARG is an integer, use the next ARG (or
previous -ARG, if ARG<0) files."
    (interactive "P")
    (dired-map-over-marks
     (let* ((image-pos  (dired-move-to-filename))
            (image-file (dired-get-filename nil t))
            thumb-file
            overlay)
       (when (and image-file
                  (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-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)
               (progn
                 (put-image thumb-file image-pos)
                 (setq overlay
                       (cl-loop for o in (overlays-in (point) (1+ (point)))
                                when (overlay-get o 'put-image) collect o
into ov
                                finally return (car ov)))
                 (overlay-put overlay 'image-file image-file)
                 (overlay-put overlay 'thumb-file thumb-file))))))
     arg             ; Show or hide image on ARG next files.
     'show-progress) ; Update dired display after each image is updated.
    (add-hook 'dired-after-readin-hook
              'image-dired-dired-after-readin-hook nil t))