[3/3] fixup! Display 4-byte UTF-8 as \\Uxxxxxxxx

  ---
 binutils/doc/binutils.texi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

On 13.09.2025 17:12, Andrew C Aitchison wrote:
> ---
>  binutils/doc/binutils.texi | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Why's this not part of patch 2?

Jan

> diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
> index 5bfc0c6acb9..72bc7f8b4fb 100644
> --- a/binutils/doc/binutils.texi
> +++ b/binutils/doc/binutils.texi
> @@ -3079,7 +3079,7 @@ in the current locale, which may or may not support them.  The options
>  hex byte sequences enclosed by either angle brackets or curly braces.
>  
>  The @option{--unicode=escape} option displays them as escape sequences
> -(@var{\uxxxx} and @var{\Uxxxxxxxx) and the @option{--unicode=highlight} option displays
> +(@var{\uxxxx} and @var{\Uxxxxxxxx}) and the @option{--unicode=highlight} option displays
>  them as escape sequences highlighted in red (if supported by the
>  output device).  The colouring is intended to draw attention to the
>  presence of unicode sequences where they might not be expected.
> @@ -3492,7 +3492,7 @@ The @option{--unicode=locale} option displays them in the current
>  locale, which may or may not support UTF-8 encoding.  The
>  @option{--unicode=hex} option displays them as hex byte sequences
>  enclosed between @var{<>} characters.  The @option{--unicode=escape}
> -option displays them as escape sequences (@var{\uxxxx} and @var{\Uxxxxxxxx) and the
> +option displays them as escape sequences (@var{\uxxxx} and @var{\Uxxxxxxxx}) and the
>  @option{--unicode=highlight} option displays them as escape sequences
>  highlighted in red (if supported by the output device).  The colouring
>  is intended to draw attention to the presence of unicode sequences
> @@ -5231,7 +5231,7 @@ they are displayed as a sequence of hex bytes, encloses in curly
>  parethesis characters.
>  
>  Using the @option{--unicode=escape} option will display the characters
> -as as unicode escape sequences (@var{\uxxxx} and @var{\Uxxxxxxxx).  Using the
> +as as unicode escape sequences (@var{\uxxxx} and @var{\Uxxxxxxxx}).  Using the
>  @option{--unicode=hex} will display the characters as hex byte
>  sequences enclosed between angle brackets.
>
  

On Tue, 23 Sep 2025, Jan Beulich wrote:

> On 13.09.2025 17:12, Andrew C Aitchison wrote:
>> ---
>>  binutils/doc/binutils.texi | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> Why's this not part of patch 2?

Sorry, yes it should be, but after writing the patches twice,
fighting my editor, git-format-patch and git send-email only to find
another syntax error I gave up.
Perhaps I should have gone in and hacked the patch by hand, but if
that is the right thing to do there is something wrong with the work flow
and what would have been wrong with squashing the whole thing down to one 
patch. Why are we using git-format-patch and git send-email if
we then need to rewrite a history of the changes,



> Jan
>
>> diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
>> index 5bfc0c6acb9..72bc7f8b4fb 100644
>> --- a/binutils/doc/binutils.texi
>> +++ b/binutils/doc/binutils.texi
>> @@ -3079,7 +3079,7 @@ in the current locale, which may or may not support them.  The options
>>  hex byte sequences enclosed by either angle brackets or curly braces.
>>
>>  The @option{--unicode=escape} option displays them as escape sequences
>> -(@var{\uxxxx} and @var{\Uxxxxxxxx) and the @option{--unicode=highlight} option displays
>> +(@var{\uxxxx} and @var{\Uxxxxxxxx}) and the @option{--unicode=highlight} option displays
>>  them as escape sequences highlighted in red (if supported by the
>>  output device).  The colouring is intended to draw attention to the
>>  presence of unicode sequences where they might not be expected.
>> @@ -3492,7 +3492,7 @@ The @option{--unicode=locale} option displays them in the current
>>  locale, which may or may not support UTF-8 encoding.  The
>>  @option{--unicode=hex} option displays them as hex byte sequences
>>  enclosed between @var{<>} characters.  The @option{--unicode=escape}
>> -option displays them as escape sequences (@var{\uxxxx} and @var{\Uxxxxxxxx) and the
>> +option displays them as escape sequences (@var{\uxxxx} and @var{\Uxxxxxxxx}) and the
>>  @option{--unicode=highlight} option displays them as escape sequences
>>  highlighted in red (if supported by the output device).  The colouring
>>  is intended to draw attention to the presence of unicode sequences
>> @@ -5231,7 +5231,7 @@ they are displayed as a sequence of hex bytes, encloses in curly
>>  parethesis characters.
>>
>>  Using the @option{--unicode=escape} option will display the characters
>> -as as unicode escape sequences (@var{\uxxxx} and @var{\Uxxxxxxxx).  Using the
>> +as as unicode escape sequences (@var{\uxxxx} and @var{\Uxxxxxxxx}).  Using the
>>  @option{--unicode=hex} will display the characters as hex byte
>>  sequences enclosed between angle brackets.
  

On 23.09.2025 09:22, Andrew C Aitchison wrote:
> On Tue, 23 Sep 2025, Jan Beulich wrote:
> 
>> On 13.09.2025 17:12, Andrew C Aitchison wrote:
>>> ---
>>>  binutils/doc/binutils.texi | 6 +++---
>>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> Why's this not part of patch 2?
> 
> Sorry, yes it should be, but after writing the patches twice,
> fighting my editor, git-format-patch and git send-email only to find
> another syntax error I gave up.
> Perhaps I should have gone in and hacked the patch by hand, but if
> that is the right thing to do there is something wrong with the work flow
> and what would have been wrong with squashing the whole thing down to one 
> patch. Why are we using git-format-patch and git send-email if
> we then need to rewrite a history of the changes,

I don't understand how these other git commands come into play here. If you
make incremental changes, simply use "git commit --amend".

Jan