Mercurial > mxe-octave

changeset 3368:f03dfd9bf241

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscintilla: update keywords per qsintilla 2.8.1 patch * src/qscintilla-1-fixes.patch: updated patch file for keywords.
author John Donoghue <john.donoghue@ieee.org>
date Thu, 12 Dec 2013 18:02:27 -0500
parents cfcbe03c9160
children a77a677643d5
files src/qscintilla-1-fixes.patch
diffstat 1 files changed, 32 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/qscintilla-1-fixes.patch	Mon Dec 09 20:23:14 2013 -0500
+++ b/src/qscintilla-1-fixes.patch	Thu Dec 12 18:02:27 2013 -0500
@@ -1,24 +1,42 @@
-diff -urp QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-194a2142c9b6/Qt3/qscilexeroctave.cpp
+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-194a2142c9b6/Qt3/qscilexeroctave.cpp	2013-12-07 12:43:24.000000000 -0500
-@@ -61,7 +61,7 @@ const char *QsciLexerOctave::keywords(in
++++ 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 "
-+            "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
+-            "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-194a2142c9b6/Qt4Qt5/qscilexeroctave.cpp	2013-12-07 12:44:19.000000000 -0500
-@@ -61,7 +61,7 @@ const char *QsciLexerOctave::keywords(in
++++ 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 "
-+            "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";
+-            "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;
+ }