From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Manuel Giraud via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#61639: 30.0.50; [PATCH] Do not error out on non image file in image-dired Date: Mon, 20 Feb 2023 17:41:35 +0100 Message-ID: <87bklothkw.fsf@ledu-giraud.fr> 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> Reply-To: Manuel Giraud Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29581"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 61639@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Feb 20 17:42:27 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 1pU9FD-0007VF-8b for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 20 Feb 2023 17:42:27 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pU9Es-0002eP-F0; Mon, 20 Feb 2023 11:42:06 -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 1pU9Ep-0002dp-79 for bug-gnu-emacs@gnu.org; Mon, 20 Feb 2023 11:42:03 -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 1pU9Eo-0006ML-9J for bug-gnu-emacs@gnu.org; Mon, 20 Feb 2023 11:42:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pU9En-0004jq-PX for bug-gnu-emacs@gnu.org; Mon, 20 Feb 2023 11:42:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Manuel Giraud Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 20 Feb 2023 16:42:01 +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.167691130318184 (code B ref 61639); Mon, 20 Feb 2023 16:42:01 +0000 Original-Received: (at 61639) by debbugs.gnu.org; 20 Feb 2023 16:41:43 +0000 Original-Received: from localhost ([127.0.0.1]:53339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pU9EU-0004jE-PP for submit@debbugs.gnu.org; Mon, 20 Feb 2023 11:41:43 -0500 Original-Received: from ledu-giraud.fr ([51.159.28.247]:5612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pU9EQ-0004j0-9q for 61639@debbugs.gnu.org; Mon, 20 Feb 2023 11:41:41 -0500 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=5cscGKhg oyohE9eaG0WPOfNx0MzwDpL9ZHGRg1mGBlc=; h=date:references:in-reply-to: subject:cc:to:from; d=ledu-giraud.fr; b=Pr5qEWvPTbbQ8B+ZHMFkHl7BGSSmh0 mChSv/JEPP1uWECaxNRpebKisKssLUVLI6YYOPPVQSamohDqpL7uCjDA== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=5cscGKhgoyohE9ea G0WPOfNx0MzwDpL9ZHGRg1mGBlc=; h=date:references:in-reply-to:subject: cc:to:from; d=ledu-giraud.fr; b=Q90HtCljcasTyl+ThB1SHO7V9bu+kEiIKj88BS iK50uY3e4gRX0ywMTApGk8QsslleNlZbSvdMflLAuvN1IDz+0haUHtriGzCjRrDrl8T/3F lVXHi8ZgU0f0YTSNplyk2jt/KXppGPA1DUQXhVSwGbNqDfMLwg4J3r3SFAELxW3jtKKtNh 3TfnWLEO6+t5XairbnDIoI/MQ2mdNFf2TxUL5LVoN+360kc7smjjWWDms8KTWSnsNjtjqH +Smm9IrnkJ/5Q0uF/8Be+oYqt9VZSRmyzTnDeB6wvGNL9pq+l8Bx0JMSZeR4+NKcglTpeD Ope6zRL4hzCjKHqaT3RpVyZg== Original-Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id cde50a82 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 20 Feb 2023 17:41:36 +0100 (CET) In-Reply-To: <83a618v1jj.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 20 Feb 2023 16:45:04 +0200") 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:256199 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: [...] >> So your idea is to keep `image-dired--get-create-thumbnail-file' as is >> and filter its input in `image-dired-display-thumbs'? But then we won't >> get any message or error that something was not an image (this could go >> unnoticed as well ;-) > > 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. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Do-not-error-out-on-non-image-file-bug-61639.patch >From ddbeb1171c02f3865359edd9b2b435e329d35f7c Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Sun, 19 Feb 2023 21:03:57 +0100 Subject: [PATCH] Do not error out on non image file (bug#61639) * lisp/image/image-dired.el (image-dired-display-thumbs): Do not insert non image file and do not display image-dired buffer if it is empty. --- lisp/image/image-dired.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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)))) -- 2.39.1 --=-=-= Content-Type: text/plain -- Manuel Giraud --=-=-=--