Mercurial > mxe-octave

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3368
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
1 diff -ur QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt3/qscilexeroctave.cpp
3349
f192e892ff76 QScintilla: patch qscintilla for end_try_catch keyword
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 --- QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp 2013-12-07 12:41:01.000000000 -0500
3368
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
3 +++ QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt3/qscilexeroctave.cpp 2013-12-09 21:30:04.000000000 -0500
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
4 @@ -61,10 +61,13 @@
3349
f192e892ff76 QScintilla: patch qscintilla for end_try_catch keyword
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 {
f192e892ff76 QScintilla: patch qscintilla for end_try_catch keyword
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 if (set == 1)
f192e892ff76 QScintilla: patch qscintilla for end_try_catch keyword
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 return
f192e892ff76 QScintilla: patch qscintilla for end_try_catch keyword
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 - "break case catch continue do else elseif end end_unwind_protect "
3368
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
9 - "endfor endfunction endif endswitch endwhile for function "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
10 - "global if otherwise persistent return switch try until "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
11 - "unwind_protect unwind_protect_cleanup while";
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
12 + "__FILE__ __LINE__ break case catch classdef continue do else "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
13 + "elseif end end_try_catch end_unwind_protect endclassdef "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
14 + "endenumeration endevents endfor endfunction endif endmethods "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
15 + "endparfor endproperties endswitch endwhile enumeration events "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
16 + "for function get global if methods otherwise parfor persistent "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
17 + "properties return set static switch try until unwind_protect "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
18 + "unwind_protect_cleanup while";
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
19
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
20 return 0;
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
21 }
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
22 diff -ur QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt4Qt5/qscilexeroctave.cpp
3349
f192e892ff76 QScintilla: patch qscintilla for end_try_catch keyword
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 --- QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp 2013-12-07 12:41:01.000000000 -0500
3368
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
24 +++ QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt4Qt5/qscilexeroctave.cpp 2013-12-09 21:30:04.000000000 -0500
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
25 @@ -61,10 +61,13 @@
3349
f192e892ff76 QScintilla: patch qscintilla for end_try_catch keyword
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 {
f192e892ff76 QScintilla: patch qscintilla for end_try_catch keyword
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 if (set == 1)
f192e892ff76 QScintilla: patch qscintilla for end_try_catch keyword
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 return
f192e892ff76 QScintilla: patch qscintilla for end_try_catch keyword
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 - "break case catch continue do else elseif end end_unwind_protect "
3368
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
30 - "endfor endfunction endif endswitch endwhile for function "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
31 - "global if otherwise persistent return switch try until "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
32 - "unwind_protect unwind_protect_cleanup while";
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
33 + "__FILE__ __LINE__ break case catch classdef continue do else "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
34 + "elseif end end_try_catch end_unwind_protect endclassdef "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
35 + "endenumeration endevents endfor endfunction endif endmethods "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
36 + "endparfor endproperties endswitch endwhile enumeration events "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
37 + "for function get global if methods otherwise parfor persistent "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
38 + "properties return set static switch try until unwind_protect "
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
39 + "unwind_protect_cleanup while";
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
40
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
41 return 0;
f03dfd9bf241 qscintilla: update keywords per qsintilla 2.8.1 patch
John Donoghue <john.donoghue@ieee.org>
parents: 3349
diff changeset
42 }