From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#61639: 30.0.50; [PATCH] Do not error out on non image file in image-dired Date: Tue, 21 Feb 2023 14:01:34 +0200 Message-ID: <83ttzfteg1.fsf@gnu.org> References: <87sff1quwk.fsf@ledu-giraud.fr> <83sff0v6wz.fsf@gnu.org> <87ttzgtq6p.fsf@ledu-giraud.fr> <83edqkv48n.fsf@gnu.org> <87k00ctofi.fsf@ledu-giraud.fr> <83a618v1jj.fsf@gnu.org> <87bklothkw.fsf@ledu-giraud.fr> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28580"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 61639@debbugs.gnu.org To: Manuel Giraud Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Feb 21 13:03:39 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pURMw-0007Ez-Kt for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 21 Feb 2023 13:03:39 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pURMY-0002ai-7r; Tue, 21 Feb 2023 07:03:17 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pURLq-0002Jt-K8 for bug-gnu-emacs@gnu.org; Tue, 21 Feb 2023 07:02:44 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pURLO-0004Wu-Lj for bug-gnu-emacs@gnu.org; Tue, 21 Feb 2023 07:02:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pURLO-0006vp-4I for bug-gnu-emacs@gnu.org; Tue, 21 Feb 2023 07:02:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 21 Feb 2023 12:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61639 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 61639-submit@debbugs.gnu.org id=B61639.167698089626596 (code B ref 61639); Tue, 21 Feb 2023 12:02:02 +0000 Original-Received: (at 61639) by debbugs.gnu.org; 21 Feb 2023 12:01:36 +0000 Original-Received: from localhost ([127.0.0.1]:54784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pURKx-0006uu-Od for submit@debbugs.gnu.org; Tue, 21 Feb 2023 07:01:36 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:43316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pURKs-0006uh-SX for 61639@debbugs.gnu.org; Tue, 21 Feb 2023 07:01:34 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pURKm-0004Lt-Fr; Tue, 21 Feb 2023 07:01:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=NImICMgCkgkYT0UzuFDzpaVj2Mgo25bNtZqF2CjMhi8=; b=mKx4JFciioBf FluQnFL3+FG30F6Deg9nQzN/f+NXdR1mJx8omOfhlkOOsCJACPmSKMGSv7Cvfu3H0MDP+Lky9BlYX QbP4louN3N6GrQZnG1L1okV0+qhDCFm+j2lXAzWbTIC3a9Q8QMlI3m9ZJ6r+Wf1YuJ6RvuPiq7+Ai ML3KdFW0gt8c3XvHjOC5SCWnC8UdpB2RGEX7eZYUTKr0JAlxWEjokKt1eirtsw9c1cix8124mMZzi jXFe8H0Uom3rkud/cjntaxjjPk7kzviIlB2YzDWi6B5og6AG90mSbB8wELEM6zWcryTtrXFfH+bO/ QzADNsCJ/aWcCvX7lbE26w==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pURKl-0004eZ-Vt; Tue, 21 Feb 2023 07:01:24 -0500 In-Reply-To: <87bklothkw.fsf@ledu-giraud.fr> (message from Manuel Giraud on Mon, 20 Feb 2023 17:41:35 +0100) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:256250 Archived-At: > From: Manuel Giraud > Cc: 61639@debbugs.gnu.org > Date: Mon, 20 Feb 2023 17:41:35 +0100 > > Eli Zaretskii writes: > > > I don't necessarily see a reason to alert the user in this case, but > > if you think we had better done that, we could show a message when we > > find a non-image file in the list of the selected ones. > > Ok. Here is a new version of the patch that address those issues. I > choose to not alert the user. Thanks. This LGTM, but what is 'plusp'? > diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el > index cfcd1851188..5798af77f35 100644 > --- a/lisp/image/image-dired.el > +++ b/lisp/image/image-dired.el > @@ -586,13 +586,15 @@ image-dired-display-thumbs > (erase-buffer)) > (goto-char (point-max))) > (dolist (file files) > - (let ((thumb (image-dired--get-create-thumbnail-file file))) > + (when (string-match-p (image-dired--file-name-regexp) file) > (image-dired-insert-thumbnail > - thumb file dired-buf > + (image-dired--get-create-thumbnail-file file) file dired-buf > (cl-incf image-dired--number-of-thumbnails))))) > - (if do-not-pop > - (display-buffer buf) > - (pop-to-buffer buf)) > + (if (plusp image-dired--number-of-thumbnails) <<<<<<<<<<<<<<<<<<<<<< > + (if do-not-pop > + (display-buffer buf) > + (pop-to-buffer buf)) > + (message "No images selected")) > (image-dired--line-up-with-method) > (image-dired--update-header-line))))