aboutsummaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-03 11:01:29 -0700
committerJunio C Hamano <gitster@pobox.com>2015-08-03 11:01:29 -0700
commitc12401705c41a216e3ef777f6faaf192b974aabe (patch)
tree84f416c513ec96dbdfa5a968bc353b0bcd2ccb8e /userdiff.c
parentb6d323f1646d7204fc6693071e5be84377ece70b (diff)
parent69f9c87d4654aad8011444727194c3053827ae07 (diff)
downloadgit-c12401705c41a216e3ef777f6faaf192b974aabe.tar.xz
Merge branch 'zb/userdiff-fountain'
New userdiff pattern definition for fountain screenwriting markup format. * zb/userdiff-fountain: userdiff: add support for Fountain documents
Diffstat (limited to 'userdiff.c')
-rw-r--r--userdiff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/userdiff.c b/userdiff.c
index 2ccbee50cb..6bf2505994 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -35,6 +35,8 @@ IPATTERN("fortran",
* they would have been matched above as a variable anyway. */
"|[-+]?[0-9.]+([AaIiDdEeFfLlTtXx][Ss]?[-+]?[0-9.]*)?(_[a-zA-Z0-9][a-zA-Z0-9_]*)?"
"|//|\\*\\*|::|[/<>=]="),
+IPATTERN("fountain", "^((\\.[^.]|(int|ext|est|int\\.?/ext|i/e)[. ]).*)$",
+ "[^ \t-]+"),
PATTERNS("html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$",
"[^<>= \t]+"),
PATTERNS("java",