nano

commit e39cf370264005f66ccb964a8ce5383615a7a4ed
parent 6440aa9e4758ff3aea78745d882e223f977e8892
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Wed, 25 Mar 2015 13:50:12 +0000

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

Diffstat:
M
ChangeLog
 | 
4
++++
M
doc/syntax/python.nanorc
 | 
4
++--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git 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
@@ -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)"