From: "Basil L. Contovounesios" <contovob@tcd.ie>
To: Juri Linkov <juri@linkov.net>
Cc: Eli Zaretskii <eliz@gnu.org>,
monnier@iro.umontreal.ca, emacs-devel@gnu.org
Subject: Re: Should diff.elisp.xfuncname match cl-lib macros?
Date: Mon, 20 May 2019 16:03:36 +0100 [thread overview]
Message-ID: <87zhnhgoc7.fsf@tcd.ie> (raw)
In-Reply-To: <87sgtj3zed.fsf@tcd.ie> (Basil L. Contovounesios's message of "Mon, 13 May 2019 02:40:26 +0100")
"Basil L. Contovounesios" <contovob@tcd.ie> writes:
> Juri Linkov <juri@linkov.net> writes:
>
>> PS: Regarding the change in diff.elisp.xfuncname, can we also have
>> an appropriate regexp for diff.c.xfuncname as well, to find
>> DEFUN in C code?
>
> I'm not sure we need to define a new pattern for C files distinct from
> the built-in cpp pattern, but here's a patch extending the cpp and elisp
> patterns:
>
> diff --git a/autogen.sh b/autogen.sh
> index 40d0c37b11..b5722bdb12 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -316,8 +316,16 @@ hooks=
>
> # Configure 'git diff' hunk header format.
>
> +# This xfuncname is based on Git's built-in 'cpp' pattern.
> +# The first line rejects jump targets and access declarations.
> +# The second line matches top-level functions and methods.
> +# The third line matches preprocessor and DEFUN macros.
> +git_config diff.cpp.xfuncname \
> +'!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:[[:space:]]*($|/[/*])
> +^((::[[:space:]]*)?[A-Za-z_][A-Za-z_0-9]*[[:space:]]*\(.*)$
> +^((#define[[:space:]]|DEFUN).*)$'
> git_config diff.elisp.xfuncname \
> - '^\(def[^[:space:]]+[[:space:]]+([^()[:space:]]+)'
> + '^\([^[:space:]]*def[^[:space:]]+[[:space:]]+([^()[:space:]]+)'
> git_config 'diff.m4.xfuncname' '^((m4_)?define|A._DEFUN(_ONCE)?)\([^),]*'
> git_config 'diff.make.xfuncname' \
> '^([$.[:alnum:]_].*:|[[:alnum:]_]+[[:space:]]*([*:+]?[:?]?|!?)=|define .*)'
>
> WDYT?
No further comments, so I pushed this to master[1].
[1: d3a0ddedba]: Improve C and Elisp Git diff hunk headers
2019-05-20 16:02:11 +0100
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=d3a0ddedba53b9e2c99274c8ec125d53f991da5d
Thanks,
--
Basil
prev parent reply other threads:[~2019-05-20 15:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-15 16:42 Should diff.elisp.xfuncname match cl-lib macros? Basil L. Contovounesios
2019-03-15 18:21 ` Stefan Monnier
2019-03-16 3:56 ` Richard Stallman
2019-03-16 15:33 ` cl-defun vs defun (was: Should diff.elisp.xfuncname match cl-lib macros?) Basil L. Contovounesios
2019-03-17 2:41 ` Richard Stallman
2019-03-16 15:30 ` Should diff.elisp.xfuncname match cl-lib macros? Basil L. Contovounesios
2019-03-16 16:42 ` Eli Zaretskii
2019-03-16 17:12 ` Stefan Monnier
2019-03-16 17:33 ` Eli Zaretskii
2019-03-16 18:14 ` Stefan Monnier
2019-03-16 21:55 ` Basil L. Contovounesios
2019-03-16 21:54 ` Basil L. Contovounesios
2019-03-17 3:37 ` Eli Zaretskii
2019-03-17 8:14 ` Andreas Schwab
2019-03-17 15:22 ` Basil L. Contovounesios
2019-03-17 21:33 ` Juri Linkov
2019-03-18 1:14 ` Stefan Monnier
2019-03-18 21:02 ` Juri Linkov
2019-05-13 1:40 ` Basil L. Contovounesios
2019-05-20 15:03 ` Basil L. Contovounesios [this message]
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=87zhnhgoc7.fsf@tcd.ie \
--to=contovob@tcd.ie \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=juri@linkov.net \
--cc=monnier@iro.umontreal.ca \
/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.