Not letting hashes inside triple-quoted strings cause comment colouring.

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

diff --git a/ChangeLog b/ChangeLog
index e5472598d9f4d8d6a6639cae0a83ad0b6d3cb0ca..353901b3d79e9cd4674aebf0c78744f1205a9a99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-03-25  Benno Schulenberg  <bensberg@justemail.net>
        * doc/syntax/debian.nanorc: Slightly widen and relax the header regex.
+       * doc/syntax/python.nanorc: Hashes inside triple-quoted strings should
+       not cause comment colouring.  (Inside single-qouted strings neither,
+       but then quotes in comments will be coloured like strings.)  This
+       solves https://bugs.launchpad.net/ubuntu/+source/nano/+bug/481363.
 
 2015-03-23  Benno Schulenberg  <bensberg@justemail.net>
        * src/text.c (do_alt_speller): Avoid the spell checker reporting

diff --git a/doc/syntax/python.nanorc b/doc/syntax/python.nanorc
index de876bdb93b98517c263202bdd7eb7aefa030116..eb2b36e9840aaedad47f53ce2ad1e1af56ee3b35 100644 (file)
--- a/doc/syntax/python.nanorc
+++ b/doc/syntax/python.nanorc
@@ -12,12 +12,12 @@ color brightcyan "\<(global|if|import|in|is|lambda|not|or|pass|print|raise|retur
 # Strings.
 color brightgreen "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
 color brightgreen "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
+# Comments.
+color brightred "(^|[[:blank:]])#.*$"
 # Multiline strings.
 color brightgreen start="\"\"\"([^"),]|$)" end="(^|[^(])\"\"\""
 color brightgreen    start="'''([^'),]|$)" end="(^|[^(])'''"
 
-# Comments.
-color brightred "(^|[[:blank:]])#.*$"
 # Reminders.
 color ,yellow "(FIXME|TODO|XXX)"