userdiff: fix grammar and style issues

Signed-off-by: Boxuan Li <liboxuan@connect.hku.hk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index e657a6b7b783c7d0d18eb64dde16010b0a223a27..e387cc6dda128542d819b661ca92f2ae3316ce58 100644 (file)
--- 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 bcae006abe70641fa732590eef0638c10de2b237..04270fb4d7e598522cc2ebfc898d537496f44939 100644 (file)
--- 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",