Subject: bug#25617: closed (Re: [bug-diffutils] bug#25617: [patch] use a single string to describe an option)

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 05 May 2017 05:42:02 +0000

Your bug report

#25617: [patch] use a single string to describe an option

which was filed against the diffutils package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
25617: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=25617
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug-diffutils] bug#25617: [patch] use a single string to describe an option
From: Jim Meyering <[email-masked]>
To: Benno Schulenberg <[email-masked]>
Cc: [email-masked]
Date: Thu, 4 May 2017 22:41:29 -0700
List-Id: <debbugs-submit.debbugs.gnu.org>

Thank you. Applied with slightly tweaked log entry.

  https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=98b6fc2f320cfb

Subject: [patch] use a single string to describe an option
From: Benno Schulenberg <[email-masked]>
To: [email-masked]
Date: Sat, 04 Feb 2017 11:07:10 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

In the latest diffutils PO file, two new option descriptions
are each split over two separate msgids.  It is better when
a description is kept together in a single msgid.  Attached
patch makes that change.

Benno

-- 
http://www.fastmail.com - Faster than the air-speed velocity of an
                          unladen european swallow

From 79ad7675445dd78daaaa6ea7264f25ada34fd032 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email-masked]>
Date: Sat, 4 Feb 2017 10:55:54 +0100
Subject: [PATCH] diff: use a single string to describe an option

* src/diff.c: Fuse four description pieces into two whole ones.
And reword and rewrap one of them to fit within eighty characters.
---
 src/diff.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/diff.c b/src/diff.c
index 76851ac..c67d516 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -971,10 +971,10 @@ static char const * const option_help_msgid[] = {
   N_("-d, --minimal            try hard to find a smaller set of changes"),
   N_("    --horizon-lines=NUM  keep NUM lines of the common prefix and suffix"),
   N_("    --speed-large-files  assume large files and many scattered small changes"),
-  N_("    --color[=WHEN]       colorize the output; WHEN can be 'never', 'always',"),
-  N_("                           or 'auto' (the default)"),
-  N_("    --palette=PALETTE    specify the colors to use when --color is active"),
-  N_("                           PALETTE is a colon-separated list terminfo capabilities"),
+  N_("    --color[=WHEN]       colorize the output; WHEN can be 'never', 'always',\n"
+     "                           or 'auto' (the default)"),
+  N_("    --palette=PALETTE    the colors to use when --color is active; PALETTE is\n"
+     "                           a colon-separated list of terminfo capabilities"),
   "",
   N_("    --help               display this help and exit"),
   N_("-v, --version            output version information and exit"),
-- 
2.11.0