diff options
| -rw-r--r-- | Documentation/gitattributes.txt | 2 | ||||
| -rw-r--r-- | userdiff.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index e657a6b7b7..e387cc6dda 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -819,7 +819,7 @@ patterns are available: - `java` suitable for source code in the Java language. -- `matlab` suitable for source code in the MATLAB and Octave language. +- `matlab` suitable for source code in the MATLAB and Octave languages. - `objc` suitable for source code in the Objective-C language. diff --git a/userdiff.c b/userdiff.c index bcae006abe..04270fb4d7 100644 --- a/userdiff.c +++ b/userdiff.c @@ -58,9 +58,11 @@ PATTERNS("java", "|[-+*/<>%&^|=!]=" "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"), PATTERNS("matlab", - /* Octave pattern is mostly the same as matlab, except that '%%%' and + /* + * Octave pattern is mostly the same as matlab, except that '%%%' and * '##' can also be used to begin code sections, in addition to '%%' - * that is understood by both. */ + * that is understood by both. + */ "^[[:space:]]*((classdef|function)[[:space:]].*)$|^(%%%?|##)[[:space:]].*$", "[a-zA-Z_][a-zA-Z0-9_]*|[-+0-9.e]+|[=~<>]=|\\.[*/\\^']|\\|\\||&&"), PATTERNS("objc", |