changeset 3349:f192e892ff76

QScintilla: patch qscintilla for end_try_catch keyword * src/qscintilla-1-fixes.patch: new file.
author John Donoghue <john.donoghue@ieee.org>
date Sun, 08 Dec 2013 07:54:21 -0500
parents c3ad8e6faffa
children 078ba7a8c95b
files src/qscintilla-1-fixes.patch
diffstat 1 files changed, 24 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/qscintilla-1-fixes.patch	Sun Dec 08 07:54:21 2013 -0500
@@ -0,0 +1,24 @@
+diff -urp QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-194a2142c9b6/Qt3/qscilexeroctave.cpp
+--- QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp	2013-12-07 12:41:01.000000000 -0500
++++ QScintilla-gpl-2.8.1-snapshot-194a2142c9b6/Qt3/qscilexeroctave.cpp	2013-12-07 12:43:24.000000000 -0500
+@@ -61,7 +61,7 @@ const char *QsciLexerOctave::keywords(in
+ {
+     if (set == 1)
+         return
+-            "break case catch continue do else elseif end end_unwind_protect "
++            "break case catch continue do else elseif end end_try_catch end_unwind_protect "
+             "endfor endfunction endif endswitch endwhile for function "
+             "global if otherwise persistent return switch try until "
+             "unwind_protect unwind_protect_cleanup while";
+diff -urp QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-194a2142c9b6/Qt4Qt5/qscilexeroctave.cpp
+--- QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp	2013-12-07 12:41:01.000000000 -0500
++++ QScintilla-gpl-2.8.1-snapshot-194a2142c9b6/Qt4Qt5/qscilexeroctave.cpp	2013-12-07 12:44:19.000000000 -0500
+@@ -61,7 +61,7 @@ const char *QsciLexerOctave::keywords(in
+ {
+     if (set == 1)
+         return
+-            "break case catch continue do else elseif end end_unwind_protect "
++            "break case catch continue do else elseif end end_try_catch end_unwind_protect "
+             "endfor endfunction endif endswitch endwhile for function "
+             "global if otherwise persistent return switch try until "
+             "unwind_protect unwind_protect_cleanup while";