Permalink
Browse files

Merge branch 'scintilla-update'

  • Loading branch information...
b4n committed Jun 30, 2012
2 parents 098f127 + 7c0d4d1 commit a6c0dc0978a4ee0ee1ed384e57356303fb0d274c
Showing with 2,532 additions and 2,479 deletions.
  1. +4 −1 NEWS
  2. +1 −0 data/filetypes.c
  3. +1 −0 data/filetypes.css
  4. +150 −1,054 scintilla/gtk/PlatGTK.cxx
  5. +48 −94 scintilla/gtk/ScintillaGTK.cxx
  6. +8 −0 scintilla/include/ILexer.h
  7. +77 −119 scintilla/include/Platform.h
  8. +130 −0 scintilla/include/SciLexer.h
  9. +29 −2 scintilla/include/Scintilla.h
  10. +224 −9 scintilla/include/Scintilla.iface
  11. +1 −0 scintilla/lexers/LexAda.cxx
  12. +1 −5 scintilla/lexers/LexAsm.cxx
  13. +9 −2 scintilla/lexers/LexBash.cxx
  14. +1 −5 scintilla/lexers/LexBasic.cxx
  15. +30 −20 scintilla/lexers/LexCPP.cxx
  16. +204 −24 scintilla/lexers/LexCSS.cxx
  17. +1 −5 scintilla/lexers/LexD.cxx
  18. +19 −12 scintilla/lexers/LexHTML.cxx
  19. +1 −0 scintilla/lexers/LexNsis.cxx
  20. +25 −8 scintilla/lexers/LexOthers.cxx
  21. +20 −0 scintilla/lexers/LexPascal.cxx
  22. +2 −7 scintilla/lexers/LexPerl.cxx
  23. +2 −4 scintilla/lexers/LexRuby.cxx
  24. +128 −35 scintilla/lexers/LexSQL.cxx
  25. +0 −3 scintilla/lexers/LexVHDL.cxx
  26. +1 −1 scintilla/lexlib/LexAccessor.h
  27. +2 −2 scintilla/lexlib/PropSetSimple.cxx
  28. +14 −5 scintilla/scintilla_changes.patch
  29. +7 −4 scintilla/src/AutoComplete.cxx
  30. +2 −1 scintilla/src/AutoComplete.h
  31. +34 −29 scintilla/src/CallTip.cxx
  32. +12 −11 scintilla/src/CallTip.h
  33. +8 −0 scintilla/src/CellBuffer.cxx
  34. +2 −0 scintilla/src/CellBuffer.h
  35. +2 −2 scintilla/src/Decoration.cxx
  36. +155 −126 scintilla/src/Document.cxx
  37. +8 −3 scintilla/src/Document.h
  38. +590 −509 scintilla/src/Editor.cxx
  39. +16 −18 scintilla/src/Editor.h
  40. +3 −0 scintilla/src/FontQuality.h
  41. +5 −9 scintilla/src/Indicator.cxx
  42. +1 −1 scintilla/src/Indicator.h
  43. +82 −86 scintilla/src/LineMarker.cxx
  44. +18 −17 scintilla/src/LineMarker.h
  45. +39 −24 scintilla/src/PerLine.cxx
  46. +1 −0 scintilla/src/PerLine.h
  47. +9 −9 scintilla/src/PositionCache.cxx
  48. +7 −7 scintilla/src/PositionCache.h
  49. +25 −11 scintilla/src/ScintillaBase.cxx
  50. +0 −2 scintilla/src/ScintillaBase.h
  51. +18 −0 scintilla/src/SplitVector.h
  52. +18 −20 scintilla/src/Style.cxx
  53. +8 −10 scintilla/src/Style.h
  54. +117 −0 scintilla/src/UniConversion.cxx
  55. +15 −0 scintilla/src/UniConversion.h
  56. +73 −93 scintilla/src/ViewStyle.cxx
  57. +23 −23 scintilla/src/ViewStyle.h
  58. +6 −38 scintilla/src/XPM.cxx
  59. +3 −7 scintilla/src/XPM.h
  60. +1 −1 scintilla/version.txt
  61. +87 −0 scripts/update-scintilla.sh
  62. +2 −1 src/highlighting.c
  63. +2 −0 src/highlightingmappings.h
View
5 NEWS
@@ -1,5 +1,8 @@
Geany 1.23 (unreleased)
+ Editor
+ * Update Scintilla to version 3.2.0.
+
Geany 1.22 (June 18, 2012)
@@ -111,7 +114,7 @@ Geany 1.22 (June 18, 2012)
Internationalization:
* Add translations: ar, id, lt, mn, nn, sk
- * Update translations: de, es, fr, hu, it, ja, kk, lt, nl, pl, pt,
+ * Update translations: de, es, fr, hu, it, ja, kk, lt, nl, pl, pt,
pt_BR, sk, sl, sv, tr, zh_CN, zh_TW
View
@@ -23,6 +23,7 @@ commentdockeyworderror=comment_doc_keyword_error
globalclass=class
# """verbatim"""
tripleverbatim=string_2
+hashquotedstring=string_2
[keywords]
# all items must be in one line
View
@@ -16,6 +16,7 @@ attribute=attribute
value=value
id=number
identifier2=keyword_2
+variable=identifier_1
important=extra
directive=preprocessor
identifier3=keyword_3
Oops, something went wrong.

0 comments on commit a6c0dc0

Please sign in to comment.