[geany/geany] 978fca: Fix our Scintilla patch

Colomban Wendling git-noreply at xxxxx
Fri Aug 16 12:48:31 UTC 2013


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 16 Aug 2013 12:48:31 UTC
Commit:      978fca130f6d768354bd745509ace5d24947ad31
             https://github.com/geany/geany/commit/978fca130f6d768354bd745509ace5d24947ad31

Log Message:
-----------
Fix our Scintilla patch

It got broken by df589a9d52086b22fe1dc7591482f5aa8f9bbc0e -- you have
to fix the line change count in the block header too.


Modified Paths:
--------------
    scintilla/scintilla_changes.patch

Modified: scintilla/scintilla_changes.patch
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -31,7 +31,7 @@ diff --git b/scintilla/src/Catalogue.cxx a/scintilla/src/Catalogue.cxx
 index 84d003e..37b2a3c 100644
 +++ scintilla/src/Catalogue.cxx
 --- scintilla/src/Catalogue.cxx
-@@ -81,110 +81,46 @@ int Scintilla_LinkLexers() {
+@@ -81,110 +81,47 @@ int Scintilla_LinkLexers() {
  
  //++Autogenerated -- run src/LexGen.py to regenerate
  //**\(\tLINK_LEXER(\*);\n\)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list