From: "Scott L. Burson via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Johannes Sixt" <j6t@kdbg.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jaydeep P Das" <jaydeepjd.8914@gmail.com>,
"Scott L. Burson" <Scott@sympoiesis.com>,
"Scott L. Burson" <Scott@sympoiesis.com>
Subject: [PATCH] diff: "lisp" userdiff_driver
Date: Sat, 15 Nov 2025 10:17:45 +0000 [thread overview]
Message-ID: <pull.2000.git.1763201865025.gitgitgadget@gmail.com> (raw)
From: "Scott L. Burson" <Scott@sympoiesis.com>
The "scheme" driver doesn't quite work for Common Lisp. This driver
is very generic and should work for almost any dialect of Lisp,
including Common Lisp.
Signed-off-by: Scott L. Burson <Scott@sympoiesis.com>
---
diff: "lisp" userdiff_driver
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2000%2Fslburson%2Flisp-userdiff_driver-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2000/slburson/lisp-userdiff_driver-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2000
userdiff.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/userdiff.c b/userdiff.c
index fe710a68bf..e127b4a1f1 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -249,6 +249,14 @@ PATTERNS("kotlin",
"|[.][0-9][0-9_]*([Ee][-+]?[0-9]+)?[fFlLuU]?"
/* 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].*",
/* -- */
base-commit: fd372d9b1a69a01a676398882bbe3840bf51fe72
--
gitgitgadget
next reply other threads:[~2025-11-15 10:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-15 10:17 Scott L. Burson via GitGitGadget [this message]
2025-11-15 17:06 ` [PATCH] diff: "lisp" userdiff_driver Johannes Sixt
2025-11-15 23:32 ` Scott L. Burson
2025-11-20 16:47 ` D. Ben Knoble
2025-11-27 2:10 ` Scott L. Burson
2025-11-16 5:30 ` Junio C Hamano
2025-11-17 23:23 ` Scott L. Burson
2025-11-18 4:38 ` Junio C Hamano
2025-11-27 2:38 ` [PATCH v2 0/2] userdiff: extend Scheme support to cover other Lisp dialects Scott L. Burson via GitGitGadget
2025-11-27 2:38 ` [PATCH v2 1/2] diff: "lisp" userdiff_driver Scott L. Burson via GitGitGadget
2025-11-27 10:32 ` Scott L. Burson
2025-11-27 10:51 ` Johannes Sixt
2025-11-27 2:38 ` [PATCH v2 2/2] merge with Scheme regexp; fix bugs Scott L. Burson via GitGitGadget
2025-11-27 16:09 ` Johannes Sixt
2025-12-02 10:27 ` Johannes Sixt
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=pull.2000.git.1763201865025.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Scott@sympoiesis.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jaydeepjd.8914@gmail.com \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).