Mercurial > mxe-octave
view src/qscintilla-1-fixes.patch @ 3578:583d3bf548e6
texinfo: update to 5.2 and install all tools
* src/texinfo.mk: update to 5.2 and make/make install all.
* src/texinfo-1-fixes.patch: updated patch for 5.2.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Tue, 15 Apr 2014 21:32:17 -0400 |
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; }