From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton Newsgroups: gmane.emacs.bugs Subject: bug#73407: [PATCH v4] bug#73407: 31.0.50; Add diff-discard-hunk Date: Wed, 25 Sep 2024 07:36:42 +0100 Message-ID: <87cyks1bph.fsf@zephyr.silentflame.com> References: <87jzf58g2t.fsf@zephyr.silentflame.com> <865xqleexg.fsf@mail.linkov.net> <87y13hmold.fsf@zephyr.silentflame.com> <86ikuldyy1.fsf@gnu.org> <87r0992h1n.fsf_-_@zephyr.silentflame.com> <867cb1dm3r.fsf@mail.linkov.net> <86o74dc4cx.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24938"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: dgutov@yandex.ru, 73407@debbugs.gnu.org, Juri Linkov To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Sep 25 08:38:06 2024 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 1stLf3-0006Hw-Ii for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 25 Sep 2024 08:38:06 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stLek-00044k-Kl; Wed, 25 Sep 2024 02:37:46 -0400 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 1stLej-00044Y-BQ for bug-gnu-emacs@gnu.org; Wed, 25 Sep 2024 02:37:45 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stLeb-0000Qc-6j for bug-gnu-emacs@gnu.org; Wed, 25 Sep 2024 02:37:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=f5rutjw6s6eVFsN70yCAm5la8JqYFPFIP8SRr8ZNx1c=; b=SuQ/8DgWX/Tg3GkasXb7DAgUVYBKClQZle4ntZzcPaZVwKQYaslWFzdjAehgKo3WGc1s6EqWDOwGWenF/IHHAXlPKALKC8d9visLrewkxKvasONU0GsMyq8812KKxFAfTF8hXww7LR5PfFj51TcKjPl5E8W7waGaTpuOwxxPuGBmymhjoYonXC2uWAWIFY1O0yKJ3YWY+J1RTpLTg134o816uc0vrOwkyfTL4AeV9ysjdakVPhYjjpSRausGxjpCJAbkArBD2+429oOWHLqHi1DQKj3wknRf/hEmPral9EhSFVU8IKkvzW9rJW9u9cFz3KilzsViYDMeYqq+z56Rng==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stLf0-0006uP-Gv for bug-gnu-emacs@gnu.org; Wed, 25 Sep 2024 02:38:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 25 Sep 2024 06:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73407 X-GNU-PR-Package: emacs Original-Received: via spool by 73407-submit@debbugs.gnu.org id=B73407.172724623926488 (code B ref 73407); Wed, 25 Sep 2024 06:38:02 +0000 Original-Received: (at 73407) by debbugs.gnu.org; 25 Sep 2024 06:37:19 +0000 Original-Received: from localhost ([127.0.0.1]:42822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stLeJ-0006t9-8v for submit@debbugs.gnu.org; Wed, 25 Sep 2024 02:37:19 -0400 Original-Received: from sendmail.purelymail.com ([34.202.193.197]:49378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stLeH-0006st-9y for 73407@debbugs.gnu.org; Wed, 25 Sep 2024 02:37:18 -0400 DKIM-Signature: a=rsa-sha256; b=mTwnkcVEFIDyAh+7X6GqDTD+Q2l1rQWcVyCLa+kihlUZyMSiB5tDzoXXEIvXByyi3E2oOGa9s4RQVACY+31PM3xqamF9uGVifxqJg38jtXzUeFnjJoknpG/yI3RZq1SrWEJxs8wgc+psHod8ksseBHENwogHaxxKHAD/ruJtMLTqh6F6+68TBUceMZaHTPoYCt2Hahs04aSdL8nZ8mz5mAT1rRZ47kguM8jAEBq6KZid7BHD1ZOjWqfgnA3F+IaGzy2yZIN8MFGcGOUQGWuAbKo9VnYR+42dNpm7Lgn5URZwqa8z6KhGAUNCQZ8gRuy4WWvaqkXWwWxU3IA1mgGW8w==; s=purelymail1; d=spwhitton.name; v=1; bh=kRrMASG1b6LNamKu30W2t03K6GjXINY7KCFqxwGx6uI=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=YbS4sGnJhvpag2ytFrzdm34VTjBRo5GPkg+qf5WuW2Hz8N1jcPcB9f4tH9uv5nYEfJhDUKDb2COW+36w4ChDgGFBVnwn2O8yVFeK4WOtDj78318PW7Nibz4VHdypNJf7AtRYOcGkGO5fKDZfXS4ldwxd3vl/JdeGMw25V4IB41JiueAmA3SCXLiT/8BsYwjqkZcYgWV+UgDEfrLhz8v7ZMJG1cxWXLzLqC6yioHxLcCZCETd+lw2vuTEQ7/Ap8PTgHPf9GboJ7ewD2/2FG462fOg1+wSy9rrPAhnj+pXApIeIkMkZPE6FISFmzws113yfoOf06qFVPY++oRnJ2pqAw==; s=purelymail1; d=purelymail.com; v=1; bh=kRrMASG1b6LNamKu30W2t03K6GjXINY7KCFqxwGx6uI=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 73407@debbugs.gnu.org Original-Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1740573694; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 25 Sep 2024 06:36:43 +0000 (UTC) Original-Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 02079949F2A; Wed, 25 Sep 2024 07:36:42 +0100 (BST) In-Reply-To: <86o74dc4cx.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 24 Sep 2024 21:07:42 +0300") 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:292379 Archived-At: Hello, On Tue 24 Sep 2024 at 09:07pm +03, Eli Zaretskii wrote: >> From: Juri Linkov >> Cc: Eli Zaretskii , dgutov@yandex.ru, 73407@debbugs.gnu.org >> Date: Tue, 24 Sep 2024 19:59:04 +0300 >> >> >>> - (message "%d hunks failed; no buffers changed" failures))))) >> >>> + (message "%d hunks failed; no buffers changed" failures) >> >>> + failures)))) >> >> >> >> This comes from existing text, but still: what does the above say when >> >> there's only 1 failure? does it say "1 hunks failed"? If so, can we >> >> improve the handling of singular/plural here? >> > >> > I've installed a fix for that. >> >> Another variant would be to use 'ngettext'. > > That's what I had in mind... Do you mean like this? diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index be3d94db011..9677fbb9175 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -2083,7 +2083,7 @@ diff-apply-buffer (message "Saved %d buffers" (length buffer-edits))) (t (message "%d %s failed; no buffers changed" - failures (if (> failures 1) "hunks" "hunk")))))) + failures (ngettext "hunk" "hunks" failures)))))) (defalias 'diff-mouse-goto-source #'diff-goto-source) -- Sean Whitton