From: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 12 May 2014 16:01:57 +0000 (+0000)
Subject: Improving the multiline regexes, making the one with single quotes work again.
X-Git-Tag: v2.3.3~67
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d17b4804ecf3d52b9366f22847efe2f8f9a72f08;p=nano.git

Improving the multiline regexes, making the one with single quotes work again.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4863 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 21e0251d..b25f9674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
 	* src/nano.h, src/color.c, src/global.c, src/rcfile.c: Rename struct
 	type 'exttype' to 'regexlisttype', to better match its functions, and
 	upon exit also free the regexes for libmagic results and headerlines.
+	* doc/syntax/python.nanorc: Improve the multiline regexes, make the
+	one with single quotes work again, and add some comments.
 
 2014-05-10 Chris Allegretta <chrisa@asty.org>
 	* src/rcfile.c (parse_color_names): Redefine false and true to
diff --git a/doc/syntax/python.nanorc b/doc/syntax/python.nanorc
index d329e618..de9a5ac5 100644
--- a/doc/syntax/python.nanorc
+++ b/doc/syntax/python.nanorc
@@ -2,13 +2,19 @@
 ##
 syntax "python" "\.py$"
 header "^#!.*/python[-0-9._]*"
+
+# Function definitions.
 icolor brightblue "def [0-9A-Z_]+"
+# Keywords.
 color brightcyan "\<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\>"
+# Strings.
 color brightgreen "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
 color brightgreen "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
-color brightgreen start="\"\"\"[^"]" end="\"\"\""
-color brightgreen start="\'\'\'[^']" end="\'\'\'"
-color brightred "#.*$"
+# Multiline strings.
+color brightgreen start="\"\"\"([^"),]|$)" end="(^|[^(])\"\"\""
+color brightgreen    start="'''([^'),]|$)" end="(^|[^(])'''"
+# Comments.
+color brightred "(^|[[:blank:]])#.*$"
 
-## Trailing whitespace
+# Trailing whitespace.
 color ,green "[[:space:]]+$"