Branch: refs/heads/gtkbuilder Home: https://github.com/geany/geany
Commit: a0367acd2dc154ed0158b0b85f1b2ebf88a3246f https://github.com/geany/geany/commit/a0367acd2dc154ed0158b0b85f1b2ebf88a324... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-10-22 (Sat, 22 Oct 2011)
Changed paths: M NEWS M data/filetypes.latex M data/filetypes.lua M data/filetypes.perl M scintilla/gtk/PlatGTK.cxx M scintilla/gtk/ScintillaGTK.cxx M scintilla/include/Platform.h M scintilla/include/SciLexer.h M scintilla/include/Scintilla.h M scintilla/include/Scintilla.iface M scintilla/lexers/LexBasic.cxx M scintilla/lexers/LexCOBOL.cxx M scintilla/lexers/LexCPP.cxx M scintilla/lexers/LexHTML.cxx M scintilla/lexers/LexLua.cxx M scintilla/lexers/LexMarkdown.cxx M scintilla/lexers/LexMatlab.cxx M scintilla/lexers/LexOthers.cxx M scintilla/lexers/LexPerl.cxx M scintilla/lexers/LexPython.cxx M scintilla/lexers/LexRuby.cxx M scintilla/lexers/LexSQL.cxx M scintilla/lexers/LexVHDL.cxx M scintilla/lexers/LexVerilog.cxx M scintilla/lexlib/Accessor.cxx M scintilla/lexlib/CharacterSet.h M scintilla/lexlib/PropSetSimple.cxx M scintilla/lexlib/SparseState.h M scintilla/lexlib/StyleContext.h M scintilla/lexlib/WordList.cxx M scintilla/scintilla_changes.patch M scintilla/src/CallTip.cxx M scintilla/src/ContractionState.cxx M scintilla/src/ContractionState.h M scintilla/src/Decoration.cxx M scintilla/src/Document.cxx M scintilla/src/Document.h M scintilla/src/Editor.cxx M scintilla/src/Editor.h M scintilla/src/Indicator.cxx M scintilla/src/Indicator.h M scintilla/src/KeyMap.cxx M scintilla/src/KeyMap.h M scintilla/src/LineMarker.cxx M scintilla/src/LineMarker.h M scintilla/src/PerLine.cxx M scintilla/src/PositionCache.cxx M scintilla/src/PositionCache.h M scintilla/src/RESearch.cxx M scintilla/src/RunStyles.cxx M scintilla/src/RunStyles.h M scintilla/src/ScintillaBase.cxx M scintilla/src/Style.cxx M scintilla/src/Style.h M scintilla/src/ViewStyle.cxx M scintilla/src/ViewStyle.h M scintilla/src/XPM.cxx M scintilla/src/XPM.h M scintilla/version.txt M src/highlighting.c
Log Message: ----------- Merge branch 'scintilla-update'
Commit: 03dd57f148425401ba366ff6905a57e0f1f10a17 https://github.com/geany/geany/commit/03dd57f148425401ba366ff6905a57e0f1f10a... Author: Lex Trotman elextr@gmail.com Date: 2011-10-22 (Sat, 22 Oct 2011)
Changed paths: M src/keyfile.c
Log Message: ----------- Fix escaping of session filepaths
Fixes bug #3425969. Replace Geany escaping of session filepaths with g_uri_escape_string (available now in 2.16) allowing any punctuation characters in the path.
Commit: 82146e953fa1bd41611ae1414159491818c412d7 https://github.com/geany/geany/commit/82146e953fa1bd41611ae1414159491818c412... Author: Matthew Brush mbrush@codebrainz.ca Date: 2011-10-23 (Sun, 23 Oct 2011)
Changed paths: M src/search.c
Log Message: ----------- Remove max length limit of 248 characters on search dialogs
Commit: deb2d4a7f9ad385aa0c0be3a50ce683c88687890 https://github.com/geany/geany/commit/deb2d4a7f9ad385aa0c0be3a50ce683c886878... Author: Enrico Tröger enrico.troeger@uvena.de Date: 2011-10-23 (Sun, 23 Oct 2011)
Changed paths: M doc/geany.html M doc/geany.txt
Log Message: ----------- Add a few notes about generating tags files on Windows
Commit: c51129db6e703b6227e45130fcfc3243945fec3f https://github.com/geany/geany/commit/c51129db6e703b6227e45130fcfc3243945fec... Author: Enrico Tröger enrico.troeger@uvena.de Date: 2011-10-23 (Sun, 23 Oct 2011)
Changed paths: M src/win32.c
Log Message: ----------- When using the debug console, capture stdin as well.
This enables us to wait for input in the debug console window and so keep it open if necessary until there is some input of the user.
Commit: 3fd7e9f68e6b859b80095fc609ffbdebf16306bc https://github.com/geany/geany/commit/3fd7e9f68e6b859b80095fc609ffbdebf16306... Author: Enrico Tr?ger enrico.troeger@uvena.de Date: 2011-10-23 (Sun, 23 Oct 2011)
Changed paths: M src/main.c
Log Message: ----------- Wait for user input in the debug console
This way, Geany's standard out and error can be read if started in verbose mode until a key is pressed which makes debugging of command line actions easier.
Commit: f6e135435b3d8cf6c382ab0504ff71c3ab6217f7 https://github.com/geany/geany/commit/f6e135435b3d8cf6c382ab0504ff71c3ab6217... Author: Matthew Brush matt@geany.org Date: 2011-10-23 (Sun, 23 Oct 2011)
Changed paths: M data/filetypes.ada M data/filetypes.asm M data/filetypes.c M data/filetypes.caml M data/filetypes.cobol M data/filetypes.css M data/filetypes.d M data/filetypes.freebasic M data/filetypes.haskell M data/filetypes.lisp M data/filetypes.nsis M data/filetypes.pascal M data/filetypes.perl M data/filetypes.python M data/filetypes.ruby M data/filetypes.sh M data/filetypes.sql M data/filetypes.xml
Log Message: ----------- Fixup various filedefs mappings
Commit: d33f511fc49b09168284bfe030f738635f748258 https://github.com/geany/geany/commit/d33f511fc49b09168284bfe030f738635f7482... Author: Frank Lanitz frank@frank.uvena.de Date: 2011-10-27 (Thu, 27 Oct 2011)
Changed paths: M data/filetypes.latex
Log Message: ----------- Use evince as default viewer for TeX/LaTeX
On most systems Geany is running inside an GTK/GNOME environment. As a matter of this fact we can assume evince is the default PDF-viewer.
Commit: 65e20780e43c80141cbadf19ae6510d9c3b2bfcc https://github.com/geany/geany/commit/65e20780e43c80141cbadf19ae6510d9c3b2bf... Author: Matthew Brush matt@geany.org Date: 2011-10-28 (Fri, 28 Oct 2011)
Changed paths: M plugins/classbuilder.c
Log Message: ----------- classbuilder: Use GTK/GNU code style for generated GTK+ code
Use two spaces instead of tabs, spaces between function and opening argument bracket, and various minor changes.
Add dummy gpointer to private struct so the class can be compiled without modification.
Commit: c4980f8c1e0a758e3da21369862865bfbb546304 https://github.com/geany/geany/commit/c4980f8c1e0a758e3da21369862865bfbb5463... Author: Matthew Brush matt@geany.org Date: 2011-10-28 (Fri, 28 Oct 2011)
Changed paths: M plugins/classbuilder.c
Log Message: ----------- classbuilder: Move caret to start of generated documents
Commit: a23e999b7bde54cc23184e6991ca5fdb58cdc47c https://github.com/geany/geany/commit/a23e999b7bde54cc23184e6991ca5fdb58cdc4... Author: Matthew Brush mbrush@codebrainz.ca Date: 2011-10-28 (Fri, 28 Oct 2011)
Changed paths: M HACKING M README M configure.ac M doc/geany.html M doc/geany.txt M geany.pc.in M plugins/filebrowser.c M src/callbacks.c M src/dialogs.c M src/ui_utils.c M src/utils.c M wscript
Log Message: ----------- Bump GTK+ version to 2.16
Commit: 3cc02e6aa1f92a106a0817990ba6623dbfc7b66c https://github.com/geany/geany/commit/3cc02e6aa1f92a106a0817990ba6623dbfc7b6... Author: Frank Lanitz frank@frank.uvena.de Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths: M po/ChangeLog M po/pl.po
Log Message: ----------- Update of Polish translation
Commit: c7639863884e8779c3be765869c84b414cd65ae8 https://github.com/geany/geany/commit/c7639863884e8779c3be765869c84b414cd65a... Author: Frank Lanitz frank@frank.uvena.de Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths: M po/ChangeLog
Log Message: ----------- Correct ChangeLog entry
Commit: a4194c5a63e255774e134f533653afe503628cea https://github.com/geany/geany/commit/a4194c5a63e255774e134f533653afe503628c... Author: Frank Lanitz frank@frank.uvena.de Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths: M src/about.c
Log Message: ----------- Move Jarosław to list of prev. Polish translators
Commit: e9973cc990fe13d87f94cfa2b807b2db764bf30b https://github.com/geany/geany/commit/e9973cc990fe13d87f94cfa2b807b2db764bf3... Author: Frank Lanitz frank@frank.uvena.de Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths: M src/about.c
Log Message: ----------- Just use pl as language code for Polish translation
Commit: 0337b19dcb2aa952c07fb5ceab31dc3fdff48127 https://github.com/geany/geany/commit/0337b19dcb2aa952c07fb5ceab31dc3fdff481... Author: Frank Lanitz frank@frank.uvena.de Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths: M THANKS M po/ChangeLog M src/about.c
Log Message: ----------- Adding Wojciech Świderski to list of Polish translators
Commit: 36ebb1f2b70f35dd802e98a628df070cff4f4d09 https://github.com/geany/geany/commit/36ebb1f2b70f35dd802e98a628df070cff4f4d... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths: M plugins/saveactions.c M src/build.c M src/gb.c M src/msgwindow.c M src/project.c M src/search.c M src/sidebar.c M src/ui_utils.c M src/vte.c
Log Message: ----------- Use canonical macros for stock items rather than plain strings
This makes the code more readable, potentially more future-proof (if the actual string changes) and better style (catches possible typos at build-time).
Commit: 274e01f5551c52374e49eb44690d3b5a665f2b21 https://github.com/geany/geany/commit/274e01f5551c52374e49eb44690d3b5a665f2b... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths: M src/symbols.c M src/ui_utils.c
Log Message: ----------- Fix various coding style issues
Commit: af838cda7b9a40c677437bd1828c31491f5c0f89 https://github.com/geany/geany/commit/af838cda7b9a40c677437bd1828c31491f5c0f... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths: M src/sidebar.c
Log Message: ----------- Allow to expand or collapse all items from openfiles popup menu
This is useful if one have many open files from different directories and wants to see the files from only one or another.
Commit: b69198691aa7b2a8a0d759aab10f64292b3e75b1 https://github.com/geany/geany/commit/b69198691aa7b2a8a0d759aab10f64292b3e75... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-10-31 (Mon, 31 Oct 2011)
Changed paths: M src/document.c M src/utils.h
Log Message: ----------- Add utils_filenamecmp().
Commit: 42b3e7212a21a7518c65b088e436699085111783 https://github.com/geany/geany/commit/42b3e7212a21a7518c65b088e4366990851117... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-10-31 (Mon, 31 Oct 2011)
Changed paths: M src/sidebar.c
Log Message: ----------- Fix document list path comparison on Windows
Use case-insensitive matching for project base path and home directory in document filenames.
Commit: fdd5537cc0fcdb0e0ce1a5f58d2e08647436b847 https://github.com/geany/geany/commit/fdd5537cc0fcdb0e0ce1a5f58d2e08647436b8... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-10-31 (Mon, 31 Oct 2011)
Changed paths: M src/document.c M src/utils.c
Log Message: ----------- Use g_return_val_if_fail for some invalid NULL arguments
Commit: 5f0e46e07e3deaf5543b9920ae092711a31f6445 https://github.com/geany/geany/commit/5f0e46e07e3deaf5543b9920ae092711a31f64... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-11-01 (Tue, 01 Nov 2011)
Changed paths: M src/sidebar.c
Log Message: ----------- Fix finding paths in the document list on Windows
Finding paths in the tree was not case-insensitive either.
Commit: 13597df9dffdcbd3091aac224d20b1924c563bde https://github.com/geany/geany/commit/13597df9dffdcbd3091aac224d20b1924c563b... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-11-01 (Tue, 01 Nov 2011)
Changed paths: M src/utils.c
Log Message: ----------- Convert Unix path separators on Windows when opening documents
Unix path separators can occur e.g. when using MSYS. Windows does not allow filenames to contain Unix path separators so this should be safe.
Commit: f31a84869d45980a7ecb27f5a4d6c3588c547eee https://github.com/geany/geany/commit/f31a84869d45980a7ecb27f5a4d6c3588c547e... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-11-01 (Tue, 01 Nov 2011)
Changed paths: M src/document.c M src/editor.c
Log Message: ----------- Minor code cleanup for document_update_type_keywords()
Fix correctly checking result of editor_lexer_get_type_keyword_idx(). Do not check IS_SCINTILLA unnecessarily (this is covered by DOC_VALID). Do not use G_[UN]LIKELY macros as this complicates code without any real benefit (unless in a tight loop).
Commit: 83d9f9e82bc26bcd4c59644883bca58f70a96e4a https://github.com/geany/geany/commit/83d9f9e82bc26bcd4c59644883bca58f70a96e... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-11-02 (Wed, 02 Nov 2011)
Changed paths: M doc/makefile.win32 M doc/pluginsymbols.c
Log Message: ----------- Fix generating API docs (Windows makefile).
Also fixes a doxygen warning.
Commit: f1b9c58612293f90d465ade5ada014ef324e365d https://github.com/geany/geany/commit/f1b9c58612293f90d465ade5ada014ef324e36... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-11-02 (Wed, 02 Nov 2011)
Changed paths: M plugins/saveactions.c
Log Message: ----------- Fix auto-saving documents when the current document has no filename
Commit: de559ef5d4150e2485ef3ffb865e9c9d3249bcd8 https://github.com/geany/geany/commit/de559ef5d4150e2485ef3ffb865e9c9d3249bc... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-11-02 (Wed, 02 Nov 2011)
Changed paths: M src/build.c M src/callbacks.c M src/dialogs.c M src/document.c
Log Message: ----------- Make document_save_file() show the Save As dialog when necessary
Previously an error message was shown if doc->file_name is NULL.
The Save As dialog is now shown if the document does not have an absolute path. This is because the user should confirm where to save the document in this case.
Although this changes plugin API behaviour, it seems the best way to ensure the Save As dialog is always shown when needed so the user knows where the document has been saved.
Commit: 6ceb5ac1640dcf15f5bfb1415777fc7d5e58767e https://github.com/geany/geany/commit/6ceb5ac1640dcf15f5bfb1415777fc7d5e5876... Author: Matthew Brush mbrush@codebrainz.ca Date: 2011-11-02 (Wed, 02 Nov 2011)
Changed paths: M HACKING M src/document.c M src/editor.c M src/editor.h
Log Message: ----------- Remove editor_lexer_get_type_keyword_idx() function
It was used only in one place in document_update_type_keywords() which already did a similar check using the file type before calling this function.
Update HACKING file and very minor cleanup of other code in document_update_type_keywords().
Commit: ea51c487d3f1eb0baaed021249b39f775ed6992c https://github.com/geany/geany/commit/ea51c487d3f1eb0baaed021249b39f775ed699... Author: Matthew Brush mbrush@codebrainz.ca Date: 2011-11-02 (Wed, 02 Nov 2011)
Changed paths: M src/document.c
Log Message: ----------- Use Scintilla's buffer directly for parsing tags
Commit: ff663c16785a4b49a420e1b9a5977d95f140a242 https://github.com/geany/geany/commit/ff663c16785a4b49a420e1b9a5977d95f140a2... Author: Matthew Brush mbrush@codebrainz.ca Date: 2011-11-02 (Wed, 02 Nov 2011)
Changed paths: M src/document.c
Log Message: ----------- Remove init_doc_struct() function from documents.c
This function was only used from document_create() and most of this code is not needed since the memset() and g_new0() calls set the memory to all 0's, which in this case should suffice to (re)set all the members to 0/NULL/FALSE.
Refactor so all the resetting to defaults code is done in remove_page() only and then only do the required non-FALSE/NULL initialization in document_create().
Move the remove_page() prototype to the top of the file and various other minor changes in remove_page().
Commit: efcce8808e92ba56684605790959cb014a11c9c8 https://github.com/geany/geany/commit/efcce8808e92ba56684605790959cb014a11c9... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-11-03 (Thu, 03 Nov 2011)
Changed paths: M HACKING
Log Message: ----------- Add note not to use G_LIKELY or G_UNLIKELY (except in critical loops)
These add noise to the code with little real benefit.
Commit: 822240d17f19ca03720e1d5a2a244fc6b3e45702 https://github.com/geany/geany/commit/822240d17f19ca03720e1d5a2a244fc6b3e457... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-11-03 (Thu, 03 Nov 2011)
Changed paths: M HACKING
Log Message: ----------- Add Style example for structs, doc-comments
Commit: c39390aae8df5c65c0371f288eb1272b3b3e1b6c https://github.com/geany/geany/commit/c39390aae8df5c65c0371f288eb1272b3b3e1b... Author: Nick Treleaven nick.treleaven@btinternet.com Date: 2011-11-03 (Thu, 03 Nov 2011)
Changed paths: M doc/geany.html M doc/geany.txt
Log Message: ----------- Fix using American spelling of color
Commit: 0167f589b314056517627f88069a933daf56ee4d https://github.com/geany/geany/commit/0167f589b314056517627f88069a933daf56ee... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-11-03 (Thu, 03 Nov 2011)
Changed paths: M src/callbacks.c M src/document.c M src/keybindings.c M src/keyfile.c M src/sidebar.c M src/ui_utils.c
Log Message: ----------- Small code cleanup
Use foreach_document() in a few places where appropriate and make some code more consistent.
Commit: b55a30c2bf1fe2070b2edc4711d9a1bb93645291 https://github.com/geany/geany/commit/b55a30c2bf1fe2070b2edc4711d9a1bb936452... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-11-03 (Thu, 03 Nov 2011)
Changed paths: M src/document.c M src/main.c M src/ui_utils.c M src/ui_utils.h
Log Message: ----------- Build recent data for GTK ourselves
This prevents GTK of trying to fetch the necessary information like MIME-type itself, which leads to a significant speedup (> 30%), as well as using the real MIME-type we use rather than the GIO-guessed one.
Commit: c1df8a7263075b537950aba147c04a192c2f612e https://github.com/geany/geany/commit/c1df8a7263075b537950aba147c04a192c2f61... Author: Matthew Brush mbrush@codebrainz.ca Date: 2011-11-04 (Fri, 04 Nov 2011)
Changed paths: M src/document.c
Log Message: ----------- Use file type instead of lexer to decide if type keywords are supported
Not every filetype for a specific lexer implements type keywords even if the lexer supports it.
Commit: 19da0ce965901090f803805c53c3c3d33d6ac4f9 https://github.com/geany/geany/commit/19da0ce965901090f803805c53c3c3d33d6ac4... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-11-05 (Sat, 05 Nov 2011)
Changed paths: M data/filetypes.asm M data/filetypes.caml M data/filetypes.lisp M data/filetypes.sql M data/filetypes.tcl M src/highlighting.c
Log Message: ----------- Fix or add a few Scintilla styles mappings
Closes #3432760.
Commit: 3f31453acee15b09925ddca5dde1ea5d7bfaf194 https://github.com/geany/geany/commit/3f31453acee15b09925ddca5dde1ea5d7bfaf1... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-11-05 (Sat, 05 Nov 2011)
Changed paths: M src/build.c M src/callbacks.c M src/document.c M src/editor.c M src/filetypes.c M src/filetypes.h M src/highlighting.c M src/highlighting.h M src/sciwrappers.c M src/sciwrappers.h M src/symbols.c M src/symbols.h
Log Message: ----------- Fix various integer sign and size issues
Commit: 4d92e0530b7e64f4cbeda2d264b7e705cfd75699 https://github.com/geany/geany/commit/4d92e0530b7e64f4cbeda2d264b7e705cfd756... Author: Lex Trotman elextr@gmail.com Date: 2011-11-06 (Sun, 06 Nov 2011)
Changed paths: M src/dialogs.c M src/sidebar.c M tagmanager/js.c
Log Message: ----------- Fix warnings
Fix warnings that appeared with GCC 4.6 js.c:1067:10: warning: variable ‘is_prototype’ set but not used dialogs.c:173:2: warning: missing initializer dialogs.c:173:2: warning: (near initialization for ‘value.data’) sidebar.c:534:17: warning: unused variable ‘doc’
Commit: 1e54fb6a015f02c5be2ab18faca7b2059ca0a114 https://github.com/geany/geany/commit/1e54fb6a015f02c5be2ab18faca7b2059ca0a1... Author: Lex Trotman elextr@gmail.com Date: 2011-11-06 (Sun, 06 Nov 2011)
Changed paths: M src/dialogs.c
Log Message: ----------- Alter warning fix
Uninitialised GValue does not always work, but is an opaque type so structure of initialiser isn't known. Glib 2.30 on has G_VALUE_INIT to use as initial value. Fix so if not defined give it the previous literal value { 0 }, although this leaves the warning, so it is not initialising the GValue correctly but enough to work.
Commit: f201434a280dcd8f37ac95f42923d838142d1093 https://github.com/geany/geany/commit/f201434a280dcd8f37ac95f42923d838142d10... Author: Frank Lanitz frank@frank.uvena.de Date: 2011-11-06 (Sun, 06 Nov 2011)
Changed paths: M THANKS M po/ChangeLog A po/mn.po M src/about.c
Log Message: ----------- Adding Mongolian translation
Commit: 28dc825e2a504cb139ebc9dc9d25e565ff0f4fc4 https://github.com/geany/geany/commit/28dc825e2a504cb139ebc9dc9d25e565ff0f4f... Author: Enrico Tröger enrico.troeger@uvena.de Date: 2011-11-06 (Sun, 06 Nov 2011)
Changed paths: M src/about.c
Log Message: ----------- Update developer list in the About dialog
Commit: c9a32bfdc9abe29c13c20eedd8b8142e625f6e76 https://github.com/geany/geany/commit/c9a32bfdc9abe29c13c20eedd8b8142e625f6e... Author: Matthew Brush matt@geany.org Date: 2011-11-06 (Sun, 06 Nov 2011)
Changed paths: M src/editor.c M src/keybindings.c M src/keyfile.c M src/socket.c M src/win32.c
Log Message: ----------- Make use of gtk_widget_get_window() added in GTK+ 2.14
Commit: 0a16ec75209bb6aa130119d10064e811b3423b95 https://github.com/geany/geany/commit/0a16ec75209bb6aa130119d10064e811b3423b... Author: Matthew Brush matt@geany.org Date: 2011-11-06 (Sun, 06 Nov 2011)
Changed paths: M .gitignore M HACKING M NEWS M README M THANKS M configure.ac M data/colorschemes/alt.conf M data/filetypes.ada M data/filetypes.asm M data/filetypes.c M data/filetypes.caml M data/filetypes.cobol M data/filetypes.common M data/filetypes.css M data/filetypes.d M data/filetypes.freebasic M data/filetypes.haskell M data/filetypes.javascript M data/filetypes.latex M data/filetypes.lisp M data/filetypes.lua M data/filetypes.nsis M data/filetypes.pascal M data/filetypes.perl M data/filetypes.python M data/filetypes.ruby M data/filetypes.sh M data/filetypes.sql M data/filetypes.tcl M data/filetypes.xml M doc/geany.html M doc/geany.txt M doc/makefile.win32 M doc/pluginsymbols.c M geany.pc.in M plugins/classbuilder.c M plugins/filebrowser.c M plugins/htmlchars.c M plugins/saveactions.c M po/ChangeLog A po/mn.po M po/pl.po M scintilla/gtk/PlatGTK.cxx M scintilla/gtk/ScintillaGTK.cxx M scintilla/include/Platform.h M scintilla/include/SciLexer.h M scintilla/include/Scintilla.h M scintilla/include/Scintilla.iface M scintilla/lexers/LexBasic.cxx M scintilla/lexers/LexCOBOL.cxx M scintilla/lexers/LexCPP.cxx M scintilla/lexers/LexHTML.cxx M scintilla/lexers/LexLua.cxx M scintilla/lexers/LexMarkdown.cxx M scintilla/lexers/LexMatlab.cxx M scintilla/lexers/LexOthers.cxx M scintilla/lexers/LexPerl.cxx M scintilla/lexers/LexPython.cxx M scintilla/lexers/LexRuby.cxx M scintilla/lexers/LexSQL.cxx M scintilla/lexers/LexVHDL.cxx M scintilla/lexers/LexVerilog.cxx M scintilla/lexlib/Accessor.cxx M scintilla/lexlib/CharacterSet.h M scintilla/lexlib/PropSetSimple.cxx M scintilla/lexlib/SparseState.h M scintilla/lexlib/StyleContext.h M scintilla/lexlib/WordList.cxx M scintilla/scintilla_changes.patch M scintilla/src/CallTip.cxx M scintilla/src/ContractionState.cxx M scintilla/src/ContractionState.h M scintilla/src/Decoration.cxx M scintilla/src/Document.cxx M scintilla/src/Document.h M scintilla/src/Editor.cxx M scintilla/src/Editor.h M scintilla/src/Indicator.cxx M scintilla/src/Indicator.h M scintilla/src/KeyMap.cxx M scintilla/src/KeyMap.h M scintilla/src/LineMarker.cxx M scintilla/src/LineMarker.h M scintilla/src/PerLine.cxx M scintilla/src/PositionCache.cxx M scintilla/src/PositionCache.h M scintilla/src/RESearch.cxx M scintilla/src/RunStyles.cxx M scintilla/src/RunStyles.h M scintilla/src/ScintillaBase.cxx M scintilla/src/Style.cxx M scintilla/src/Style.h M scintilla/src/ViewStyle.cxx M scintilla/src/ViewStyle.h M scintilla/src/XPM.cxx M scintilla/src/XPM.h M scintilla/version.txt A scripts/rstrip-whitespace.py M src/about.c M src/build.c M src/callbacks.c M src/dialogs.c M src/document.c M src/document.h M src/editor.c M src/editor.h M src/filetypes.c M src/filetypes.h M src/gb.c M src/geanyentryaction.c M src/geanyobject.c M src/highlighting.c M src/highlighting.h M src/images.c A src/interface.c M src/keybindings.c M src/keyfile.c M src/main.c M src/msgwindow.c M src/notebook.c M src/prefs.c M src/printing.c M src/project.c M src/sciwrappers.c M src/sciwrappers.h M src/search.c M src/sidebar.c M src/socket.c M src/stash.c M src/stash.h M src/symbols.c M src/symbols.h M src/toolbar.c M src/tools.c M src/ui_utils.c M src/ui_utils.h M src/utils.c M src/utils.h M src/vte.c M src/win32.c M tagmanager/js.c M wscript
Log Message: ----------- Merge branch 'master' into gtkbuilder
Conflicts: src/interface.c src/vte.c
Compare: https://github.com/geany/geany/compare/6099e8d...0a16ec7