From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#14548: 24.3.1; [PATCH] image-dired-dired-toggle-marked-thumbs conflicts with other modes using overlays Date: Thu, 13 Jun 2013 01:11:10 -0400 Message-ID: References: <1qr4g8lb29.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1371100333 13399 80.91.229.3 (13 Jun 2013 05:12:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Jun 2013 05:12:13 +0000 (UTC) To: 14548-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jun 13 07:12:13 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UmzpT-00066K-Ht for geb-bug-gnu-emacs@m.gmane.org; Thu, 13 Jun 2013 07:12:11 +0200 Original-Received: from localhost ([::1]:58211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmzpT-0005ke-3R for geb-bug-gnu-emacs@m.gmane.org; Thu, 13 Jun 2013 01:12:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmzpO-0005kX-UI for bug-gnu-emacs@gnu.org; Thu, 13 Jun 2013 01:12:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmzpM-0000fw-8i for bug-gnu-emacs@gnu.org; Thu, 13 Jun 2013 01:12:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmzpM-0000fl-5k for bug-gnu-emacs@gnu.org; Thu, 13 Jun 2013 01:12:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1UmzpL-0002Gh-Ku for bug-gnu-emacs@gnu.org; Thu, 13 Jun 2013 01:12:03 -0400 Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Thu, 13 Jun 2013 05:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 14548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Mail-Followup-To: 14548@debbugs.gnu.org, rgm@gnu.org, esabof@gmail.com Original-Received: via spool by 14548-done@debbugs.gnu.org id=D14548.13711002888640 (code D ref 14548); Thu, 13 Jun 2013 05:12:02 +0000 Original-Received: (at 14548-done) by debbugs.gnu.org; 13 Jun 2013 05:11:28 +0000 Original-Received: from localhost ([127.0.0.1]:40459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Umzof-0002F9-5X for submit@debbugs.gnu.org; Thu, 13 Jun 2013 01:11:26 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:59163 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1UmzoW-0002Ep-S1 for 14548-done@debbugs.gnu.org; Thu, 13 Jun 2013 01:11:17 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1UmzoU-00022d-Qs; Thu, 13 Jun 2013 01:11:11 -0400 X-Spook: cryptanalysis security UOP world domination Merlin Indigo X-Ran: &LN@N$.a*xK:,.3!><7Iy=PG!|fo9EEcqO[nF]+PFWe~FJjN.gv@b5%x4Wxx{*QEVIckg5 X-Hue: green X-Attribution: GM In-Reply-To: <1qr4g8lb29.fsf@fencepost.gnu.org> (Glenn Morris's message of "Tue, 11 Jun 2013 15:08:46 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:75032 Archived-At: 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)))