Merge branch 'pb/doc-sequence-editor-configuration'

[thirdparty/git.git] / userdiff.c

diff --git a/userdiff.c b/userdiff.c
index 30ab42df8ef2b0a93b007b5afb484ccd4102c3b0..fde02f225b2b9ed17a8246913c3bddfa6483c98b 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -46,10 +46,14 @@ PATTERNS("elixir",
         /* Not real operators, but should be grouped */
         "|:?%[A-Za-z0-9_.]\\{\\}?"),
 IPATTERN("fortran",
+        /* Don't match comment lines */
         "!^([C*]|[ \t]*!)\n"
+        /* Don't match 'module procedure' lines */
         "!^[ \t]*MODULE[ \t]+PROCEDURE[ \t]\n"
+        /* Program, module, block data */
         "^[ \t]*((END[ \t]+)?(PROGRAM|MODULE|BLOCK[ \t]+DATA"
-               "|([^'\" \t]+[ \t]+)*(SUBROUTINE|FUNCTION))[ \t]+[A-Z].*)$",
+               /* Subroutines and functions */
+               "|([^!'\" \t]+[ \t]+)*(SUBROUTINE|FUNCTION))[ \t]+[A-Z].*)$",
         /* -- */
         "[a-zA-Z][a-zA-Z0-9_]*"
         "|\\.([Ee][Qq]|[Nn][Ee]|[Gg][TtEe]|[Ll][TtEe]|[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]|[Aa][Nn][Dd]|[Oo][Rr]|[Nn]?[Ee][Qq][Vv]|[Nn][Oo][Tt])\\."
@@ -79,6 +83,9 @@ PATTERNS("java",
         "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
         "|[-+*/<>%&^|=!]="
         "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
+PATTERNS("markdown",
+        "^ {0,3}#{1,6}[ \t].*",
+        "[^<>= \t]+"),
 PATTERNS("matlab",
         /*
          * Octave pattern is mostly the same as matlab, except that '%%%' and