diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:39 -0700 |
| commit | d49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1 (patch) | |
| tree | 649dae8fbfe6951521ee612cfe964ba266dd929b /userdiff.c | |
| parent | 2743b61bc65156d337c0740da5122b58a044b1a5 (diff) | |
| parent | 3c81760bc66376c3ac69c39475cbe3b13e97e798 (diff) | |
| download | git-d49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1.tar.xz | |
Merge branch 'sb/userdiff-dts'
Device-tree files learned their own userdiff patterns.
* sb/userdiff-dts:
userdiff: add a builtin pattern for dts files
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/userdiff.c b/userdiff.c index e74a6d4022..86e3244e15 100644 --- a/userdiff.c +++ b/userdiff.c @@ -23,6 +23,14 @@ IPATTERN("ada", "[a-zA-Z][a-zA-Z0-9_]*" "|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?" "|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"), +PATTERNS("dts", + "!;\n" + /* lines beginning with a word optionally preceded by '&' or the root */ + "^[ \t]*((/|&?[a-zA-Z_]).*)", + /* -- */ + /* Property names and math operators */ + "[a-zA-Z0-9,._+?#-]+" + "|[-+*/%&^|!~]|>>|<<|&&|\\|\\|"), IPATTERN("fortran", "!^([C*]|[ \t]*!)\n" "!^[ \t]*MODULE[ \t]+PROCEDURE[ \t]\n" |