From 1ea76eb51bcc36cf5d044a1d1b49104ca7600f2a Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 2 Dec 2015 10:29:18 +0000 Subject: [PATCH] Treating backslashed quotes properly, and not colouring triple-quoted strings twice. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5467 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ doc/syntax/python.nanorc | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e91ed63..36470002 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-12-02 Benno Schulenberg * doc/syntax/python.nanorc: Don't colour triple quotes by themselves. + * doc/syntax/python.nanorc: Treat backslashed quotes properly, and + don't colour triple-quoted strings in two manners. 2015-12-02 Arturo Borrero Gonzalez * doc/syntax/nftables.nanorc: New file; syntax colouring for nftables. diff --git a/doc/syntax/python.nanorc b/doc/syntax/python.nanorc index 9662a580..5c35f3b6 100644 --- a/doc/syntax/python.nanorc +++ b/doc/syntax/python.nanorc @@ -10,14 +10,14 @@ icolor brightblue "def [0-9A-Z_]+" color brightcyan "\<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from)\>" color brightcyan "\<(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}" +# Single-quoted strings. +color brightgreen "'([^'\]|\\.)+'" +color brightgreen ""([^"\]|\\.)+"" # Comments. color brightred "(^|[[:blank:]])#.*$" -# Multiline strings. -color brightgreen start="\"\"\"[^"),]" end="(^|[^(])\"\"\"" -color brightgreen start="'''[^'),]" end="(^|[^(])'''" +# Triple-quoted strings. +color brightgreen start="'''[^'),]" end="(^|[^(\])'''" +color brightgreen start="\"\"\"[^"),]" end="(^|[^(\])\"\"\"" # Reminders. color ,yellow "(FIXME|TODO|XXX)" -- 2.39.5