From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#22457: 24.5; [PATCH] `dired-mark-if' should not count non-changes Date: Wed, 26 Jun 2019 01:12:25 +0200 Message-ID: References: <2a6ff247-2b75-4f85-9a4c-889576ed7b34@default> <87o92lmgez.fsf@web.de> <87ftnxmfoo.fsf@web.de> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="110349"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 22457@debbugs.gnu.org To: Michael Heerdegen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 26 01:13:22 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hfucr-000Sbo-GC for geb-bug-gnu-emacs@m.gmane.org; Wed, 26 Jun 2019 01:13:21 +0200 Original-Received: from localhost ([::1]:35694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfucq-0007OA-GN for geb-bug-gnu-emacs@m.gmane.org; Tue, 25 Jun 2019 19:13:20 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36310) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfuch-0007O1-Ri for bug-gnu-emacs@gnu.org; Tue, 25 Jun 2019 19:13:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfuca-0001SZ-MJ for bug-gnu-emacs@gnu.org; Tue, 25 Jun 2019 19:13:06 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48532) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfucX-0001O6-Sd for bug-gnu-emacs@gnu.org; Tue, 25 Jun 2019 19:13:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hfucX-0002pV-NG for bug-gnu-emacs@gnu.org; Tue, 25 Jun 2019 19:13:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 25 Jun 2019 23:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22457 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed Original-Received: via spool by 22457-submit@debbugs.gnu.org id=B22457.156150435410826 (code B ref 22457); Tue, 25 Jun 2019 23:13:01 +0000 Original-Received: (at 22457) by debbugs.gnu.org; 25 Jun 2019 23:12:34 +0000 Original-Received: from localhost ([127.0.0.1]:33843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hfuc6-0002oX-I1 for submit@debbugs.gnu.org; Tue, 25 Jun 2019 19:12:34 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:58558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hfuc4-0002oP-WA for 22457@debbugs.gnu.org; Tue, 25 Jun 2019 19:12:33 -0400 Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=stories) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hfubx-0005eq-Jv; Wed, 26 Jun 2019 01:12:27 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAElBMVEUHBgXW1tZkY2IYFxYF AwMKCAdn2ceNAAACZ0lEQVQ4jU2UTW7jMAyFido6gBR0X0vw3hbLvYEqe44V3v8q8yg7nVFTBdZn /j1SIVK7Vjc1nZ/vJyIj68yCDc+thQsw+ZZzZnYopE9T9Vfxn6OvFFORvRjcuVknO3NeBoq51GKE 83aETn1PufpxWVLpQkQADYCX5CapGDY4usBhxAVhgTJA9PAEZzNAXyl0kLL9ifFhPG2v2YMQiyKx vHy2Halx51VnIgCvxoM/6I8nxozEyEKgwNY93bTuvos82AL+iKoZjlCC4yKGnN0LaQ12elirOSbV gAQGCP7ZI7ToCPU9/3zaIEQBup9woUGW+DWH1Uyqg6EyTfxqanmlA08Znv28s1bh0D7wsueve3yM fuiJV8KTP1LNW3uGnisP4IUklyouaYPvDlkdQCposY2WPMhbi/KFPOMa13mGVYxfDUKNuKQ0h5q+ 27GXKcbt1Q4aVuSrFmnPpXBFgVfFNzgXzEmFslncz5DcG0lnLLxAx1zYg2q4QfuA3NYFBsJK18gB zMd0z0+UcRJuUDX8D2xM7QAr+QhhUCLEUm/rbfFFOQuGEPXae9gZ4Oe7hVrdz/kPdIDDx2iA/gtw DXwhDYFyPZe3Ix7gOMI03h0bOt1LYZJA7Zj0bXdZFHSwozWtKwYWV0WuCThzqmQzOhDa62gULrMu veRCrq9SQ3Z0LTcpMV/fFcJWXAVov3qMeAOokR8AvtaJx8EAfK8y7nQw4ZrorjRM5ZKKaBOBa7pr wowyq19OpId48RfcQ4yhaZwfHGk+/JoiV72aBEV7Zlj4D4Ff7G1oMcMVWRUA+LyWmuAXBpVrPyH0 Xwhi31X7JUg5AAAAAElFTkSuQmCC In-Reply-To: <87ftnxmfoo.fsf@web.de> (Michael Heerdegen's message of "Wed, 26 Jun 2019 01:02:47 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.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" Xref: news.gmane.org gmane.emacs.bugs:161442 Archived-At: Michael Heerdegen writes: > Yes, I think I understand. My problem is that "[...] not how many files > are marked in total" sounds like as if marked files that were not even > touched by the command (that are not matched by the predicate) were > previously included. You mean it relative to the files matched, right? Well... this is the patch: - (if ,predicate - (progn - (delete-char 1) - (insert dired-marker-char) - (setq count (1+ count)))) + (when ,predicate + (unless (looking-at-p (char-to-string dired-marker-char)) + (delete-char 1) + (insert dired-marker-char) + (setq count (1+ count)))) So if the predicate matches, if there was a mark, it would delete the mark, and then add it back, and then count it. But you're right, files where the predicate doesn't say non-nil are not counted, so it doesn't report the total number of marked files... > Oh, btw, this patch line > > (looking-at-p (char-to-string dired-marker-char)) > > is not good if dired-marker-char is a regexp special like . or ?, I > guess (regexp-quote missing)? Indeed. I'll fix it. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no