Skip to content

userdiff: extend Scheme support to cover other Lisp dialects #2000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −5
Open

userdiff: extend Scheme support to cover other Lisp dialects #2000

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da99bb0
diff: "lisp" userdiff_driver
slburson Nov 14, 2025
86315aa
merge with Scheme regexp; fix bugs
slburson Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions userdiff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,14 @@ PATTERNS("kotlin",
"|[.][0-9][0-9_]*([Ee][-+]?[0-9]+)?[fFlLuU]?"
Copy link

@gitgitgadget gitgitgadget bot Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Git mailing list, "Scott L. Burson" wrote (reply to this):

On Wed, Nov 26, 2025, 6:38 PM Scott L. Burson via GitGitGadget
<[email protected]> wrote:
[duplicate of first message]

Hmm.  Somehow I have screwed things up so that GitGitGadget sends out
only the first commit, not including the changes in the second, nor
using the PR title and the text in the description.  Sorry for the
noise.  Is there an easy fix, or do I need to make a new PR?

-- Scott

Copy link

@gitgitgadget gitgitgadget bot Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Git mailing list, Johannes Sixt wrote (reply to this):

Am 27.11.25 um 11:32 schrieb Scott L. Burson:
> On Wed, Nov 26, 2025, 6:38 PM Scott L. Burson via GitGitGadget
> <[email protected]> wrote:
> [duplicate of first message]
> 
> Hmm.  Somehow I have screwed things up so that GitGitGadget sends out
> only the first commit, not including the changes in the second, nor
> using the PR title and the text in the description.  Sorry for the
> noise.  Is there an easy fix, or do I need to make a new PR?
I think all went as expected as far as GGG is concerend. You made a new
commit on top of the one in the earlier round, and then asked GGG to
submit the PR to the mailing list. GGG made a patch series with a cover
letter and the two patches. That's expected, because the first patch
hasn't been integrated in upstream Git, yet.

If you intended to send just the second patch (as a fixup of the first
one), then GGG cannot help you, not even if you make another pull request.

But you shouldn't have sent a fixup commit anyway, but that is a matter
I'll address in a separate message.

-- Hannes

/* unary and binary operators */
"|[-+*/<>%&^|=!]==?|--|\\+\\+|<<=|>>=|&&|\\|\\||->|\\.\\*|!!|[?:.][.:]"),
PATTERNS("lisp",
/* Either an unindented left paren, or a slightly indented line
* starting with "(def" */
"^((\\(|:space:{1,2}\\(def).*)$",
/* Common Lisp symbol syntax allows arbitrary strings between vertical bars */
"\\|([^\\\\]|\\\\\\\\|\\\\\\|)*\\|"
/* All other words are delimited by spaces or parentheses/brackets/braces */
"|([^][(){} \t])+"),
PATTERNS("markdown",
"^ {0,3}#{1,6}[ \t].*",
/* -- */
Expand Down
Loading