summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-03-12 19:38:33 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-03-12 19:38:33 +0000
commitec401cd22b942e8616c73c24d6717dc511b09158 (patch)
tree19e109fac06ef91c3cdd5d98ed19167367ae1db4 /dev-util/ninja-ide/files
parentRemove useless use of epunt_cxx wrt #460976 by Roman Žilka (diff)
downloadgentoo-2-ec401cd22b942e8616c73c24d6717dc511b09158.tar.gz
gentoo-2-ec401cd22b942e8616c73c24d6717dc511b09158.tar.bz2
gentoo-2-ec401cd22b942e8616c73c24d6717dc511b09158.zip
finally fix syntax highlighting
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'dev-util/ninja-ide/files')
-rw-r--r--dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch24
1 files changed, 20 insertions, 4 deletions
diff --git a/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch b/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch
index cfeb8149d327..f3eb64bf315a 100644
--- a/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch
+++ b/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch
@@ -1,7 +1,5 @@
-From c722e86c4e497efac56de674c47d5e094ea4c5c5 Mon Sep 17 00:00:00 2001
-From: Diego Sarmentero <diego.sarmentero@ninja-ide.org>
-Date: Tue, 12 Mar 2013 14:04:56 -0300
-Subject: [PATCH] Fixed Issue #1106
+https://github.com/ninja-ide/ninja-ide/commit/f19cffa29646f1f9bc015597080b8ebc0ed83530.patch
+https://github.com/ninja-ide/ninja-ide/commit/c722e86c4e497efac56de674c47d5e094ea4c5c5.patch
backported by hasufell@gentoo.org for 2.1.1
@@ -25,3 +23,21 @@ backported by hasufell@gentoo.org for 2.1.1
user_data = SyntaxUserData(False)
user_data.clear_data()
block_number = block.blockNumber()
+@@ -409,7 +409,7 @@
+ block = self.document().begin()
+ while block.isValid():
+ user_data = block.userData()
+- if (user_data is not None) and (user_data.error == True):
++ if (user_data is not None) and isinstance(user_data, SyntaxUserData) and (user_data.error == True):
+ errors_lines.append(block.blockNumber())
+ block = block.next()
+ return errors_lines
+@@ -462,7 +462,7 @@
+ ((st_fmt == STYLES['comment']) and
+ (self.previousBlockState() != 0))) and \
+ (len(start_collides) == 0):
+- if user_data is not None:
++ if user_data is not None and isinstance(user_data, SyntaxUserData):
+ style = highlight_errors(style, user_data)
+ self.setFormat(start, length, style)
+ else: