Mercurial > mxe-octave

comparison src/qscintilla-1-fixes.patch @ 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 f192e892ff76
children
comparison
equal deleted inserted replaced
3367:cfcbe03c9160 3368:f03dfd9bf241
1 diff -urp QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-194a2142c9b6/Qt3/qscilexeroctave.cpp 1 diff -ur QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt3/qscilexeroctave.cpp
2 --- QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp 2013-12-07 12:41:01.000000000 -0500 2 --- QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp 2013-12-07 12:41:01.000000000 -0500
3 +++ QScintilla-gpl-2.8.1-snapshot-194a2142c9b6/Qt3/qscilexeroctave.cpp 2013-12-07 12:43:24.000000000 -0500 3 +++ QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt3/qscilexeroctave.cpp 2013-12-09 21:30:04.000000000 -0500
4 @@ -61,7 +61,7 @@ const char *QsciLexerOctave::keywords(in 4 @@ -61,10 +61,13 @@
5 { 5 {
6 if (set == 1) 6 if (set == 1)
7 return 7 return
8 - "break case catch continue do else elseif end end_unwind_protect " 8 - "break case catch continue do else elseif end end_unwind_protect "
9 + "break case catch continue do else elseif end end_try_catch end_unwind_protect " 9 - "endfor endfunction endif endswitch endwhile for function "
10 "endfor endfunction endif endswitch endwhile for function " 10 - "global if otherwise persistent return switch try until "
11 "global if otherwise persistent return switch try until " 11 - "unwind_protect unwind_protect_cleanup while";
12 "unwind_protect unwind_protect_cleanup while"; 12 + "__FILE__ __LINE__ break case catch classdef continue do else "
13 diff -urp QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-194a2142c9b6/Qt4Qt5/qscilexeroctave.cpp 13 + "elseif end end_try_catch end_unwind_protect endclassdef "
14 + "endenumeration endevents endfor endfunction endif endmethods "
15 + "endparfor endproperties endswitch endwhile enumeration events "
16 + "for function get global if methods otherwise parfor persistent "
17 + "properties return set static switch try until unwind_protect "
18 + "unwind_protect_cleanup while";
19
20 return 0;
21 }
22 diff -ur QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt4Qt5/qscilexeroctave.cpp
14 --- QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp 2013-12-07 12:41:01.000000000 -0500 23 --- QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp 2013-12-07 12:41:01.000000000 -0500
15 +++ QScintilla-gpl-2.8.1-snapshot-194a2142c9b6/Qt4Qt5/qscilexeroctave.cpp 2013-12-07 12:44:19.000000000 -0500 24 +++ QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt4Qt5/qscilexeroctave.cpp 2013-12-09 21:30:04.000000000 -0500
16 @@ -61,7 +61,7 @@ const char *QsciLexerOctave::keywords(in 25 @@ -61,10 +61,13 @@
17 { 26 {
18 if (set == 1) 27 if (set == 1)
19 return 28 return
20 - "break case catch continue do else elseif end end_unwind_protect " 29 - "break case catch continue do else elseif end end_unwind_protect "
21 + "break case catch continue do else elseif end end_try_catch end_unwind_protect " 30 - "endfor endfunction endif endswitch endwhile for function "
22 "endfor endfunction endif endswitch endwhile for function " 31 - "global if otherwise persistent return switch try until "
23 "global if otherwise persistent return switch try until " 32 - "unwind_protect unwind_protect_cleanup while";
24 "unwind_protect unwind_protect_cleanup while"; 33 + "__FILE__ __LINE__ break case catch classdef continue do else "
34 + "elseif end end_try_catch end_unwind_protect endclassdef "
35 + "endenumeration endevents endfor endfunction endif endmethods "
36 + "endparfor endproperties endswitch endwhile enumeration events "
37 + "for function get global if methods otherwise parfor persistent "
38 + "properties return set static switch try until unwind_protect "
39 + "unwind_protect_cleanup while";
40
41 return 0;
42 }