Mercurial > mxe-octave

view src/qscintilla-1-fixes.patch @ 3531:d765eab1691e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bump version to 0.20 This version builds the stable-octave package completely from source with mingw-w64 for both 32- and 64-bit systems. Currently, 64-bit systems always use 64-bit indexing for Octave and dependencies.
author John W. Eaton <jwe@octave.org>
date Mon, 17 Feb 2014 01:20:23 -0500
parents f03dfd9bf241
children
line wrap: on
line source

diff -ur QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/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-9ccf1c74f266/Qt3/qscilexeroctave.cpp	2013-12-09 21:30:04.000000000 -0500
@@ -61,10 +61,13 @@
 {
     if (set == 1)
         return
-            "break case catch continue do else elseif end end_unwind_protect "
-            "endfor endfunction endif endswitch endwhile for function "
-            "global if otherwise persistent return switch try until "
-            "unwind_protect unwind_protect_cleanup while";
+            "__FILE__ __LINE__ break case catch classdef continue do else "
+            "elseif end end_try_catch end_unwind_protect endclassdef "
+            "endenumeration endevents endfor endfunction endif endmethods "
+            "endparfor endproperties endswitch endwhile enumeration events "
+            "for function get global if methods otherwise parfor persistent "
+            "properties return set static switch try until unwind_protect "
+            "unwind_protect_cleanup while";
 
     return 0;
 }
diff -ur QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/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-9ccf1c74f266/Qt4Qt5/qscilexeroctave.cpp	2013-12-09 21:30:04.000000000 -0500
@@ -61,10 +61,13 @@
 {
     if (set == 1)
         return
-            "break case catch continue do else elseif end end_unwind_protect "
-            "endfor endfunction endif endswitch endwhile for function "
-            "global if otherwise persistent return switch try until "
-            "unwind_protect unwind_protect_cleanup while";
+            "__FILE__ __LINE__ break case catch classdef continue do else "
+            "elseif end end_try_catch end_unwind_protect endclassdef "
+            "endenumeration endevents endfor endfunction endif endmethods "
+            "endparfor endproperties endswitch endwhile enumeration events "
+            "for function get global if methods otherwise parfor persistent "
+            "properties return set static switch try until unwind_protect "
+            "unwind_protect_cleanup while";
 
     return 0;
 }