[Python-modules-commits] r22974 - in packages/pygments/trunk/debian (3 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Monday, November 12, 2012 @ 12:21:33
  Author: mitya57-guest
Revision: 22974

Add debian/patches/fix_makefile_re.patch that fixes Makefile highlighting

Added:
  packages/pygments/trunk/debian/patches/fix_makefile_re.patch
Modified:
  packages/pygments/trunk/debian/changelog
  packages/pygments/trunk/debian/patches/series

Modified: packages/pygments/trunk/debian/changelog
===================================================================
--- packages/pygments/trunk/debian/changelog	2012-11-12 11:49:13 UTC (rev 22973)
+++ packages/pygments/trunk/debian/changelog	2012-11-12 12:21:33 UTC (rev 22974)
@@ -6,6 +6,8 @@
   * Add an empty build-arch target in debian/rules.
   * Bump Standards-Version to 3.9.4, no changes needed.
   * Drop Breaks: {python:Breaks}, it is obsolete.
+  * debian/patches/fix_makefile_re.patch: cherry-picked upstream commit
+    that fixes Makefile highlighting.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 12 Nov 2012 13:30:20 +0400
 

Added: packages/pygments/trunk/debian/patches/fix_makefile_re.patch
===================================================================
--- packages/pygments/trunk/debian/patches/fix_makefile_re.patch	                        (rev 0)
+++ packages/pygments/trunk/debian/patches/fix_makefile_re.patch	2012-11-12 12:21:33 UTC (rev 22974)
@@ -0,0 +1,17 @@
+Author: Ken Wu <ken.wu at ruckuswireless.com>
+Description: Fixed regular expressions for assignment in BaseMakefileLexer.
+Origin: upstream; https://bitbucket.org/birkenfeld/pygments-main/changeset/c2c8279ef670
+
+diff -r bed423abed70 -r b79e4674bc30 pygments/lexers/text.py
+--- a/pygments/lexers/text.py	Tue Aug 14 00:40:51 2012 +0900
++++ b/pygments/lexers/text.py	Thu Aug 16 15:57:51 2012 +0800
+@@ -187,7 +187,7 @@
+              bygroups(Keyword, Text), 'export'),
+             (r'export\s+', Keyword),
+             # assignment
+-            (r'([a-zA-Z0-9_${}.-]+)(\s*)([!?:+]?=)([ \t]*)((?:.*\\\n|.*\n)+)',
++            (r'([a-zA-Z0-9_${}.-]+)(\s*)([!?:+]?=)([ \t]*)((?:.*\\\n)+|.*\n)',
+              bygroups(Name.Variable, Text, Operator, Text, using(BashLexer))),
+             # strings
+             (r'(?s)"(\\\\|\\.|[^"\\])*"', String.Double),
+

Modified: packages/pygments/trunk/debian/patches/series
===================================================================
--- packages/pygments/trunk/debian/patches/series	2012-11-12 11:49:13 UTC (rev 22973)
+++ packages/pygments/trunk/debian/patches/series	2012-11-12 12:21:33 UTC (rev 22974)
@@ -1 +1,2 @@
 make_utf8_default.patch
+fix_makefile_re.patch