From: Po Lu <luangruo@yahoo.com>
To: emacs-devel@gnu.org
Cc: Yuan Fu <casouri@gmail.com>
Subject: Re: master 5ecd35555e9: Fix c-ts-common filling
Date: Wed, 07 Aug 2024 09:23:17 +0800 [thread overview]
Message-ID: <87cymlnn22.fsf@yahoo.com> (raw)
In-Reply-To: <20240805035008.C71C3C0EFEE@vcs2.savannah.gnu.org> (Yuan Fu's message of "Sun, 4 Aug 2024 23:50:08 -0400 (EDT)")
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.
next parent reply other threads:[~2024-08-07 1:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <172282980799.32577.17823414050456920@vcs2.savannah.gnu.org>
[not found] ` <20240805035008.C71C3C0EFEE@vcs2.savannah.gnu.org>
2024-08-07 1:23 ` Po Lu [this message]
2024-08-07 4:56 ` master 5ecd35555e9: Fix c-ts-common filling Yuan Fu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87cymlnn22.fsf@yahoo.com \
--to=luangruo@yahoo.com \
--cc=casouri@gmail.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.