Re: master 5ecd35555e9: Fix c-ts-common filling

Re: master 5ecd35555e9: Fix c-ts-common filling

[Po Lu]

Yuan Fu <casouri@gmail.com> writes:

> branch: master
> commit 5ecd35555e9e20de9717f0184f58a15d8a2e68a3
> Author: Yuan Fu <casouri@gmail.com>
> Commit: Yuan Fu <casouri@gmail.com>
>
>     Fix c-ts-common filling
>     
>     * lisp/progmodes/c-ts-common.el:
>     (c-ts-common--fill-block-comment): Exclude the last line from filling if
>     it only has non-word characters like *=-.
>     * test/lisp/progmodes/c-ts-mode-resources/filling.erts: Fir the
>     multi-line test and add a single line test.
> ---
>  lisp/progmodes/c-ts-common.el                        |  6 +++---
>  test/lisp/progmodes/c-ts-mode-resources/filling.erts | 16 +++++++++++++++-
>  2 files changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el
> index 022d21e11a1..674623a5e61 100644
> --- a/lisp/progmodes/c-ts-common.el
> +++ b/lisp/progmodes/c-ts-common.el
> @@ -186,9 +186,9 @@ comment."
>        ;; filling region.
>        (when (not end-marker)
>          (goto-char end)
> -        (when (looking-back (rx "*/") 2)
> -          (backward-char 2)
> -          (skip-syntax-backward "-")
> +        (forward-line 0)
> +        (when (looking-at (rx (* (or (syntax whitespace) "*" "=" "-"))
> +                              "*/" eol))
>            (setq end (point))))

This (and connected changes) produced merge conflicts between emacs-30
and master, which I have attempted to resolve so that the product
builds, but since I must confess to understanding very little of this
code, please verify that no regressions were introduced in the process.

Re: master 5ecd35555e9: Fix c-ts-common filling

[Yuan Fu]

> On Aug 6, 2024, at 6:23 PM, Po Lu <luangruo@yahoo.com> wrote:
> 
> Yuan Fu <casouri@gmail.com> writes:
> 
>> branch: master
>> commit 5ecd35555e9e20de9717f0184f58a15d8a2e68a3
>> Author: Yuan Fu <casouri@gmail.com>
>> Commit: Yuan Fu <casouri@gmail.com>
>> 
>>    Fix c-ts-common filling
>> 
>>    * lisp/progmodes/c-ts-common.el:
>>    (c-ts-common--fill-block-comment): Exclude the last line from filling if
>>    it only has non-word characters like *=-.
>>    * test/lisp/progmodes/c-ts-mode-resources/filling.erts: Fir the
>>    multi-line test and add a single line test.
>> ---
>> lisp/progmodes/c-ts-common.el                        |  6 +++---
>> test/lisp/progmodes/c-ts-mode-resources/filling.erts | 16 +++++++++++++++-
>> 2 files changed, 18 insertions(+), 4 deletions(-)
>> 
>> diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el
>> index 022d21e11a1..674623a5e61 100644
>> --- a/lisp/progmodes/c-ts-common.el
>> +++ b/lisp/progmodes/c-ts-common.el
>> @@ -186,9 +186,9 @@ comment."
>>       ;; filling region.
>>       (when (not end-marker)
>>         (goto-char end)
>> -        (when (looking-back (rx "*/") 2)
>> -          (backward-char 2)
>> -          (skip-syntax-backward "-")
>> +        (forward-line 0)
>> +        (when (looking-at (rx (* (or (syntax whitespace) "*" "=" "-"))
>> +                              "*/" eol))
>>           (setq end (point))))
> 
> This (and connected changes) produced merge conflicts between emacs-30
> and master, which I have attempted to resolve so that the product
> builds, but since I must confess to understanding very little of this
> code, please verify that no regressions were introduced in the process.

Yes, sorry for the trouble. Your change is correct!

Yuan