diff options
| -rw-r--r-- | git.git-authors | 1 | ||||
| -rw-r--r-- | src/userdiff.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/git.git-authors b/git.git-authors index 7e53d66a9..7c72c4bf6 100644 --- a/git.git-authors +++ b/git.git-authors @@ -49,6 +49,7 @@ ok Brian Gernhardt <benji@silverinsanity.com> ok Christian Couder <chriscool@tuxfamily.org> ok Daniel Barkalow <barkalow@iabervon.org> ok Florian Forster <octo@verplant.org> +ok Gustaf Hendeby <hendeby@isy.liu.se> ok Holger Weiss <holger@zedat.fu-berlin.de> ok Jeff King <peff@peff.net> ok Johannes Schindelin <Johannes.Schindelin@gmx.de> diff --git a/src/userdiff.h b/src/userdiff.h index 318761567..93b4d0d58 100644 --- a/src/userdiff.h +++ b/src/userdiff.h @@ -80,6 +80,10 @@ PATTERNS("java", "|[-+*/<>%&^|=!]=" "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"), +PATTERNS("matlab", + "^[[:space:]]*((classdef|function)[[:space:]].*)$|^%%[[:space:]].*$", + "[a-zA-Z_][a-zA-Z0-9_]*|[-+0-9.e]+|[=~<>]=|\\.[*/\\^']|\\|\\||&&"), + PATTERNS("objc", /* Negate C statements that can look like functions */ "!^[ \t]*(do|for|if|else|return|switch|while)\n" |