# Generated by Makefile. Do not edit.

commit b49fa9a13aee9a2d47dfcf99dbd3d54f8d4ba900
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 15 12:36:15 2015 +0100

    Set release date

 NEWS           | 2 +-
 doc/geany.1.in | 2 +-
 doc/geany.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 3e151bf42bf3fdf75dc738ded46c857a0f232b4d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 15 12:21:25 2015 +0100

    Small NEWS udpate

 NEWS | 3 +++
 1 file changed, 3 insertions(+)

commit 2bee7120b0fff687a7eea641fe547c76f00bcb3e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 15 01:16:22 2015 +0100

    Allow calls to plugin_module_make_resident() from geany_load_module()
    
    This is useful if a plugin registers i.e. GTypes from its
    geany_load_module(), i.e. to implement plugin functions as GObject
    class methods.
    
    The implementation can be considered a slight hack, but we need the
    module to be know already in geany_load_module(), which is called too
    early for the normal process to set it.
    
    Closes #719.

 src/plugindata.h | 1 +
 src/plugins.c    | 4 ++++
 2 files changed, 5 insertions(+)

commit 945d6b6364daaf6a82882a221adde8ce7e7375cc
Merge: d1ea9ed 3d439b4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 15 00:19:53 2015 +0100

    Merge pull request #746 from techee/scintilla_dispose
    
    Backport Scintilla patch correctly disposing scrollbars

commit d1ea9ede48018b183037074aef6a1c723da9d094
Merge: c21db7d fa1788f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 15 00:11:05 2015 +0100

    Merge pull request #755 from b4n/python/identifiers
    
    Update keywords and identifiers list for Python 3
    
    Part of #748.

commit fa1788fe5f93ad8a0fbbab3c5e60845ca41282a7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 15 00:03:13 2015 +0100

    python: Update keywords for Python 3

 data/filetypes.python | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit f12edc0299c8140cfda0cb2787464e20abd73ae9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 14 23:58:37 2015 +0100

    Update keywords too from the Python identifiers update script

 scripts/update-python-identifiers.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 498764bcafd7f4e95567e155a3c2313790401642
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 14 23:46:12 2015 +0100

    Refactor the Python identifiers update script for better flexibility

 scripts/update-python-identifiers.sh | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

commit 301a482555cb762c88607a1fd1e1efe2a00b936a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 12 17:34:10 2015 +0100

    python: Update identifiers for Python 3

 data/filetypes.python | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 59e13f9e446acfc901d9ff42245b1d2da964ed30
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 12 17:33:13 2015 +0100

    Add a script to update Python filetype's identifiers list

 scripts/update-python-identifiers.sh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit 3d439b4cfc42652d923bd5b9c454fde6d3737e4a
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Nov 14 10:26:07 2015 +0100

    Backport Scintilla patch correctly disposing scrollbars
    
    The unparent method should be called in dispose(), not in finalize().
    This patch fixes that which removes some ugly warnings from OS X command
    line.

 scintilla/gtk/ScintillaGTK.cxx | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

commit c21db7d80c0ec86c5774f95616a333f7ab2f8991
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 25 15:22:07 2015 +0100

    Fix line end movement on display lines when EOLs are visible
    
    Closes #712.
    
    X-Scintilla-Bug-URL: http://sourceforge.net/p/scintilla/bugs/1772/
    X-Scintilla-Commit-ID: 2ce775c433b4910f2fde53c4b5d89bb16b45e3eb

 scintilla/src/EditView.cxx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit a1145c6ef6172262248007f0bfd3645e8c363bf8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 25 21:57:36 2015 +0100

    GTK: Fix autoc popup row height on GTK2 when it changes at runtime
    
    Now the popup is cached the row height has to be re-computed when the
    font changes on GTK2 too.
    
    Mostly closes #702.
    
    X-Scintilla-Bug-URL: http://sourceforge.net/p/scintilla/bugs/1774/
    X-Scintilla-Commit-ID: 547de78f2477e16b0d7241a217a1ead83a14c42b

 scintilla/gtk/PlatGTK.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 43e13e61bf0e80aef284a1605e0d7e6d92da4667
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 12 15:08:41 2015 +0100

    Mention autogen.sh in README
    
    Closes #747.

 README | 3 +++
 1 file changed, 3 insertions(+)

commit 1af507c3f5d325c6e732024857db90affa76aa14
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Nov 11 19:23:56 2015 +0100

    Update of Hungarian translation

 NEWS     |    2 +-
 po/hu.po | 1172 +++++++++++++++++---------------------------------------------
 2 files changed, 319 insertions(+), 855 deletions(-)

commit d7a7c130271cfbf6e840e880849a1ac306a0053e
Merge: 1569fc8 7b5e9a9
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Nov 10 22:30:10 2015 +0100

    Merge pull request #741 from eht16/waf_deprecation_notice
    
    Add a deprecation notice when using the Waf build system

commit 1569fc8a7642f85f53aaa8eb3fbdbe1b19938d24
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Nov 9 23:30:08 2015 +0100

    Add Slovak and Indonesian translations updates to NEWS

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e2ab39006f1bbc9d74a87c4c9de997ea1f458eb4
Merge: 7844ecc 101903e
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Nov 9 23:26:40 2015 +0100

    Merge pull request #743 from andrej-herceg/sk-po
    
    Update of Slovak translation

commit 101903ebab811f299d848a8bdfd10c21948dec9e
Author: Andrej Herceg <chrono.i18n@gmail.com>
Date:   Mon Nov 9 15:58:11 2015 +0100

    Update of Slovak translation

 po/sk.po | 1510 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 730 insertions(+), 780 deletions(-)

commit 7844ecc61dfad142576ef21cb1e5b14d6c42932d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 9 13:48:24 2015 +0100

    Update NEWS

 NEWS | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

commit 1ce1b600d4a56153c31b6b10ee9909d188a711e8
Merge: a422305 44a4c80
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Nov 9 08:20:45 2015 +0100

    Merge pull request #740 from samsulmaarif/master
    
    Indonesian translation update

commit 7b5e9a93cb99fe601a75bb36eddf7db84eb84611
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 8 23:46:49 2015 +0100

    Add a deprecation notice when using the Waf build system
    
    As Waf is to be dropped after the 1.26 release, inform the user
    to better use the Autotools build system.

 wscript | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 44a4c8024d3ef89905e15d50b8602f03753f757b
Author: Samsul Ma'arif <admin@samsul.web.id>
Date:   Sun Nov 8 22:33:53 2015 +0700

    Indonesian Translation update
    
    Signed-off-by: Samsul Ma'arif <mail@samsul.web.id>

 po/id.po | 567 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 280 insertions(+), 287 deletions(-)

commit a42230539c8a33b0b7b3484b3041b17fe6b1f70d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Nov 7 23:23:22 2015 +0100

    Small update of NEWS

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee2809f92a4adb4d314f73eb3cb43303ad0d59fd
Merge: 19e9866 6c96738
Author: Samsul Ma'arif <admin@samsul.web.id>
Date:   Sun Nov 8 18:02:25 2015 +0700

    Merge pull request #1 from geany/master
    
    Update from geany/geany

commit 6c96738740f0241ccf2ec67762af6f25cf0bde87
Merge: bc21947 ac48644
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Nov 7 23:30:35 2015 +0100

    Merge pull request #731 from DevynCJohnson/patch-4
    
    Update filetype_extensions.conf

commit bc21947d3d3b401684760da7eb24b34c0cdd1fba
Merge: 756d4ab 5c72d54
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Nov 7 23:20:07 2015 +0100

    Merge pull request #736 from scriptum/rpg-translate-ru
    
     Update of Russian translation

commit 5c72d5409080a292275b47696e5ee392577c4fbe
Author: Pavel Roschin <roshin@scriptumplus.ru>
Date:   Sun Nov 8 01:05:12 2015 +0300

     Update of Russian translation

 po/ru.po | 63 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

commit 756d4abdb2155271a28a53835433dd021cb8998a
Merge: 01ed8c7 3b884b9
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Nov 5 09:53:05 2015 +0100

    Merge pull request #733 from peter-scholtens/master
    
    After update of ./waf updatepo

commit 01ed8c7c01e4546d1162c152383862ae995b9996
Merge: 38f827d ccead15
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Nov 5 08:12:46 2015 +0100

    Merge pull request #735 from crayxt/patch-1
    
    Fix missing accelerator mark in Kazakh translation

commit ccead15b22409c5cf3cbaa8ce8f9bb8cbd15cb17
Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date:   Thu Nov 5 07:06:16 2015 +0500

    Fix missing accelerator mark in Kazakh translation

 po/kk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b884b9190b2d081f43c74950e62d19594ea8f2e
Merge: 2d24451 38f827d
Author: Peter C. S. Scholtens <peter.scholtens@xs4all.nl>
Date:   Wed Nov 4 22:16:02 2015 +0100

    Merge branch 'master' of git://github.com/geany/geany

commit 38f827d0870c27b7dc7675eda69031da6508ffee
Merge: 6efa9bf 60bda54
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 4 21:58:39 2015 +0100

    Merge pull request #533 from techee/doc_changed
    
    Force disk status document check in some specific cases

commit 2d2445152e3bfbb5fed310be194e4dc24eff4111
Author: Peter C. S. Scholtens <peter.scholtens@xs4all.nl>
Date:   Wed Nov 4 21:47:36 2015 +0100

    After update of ./waf updatepo

 po/nl.po | 90 +++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 52 insertions(+), 38 deletions(-)

commit 60bda546264af1efc863cd3a264e9a24cb7bea1a
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Jun 24 16:17:16 2015 +0200

    Check whether the current document changed when Geany window activated
    
    This captures the common case when e.g. changing the document outside
    Geany and switching back to Geany.
    
    Remove the osx-specific code doing the same for osx only.

 src/libmain.c | 10 ++++++++++
 src/osx.c     | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

commit 2f59aa4a9a124f88336c284fd488cf1acce94c94
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Jun 24 15:25:09 2015 +0200

    Force-check document disk status when switching tabs
    
    The document_check_disk_status() guarantees that there's no check
    performed when switching pages using Ctrl+Tab - remove the outdated
    comment and idle call and perform force-check.

 src/callbacks.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

commit 6efa9bff526fcf857cd26fe5ac7512c8a157cc4e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 4 18:27:04 2015 +0100

    French translation update

 NEWS     |  2 +-
 po/fr.po | 60 ++++++++++++++++++++++++++++++------------------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

commit 757de2012643db081e016e7aa6532209f0bceb51
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Nov 4 18:15:50 2015 +0100

    Update of Greek translation

 po/el.po | 75 +++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 36 insertions(+), 39 deletions(-)

commit 84a3e3c275542a680c96bf03b921328b90688883
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Nov 4 18:09:12 2015 +0100

    Update of Kazzakh translation

 NEWS     |   2 +-
 po/kk.po | 195 ++++++++++++++++++++++++++++++++-------------------------------
 2 files changed, 101 insertions(+), 96 deletions(-)

commit 5beeacf26716c0571e7b6f8f042f8faa3c147f2d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Nov 4 18:02:09 2015 +0100

    Update of Spanish translation

 NEWS     |  2 +-
 po/es.po | 84 +++++++++++++++++++++++++++++++---------------------------------
 2 files changed, 42 insertions(+), 44 deletions(-)

commit 10f7cb24b26d1a62cdf4851788e4363efacb1b78
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Nov 4 12:50:57 2015 +0100

    Avoid possible invalid memory access when activating plugin
    
    It may happen (and happens on OS X) that plugin activation using
    plugin_new() triggers some action which causes the tree view to
    update. However, as the old plugin was freed before, the tree view
    contains an invalid pointer to p which causes invalid memory access.
    
    After freeing the old pointer, set the tree view value to NULL - the
    plugin pointer is checked at other places for NULL value so it
    doesn't crash.

 src/plugins.c | 3 +++
 1 file changed, 3 insertions(+)

commit 23323f53779ae54c8a9349bc4b1e0e48ac4acb5f
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Nov 1 20:23:35 2015 +0200

    Cast windows HANDLE to intptr_t, not long
    
    The cast in g_warning is not fixed. It's unimportant, displaying a
    handle value does not provide any meaningful information anyway.
    
    Closes #727.

 src/win32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ac486449046338e81f0d8a3e8d9c8e0e5651c47f
Author: Devyn Collier Johnson <DevynCJohnson@Gmail.com>
Date:   Tue Nov 3 10:38:43 2015 -0500

    Update filetype_extensions.conf
    
    Changes
    - Ensured consistency by ending every line with a semicolon
    - Added two MathML file-extensions (*.mml and *.mathml;) to "XML="
    
    Justification for proposed changes
    - Code consistency is important in programming
    - MathML is a form of XML that is commonly used and is part of the HTML5 standard
    - W3 MathML Specification: http://www.w3.org/TR/MathML3/
    - Geany properly highlights the code when the MathML file-extension is recognized

 data/filetype_extensions.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit a11e43e22a1086308eb4473ad7389302de0e24e2
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Nov 3 08:15:45 2015 +0100

    Update of Portuguese translation

 po/pt.po | 88 +++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 43 insertions(+), 45 deletions(-)

commit 64cb6aff946474518118e38cb420bc98184f1ffc
Merge: a68df6e ad77aed
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Nov 3 07:53:29 2015 +0100

    Merge pull request #729 from xhacker/zh_CN
    
    Update zh_CN.po

commit a68df6ef4f29cf05bbdba07002949058f7d18bfe
Merge: d4f3ff6 1789233
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Nov 3 07:53:08 2015 +0100

    Merge pull request #730 from peter-scholtens/master
    
    Update of Dutch translation.

commit 17892335c4a7aae792e68974ec3c4ead3da05373
Author: Peter C. S. Scholtens <peter.scholtens@xs4all.nl>
Date:   Mon Nov 2 23:15:28 2015 +0100

    Update of Dutch translation.

 po/nl.po | 136 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 67 insertions(+), 69 deletions(-)

commit ad77aed367d23b0a8bdfbe63e1f9b20bbc4da2ec
Author: LIU Dongyuan / 柳东原 <liu.dongyuan@gmail.com>
Date:   Mon Nov 2 12:52:27 2015 -0800

    Update zh_CN.po

 po/zh_CN.po | 62 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

commit d4f3ff6eb44c6f4e890beb5ecc35528f5b8eaeb6
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Nov 1 19:21:00 2015 +0100

    Another small update of German translation

 po/de.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 9734acdbc1e059d4bebb897c7b80563080d41ead
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Nov 1 19:18:59 2015 +0100

    Update of German translation

 po/de.po | 41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

commit 8934d32ab20e70556d535515fd2f4abcf81a6fa4
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Nov 1 19:04:21 2015 +0100

    Another update of po files as a merge changed some strings

 po/ar.po    | 102 ++++++++++++++++++++++++++++++--------------
 po/ast.po   | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/be.po    | 115 +++++++++++++++++++++++++++++++++++---------------
 po/bg.po    | 121 +++++++++++++++++++++++++++++++++++++---------------
 po/ca.po    | 117 +++++++++++++++++++++++++++++++++++----------------
 po/cs.po    | 116 +++++++++++++++++++++++++++++++++++---------------
 po/de.po    | 138 ++++++++++++++++++++++++++++++++++++++++++------------------
 po/el.po    | 125 ++++++++++++++++++++++++++++++++++++++----------------
 po/en_GB.po | 111 +++++++++++++++++++++++++++++++++---------------
 po/es.po    | 124 ++++++++++++++++++++++++++++++++++++++----------------
 po/et.po    |  90 ++++++++++++++++++++++++++++-----------
 po/eu.po    |  97 +++++++++++++++++++++++++++++++-----------
 po/fa.po    | 111 +++++++++++++++++++++++++++++++++---------------
 po/fi.po    | 106 ++++++++++++++++++++++++++++++++--------------
 po/fr.po    | 130 +++++++++++++++++++++++++++++++++++++++-----------------
 po/gl.po    | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/he.po    | 106 ++++++++++++++++++++++++++++++++--------------
 po/hi.po    |  79 ++++++++++++++++++++++++----------
 po/hu.po    | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/id.po    | 123 +++++++++++++++++++++++++++++++++++++----------------
 po/it.po    | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/ja.po    | 110 +++++++++++++++++++++++++++++++++---------------
 po/kk.po    | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/ko.po    | 110 +++++++++++++++++++++++++++++++++---------------
 po/lb.po    | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/lt.po    | 106 ++++++++++++++++++++++++++++++++--------------
 po/mn.po    | 108 +++++++++++++++++++++++++++++++++--------------
 po/nl.po    | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/nn.po    |  79 ++++++++++++++++++++++++----------
 po/pl.po    | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/pt.po    | 124 ++++++++++++++++++++++++++++++++++++++----------------
 po/pt_BR.po | 122 +++++++++++++++++++++++++++++++++++++----------------
 po/ro.po    | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/ru.po    | 115 +++++++++++++++++++++++++++++++++++---------------
 po/sk.po    | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/sl.po    | 107 ++++++++++++++++++++++++++++++++--------------
 po/sr.po    | 119 ++++++++++++++++++++++++++++++++++++---------------
 po/sv.po    | 119 +++++++++++++++++++++++++++++++++++----------------
 po/tr.po    | 116 +++++++++++++++++++++++++++++++++++---------------
 po/uk.po    | 112 ++++++++++++++++++++++++++++++++++--------------
 po/vi.po    | 118 ++++++++++++++++++++++++++++++++++++---------------
 po/zh_CN.po | 108 +++++++++++++++++++++++++++++++++--------------
 po/zh_TW.po | 106 ++++++++++++++++++++++++++++++++--------------
 43 files changed, 3452 insertions(+), 1418 deletions(-)

commit b317da6a0d83a1c51c6f77f2c8bc184928ff3b99
Merge: fa0a034 6390830
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 1 19:01:54 2015 +0100

    Merge pull request #701 from zhekov/improve-spawning-errors
    
    Alter spawn to return the error message only in error->message
    
    Closes #541.

commit fa0a034d97caf250c25a40ef7f78a54f455ddb80
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Nov 1 18:58:14 2015 +0100

    Update of German translation

 NEWS     |  2 +-
 po/de.po | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

commit 7a8140b76ac5f24a4e51d46cd5c50ac70571bdfe
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Nov 1 17:46:28 2015 +0100

    Update po files for string freeze for 1.26

 po/ar.po    | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/ast.po   | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/be.po    | 826 +++++++++++++++++++++++++++++---------------------------
 po/bg.po    | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/ca.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/cs.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/de.po    | 866 ++++++++++++++++++++++++++++++----------------------------
 po/en_GB.po | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/es.po    | 868 ++++++++++++++++++++++++++++++----------------------------
 po/et.po    | 879 ++++++++++++++++++++++++++++++-----------------------------
 po/eu.po    | 879 ++++++++++++++++++++++++++++++-----------------------------
 po/fa.po    | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/fi.po    | 879 ++++++++++++++++++++++++++++++-----------------------------
 po/fr.po    | 462 ++++++++++++++++---------------
 po/gl.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/he.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/hi.po    | 876 ++++++++++++++++++++++++++++++-----------------------------
 po/hu.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/id.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/it.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/ja.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/kk.po    | 879 ++++++++++++++++++++++++++++++-----------------------------
 po/ko.po    | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/lb.po    | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/lt.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/mn.po    | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/nl.po    | 879 ++++++++++++++++++++++++++++++-----------------------------
 po/nn.po    | 877 ++++++++++++++++++++++++++++++-----------------------------
 po/pl.po    | 879 ++++++++++++++++++++++++++++++-----------------------------
 po/pt.po    |  79 +++---
 po/pt_BR.po | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/ro.po    | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/ru.po    | 883 +++++++++++++++++++++++++++++++-----------------------------
 po/sk.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/sl.po    | 881 ++++++++++++++++++++++++++++++-----------------------------
 po/sr.po    | 879 ++++++++++++++++++++++++++++++-----------------------------
 po/sv.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/tr.po    | 880 ++++++++++++++++++++++++++++++-----------------------------
 po/uk.po    | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/vi.po    | 878 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_CN.po | 826 +++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 878 ++++++++++++++++++++++++++++++-----------------------------
 42 files changed, 18426 insertions(+), 17147 deletions(-)

commit d3ca4299e77c7b395f68e3e70ec351f98f173407
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Nov 1 17:42:28 2015 +0100

    Update of Greek translation

 po/el.po | 465 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 246 insertions(+), 219 deletions(-)

commit 63908309533731ecdd8865e4cf118db1005e1bb4
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Nov 1 16:19:40 2015 +0200

    Fix custom command spawning error message
    
    They are configured in Custom Commands, not Preferences.
    Also fix the duplicated g_error_free().

 src/tools.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit a99454f4a0b740085bd5a5974aab8e5b12615db3
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Nov 1 16:00:03 2015 +0200

    Clarify the template command spawning message

 src/templates.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ca76d87cac33d59c0b726a4f47d47b7948aca55e
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Nov 1 15:34:26 2015 +0200

    Fix context action spawning error message
    
    Properly display what configuration should be checked, and show the
    entire command line on parsing error.

 src/callbacks.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit f50a1a9fc4b3b83e2caf0a55f7d2400582b31ec7
Merge: e44e00a 9b458b9
Author: elextr <elextr@gmail.com>
Date:   Sat Oct 31 11:47:43 2015 +1000

    Merge pull request #672 from kugel-/reload-docmsg
    
    document: show informational doc message after first reload
    
    Closes #562

commit 9b458b9fd5332570e9d94a21059180dbaa2d8fd4
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Fri Oct 30 15:27:52 2015 +0100

    document: Revert 6f5d5db and d6d4728
    
    Now that there is a proper user indication for the "maintain history on
    reload" feature we can toggle it on by default. The setting is also renamed
    so that the default is effective for everyone (this was the plan).

 doc/geany.txt | 2 +-
 src/keyfile.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit b1e9c4f3b6655517f0ebf6eccabfc75cd7090f96
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Fri Jun 26 11:55:23 2015 +0200

    document: show informational doc message after first reload
    
    6f5d5db and d6d4728 disabled "maintain history on reload" by default,
    with the intention to reenable it when we have a better method to
    make it discoverable for the user. This was necessary since it became
    enabled by default but could be surprising given Geany warned about
    losing data before.
    
    This commit tries to resolve the discoverability, by providing an
    informational doc message that is shown once to the user, after the first
    reload. The doc message also gives the option to disable this feature.

 src/document.c        | 34 ++++++++++++++++++++++++++++++++++
 src/document.h        |  1 +
 src/documentprivate.h |  1 +
 src/keyfile.c         |  2 ++
 4 files changed, 38 insertions(+)

commit e44e00afe02c980068cbca0ca3870b0b2a663397
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Fri Sep 18 19:38:42 2015 +0300

    Fix configdir encoding
    
    configdir is initially in locale (glib) encoding. Converting it from
    UTF-8 is wrong, and it must be converted _to_ UTF-8 when used in
    geany_debug() - otherwise, Help -> Debug Messages fails assertion.
    POSIX only, under Windows the glib encoding is also UTF-8.
    
    Closes #658.

 src/libmain.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 4c6bd09b5a67064a92c36c77776246d18b20f40d
Merge: 4335804 06f2cbe
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 25 16:37:34 2015 +0100

    Merge pull request #711 from geany/elextr-patch-1
    
    Add ".adoc" extension to asciidoc filetype

commit 4335804d236bd43d7545a48272fd313adc36ce1f
Merge: 5dea35a 326c39f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 25 16:09:21 2015 +0100

    Merge branch 'mio/update'
    
    Manually import some upstream MIO changes.

commit 5dea35ada9afe202c5507fc35729a91d03175b9e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 25 14:05:37 2015 +0100

    Respect Smart Home Key setting in Go To Start of Display Line

 src/keybindings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 326c39f8d59769237b80463631d57bef58a5a162
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Oct 24 20:16:44 2015 +0200

    Add printf attribute to vprintf() functions
    
    This allows GCC to check vprintf() format, and makes
    `-Wsuggest-attribute=format` happy.

 tagmanager/mio/mio-file.c   | 1 +
 tagmanager/mio/mio-memory.c | 1 +
 tagmanager/mio/mio.h        | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

commit cbc85b7444da9e5210f1a7ac18a1e223af784af9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Mar 24 22:52:37 2012 +0100

    Improve memory backend of mio_read()
    
    Drop the loop in mem_read() in favor of a single memcpy() call.
    
    This greatly improves performances when nmemb > 1, for a small loss
    for some values of size when nmemb == 1.  Gain can theoretically be
    infinite since swapping nmemb and size parameters changes almost
    nothing while it had a dramatic performance impact previously.  Loss
    is up to about 25% in the worst case for some values of size when
    nmemb is 1.
    
    Also, now the function always copies as much data as possible, not only
    whole blocks.  This follows the glibc implementation of fread() and
    simplifies the code.  Doing so also fixes the position after a partial
    read to be at the last readable character rather than the end of the
    last read block.

 tagmanager/mio/mio-memory.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

commit 06f2cbe6f6a25ebdcc8a48ee6e5be91a69785ca3
Author: elextr <elextr@gmail.com>
Date:   Fri Oct 23 16:34:25 2015 +1000

    Add ".adoc" extension to asciidoc filetype
    
    Closes #708

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7fbe99fd8a0f140ebd037128e181570a12f0713a
Merge: 459983e 1c6b908
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 22 21:53:32 2015 +0200

    Merge pull request #707 from b4n/waf/c99
    
    waf: Check and enable C99 compiler support

commit 1c6b908c9e7f4d6d1ca0754de4c6564f3c8ac7a7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 21 16:30:47 2015 +0200

    waf: Check and enable C99 compiler support
    
    Closes #679.

 wscript | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 60 insertions(+), 5 deletions(-)

commit 459983ed15a68a25e829f166af7a59a6b79d24eb
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Oct 20 22:42:38 2015 +0200

    Update of Portuguese translation

 NEWS     |   3 +-
 po/pt.po | 849 ++++++++++++++++++++++++++++++++-------------------------------
 2 files changed, 434 insertions(+), 418 deletions(-)

commit 748f5689ccf58b5172d3ec80b67bbde4cc3ea1a5
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Oct 20 20:38:37 2015 +0300

    Unify the spawn callers error messages: custom command

 src/tools.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit d8318b6366369b6c94eb2e709c3e5d0d9b4efd3d
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Oct 20 20:37:23 2015 +0300

    Unify the spawn callers error messages: template replacement command

 src/templates.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 389c0a223dc391a1a2a84891ab2411e76a92d64b
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Oct 20 20:35:12 2015 +0300

    Unify the spawn callers error messages: print command

 src/printing.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 897197ae51cb51c7f07281ef7c6e118b27f25718
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Oct 20 20:33:41 2015 +0300

    Unify the spawn callers error messages: context action

 src/callbacks.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 421f8a0ce08178bc5d76fd7922c253994492bf1d
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Oct 20 20:31:37 2015 +0300

    Unify the spawn callers error messages: terminal command

 src/build.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e74dc40e1134e3bb7df9e45bc95f9e3c71507841
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Oct 20 20:30:00 2015 +0300

    Unify the spawn callers error messages: grep tool

 src/search.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5aa0b02f00e84c6412be8632432726c5894e1ff3
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Oct 20 20:22:51 2015 +0300

    Sync spawn glib/unix and Windows messages
    
    In particular, the exec() and CreateProcess() errors are reported
    directly, but failures in other any functions, which are extremely
    rare, include some descriptive text, such as "Failed to set pipe
    handle to inheritable (Access denied)". The example is artificial.

 src/spawn.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

commit d60a4b789d28dabc97801d8579e74cd1fdfee524
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Oct 19 20:43:23 2015 +0300

    Alter spawn to cut glib citing of the program name or working dir
    
    Mostly translate the G_SPAWN error codes back to errno, and get the
    curresponding g_strerror() message.

 src/spawn.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

commit 716c785e34f9b016ddf200048e7642f6eb1ffab2
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Oct 19 20:00:36 2015 +0300

    Alter spawn to return the error message only in error->message
    
    That is, do not cite the original text, program name, or the failed
    OS function name (except when the testing program is compiled).
    Also cut glib citing of the original text on bad quoting.

 src/spawn.c | 54 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 19 deletions(-)

commit 9420ec84939ed8625611047b6764da5488c09537
Merge: d5e484c f9e6cea
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 19 15:45:28 2015 +0200

    Merge pull request #697 from techee/val_if_fail
    
    Use g_return_val_if_fail() to fix build on OS X

commit d5e484cadb9275e5f6600c4834299fc766cf3a24
Author: Matthew Brush <matt@geany.org>
Date:   Sat Oct 17 11:00:56 2015 -0700

    Update manual for changes to view menu/color schemes dialog
    
    Closes #699

 doc/geany.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit f9e6ceaceef1ca01961b045801c88149987f2f96
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Oct 15 20:52:08 2015 +0200

    Use g_return_val_if_fail() to fix build on OS X

 src/plugins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7215c5027711546cbe899fe4ccf828bd945c1d66
Merge: b2879e9 6db80a2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 13 22:35:16 2015 +0200

    Merge pull request #646 from b4n/new-cl-files-once
    
    Don't open more than one document for non-existing paths from the CLI

commit b2879e9fca00f544105029b45974bd808cbb9b7b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 12 19:20:02 2015 +0200

    tagmanager: Fix handling of scopes starting with a non-ASCII character
    
    Fix handling of scopes starting with a non-ASCII character.
    
    Actually, just drop the check on the first byte of the scope, as it
    doesn't seem to serve any purpose as it only checks the first byte (so
    isn't any kind of real validation; and as it predates Geany it's
    impossible to know the real reason behind this check), and breaks
    support for non-ASCII scopes.

 tagmanager/src/tm_tag.c               |  4 +---
 tests/ctags/Makefile.am               |  1 +
 tests/ctags/non-ascii-ident1.php      | 12 ++++++++++++
 tests/ctags/non-ascii-ident1.php.tags |  5 +++++
 4 files changed, 19 insertions(+), 3 deletions(-)

commit 152103392c04827a38e9486e3b55888effbb5372
Merge: d6e94cf d4f26fd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Oct 10 13:57:47 2015 +0200

    Merge pull request #376 from kugel-/keybindings-rework3
    
    Keybindings rework

commit d6e94cf9d4b41b55f06bafe185b1b0a7fc61bd30
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Oct 5 22:52:54 2015 +0300

    Use GStatBuf instead of plain `struct stat`
    
    Especially under Windows, there are 32-bit and 64-bit stat, and
    g_[l]stat may use the non-default one.
    
    Closes #677

 src/dialogs.c                   |  2 +-
 src/socket.c                    |  2 +-
 tagmanager/ctags/ctags.c        | 16 ++++++++--------
 tagmanager/src/tm_source_file.c |  4 ++--
 tagmanager/src/tm_workspace.c   |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

commit c6952c75999c3775a5d7342bc3892c5c9451fb39
Merge: 25bd241 d0f9446
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 6 15:53:14 2015 +0200

    Merge pull request #629 from kugel-/pluxy
    
    Add support for plugins acting as proxies for foreign plugins,
    promoting foreign plugins to first-class citizen.

commit d0f94460eacfc555683187e7055ef5dec7f279b8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 6 15:42:54 2015 +0200

    Bump plugin API version for proxy plugins support

 src/plugindata.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6cb443e8631681c7b74ccef25c7656bdbc9f9305
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Oct 4 00:04:57 2015 +0200

    plugins: enforce geany_plugin_register_proxy() can be called once
    
    In the future we might want to enable calling it again to set new supported
    plugin types/extensions. This is not implemented yet, but in order to
    allow this in the future we have to prevent it now, otherwise we'd
    need to break the API.

 src/plugins.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 6dfe5ce9420c3674e2e779339e72ce5d79ae70b9
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Mon Sep 21 23:51:54 2015 +0200

    plugins: use GQueue to restore GLib compatibility
    
    g_ptr_array_insert() is too recent (2.40), but prepending is required. GQueue
    is a fine replacement with better old-glib support, at the expense of working
    with a doubly-linked list instead of plain array.

 src/plugins.c | 32 +++++++++++++++-----------------
 src/utils.h   |  8 ++++++++
 2 files changed, 23 insertions(+), 17 deletions(-)

commit 7ac89deebdaf4052ed795495cfbbb8c35043a29f
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Mon May 19 06:55:11 2014 +0200

    plugins: improve PM dialog for proxy and sub-plugins
    
    Geany now remembers how many plugins depend on a pluxy. It uses this
    information to disable the "Active" checkbox in the PM dialog.
    
    Additionally, the PM dialog displays plugins in a hierarchical manner, so that
    sub-plugins are shown next to pluxy. This is espcially handy since it makes
    the sub-plugin <-> pluxy relationship really obvious, and it's easier to spot
    which plugins need to be disabled before the pluxy can be disabled. This allows
    to remove code to re-select the plugin because the row (respective to the
    hierarchy level) does not change anymore.

 src/pluginprivate.h |   2 +
 src/plugins.c       | 243 +++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 196 insertions(+), 49 deletions(-)

commit bbf8e882c2ea76c2d400decfbd6d5b44978eb3fa
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Aug 26 23:58:31 2015 +0200

    demoproxy: add a demo proxy showcasing how to create a proxy plugin
    
    This demo proxy does not actually do anything useful. It simply loads
    pseudo-plugins from an ini-style file. The point is that there will be a plugin
    in the PM dialog for each ini. Each ini-plugin also causes a menu item to be
    generated.

 plugins/Makefile.am      |  10 ++-
 plugins/demoproxy.c      | 202 +++++++++++++++++++++++++++++++++++++++++++++++
 plugins/demoproxytest.px |  15 ++++
 po/POTFILES.skip         |   1 +
 4 files changed, 226 insertions(+), 2 deletions(-)

commit 25bd24187ba30497109e01938365e8a4ca2a12fd
Merge: e7e5d51 daf4dd4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 6 15:00:11 2015 +0200

    Merge pull request #621 from techee/remote_mtime
    
    Fix the "source file has been modified" issue
    
    Closes #605.

commit 8ac9d56fff28a6a8b296bfde3f7c047bc8762e61
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Aug 26 23:58:28 2015 +0200

    plugins: reselect when toggling the current plugin
    
    When enabling/disabling pluxys in the PM dialog the list of available
    plugins might change. If plugins before the pluxy go/come then the wrong
    plugin becomes selected (the selected row number stays the same). Re-apply
    the selection to the current one in the toggle callback to overcome this issue.

 src/plugins.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

commit 6e5ca69e2e9ddbfc2cc44527a1aa5fca8db09167
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Aug 26 23:58:25 2015 +0200

    plugins: add geany_plugin_register_proxy() to the plugin API
    
    This function finally allows plugins to register themselves as a proxy
    for one or more file extensions.
    
    Lots of documentation is added to doc/plugins.dox, please refer to that for more
    details.

 doc/plugins.dox  | 397 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/plugindata.h |  43 +++++-
 src/plugins.c    |  52 ++++++++
 3 files changed, 487 insertions(+), 5 deletions(-)

commit 3ccf959013edb6744ab58f6953a2b44dfb1abef3
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Aug 26 23:58:21 2015 +0200

    plugins: introduce probe() for proxy plugins
    
    When a file extension alone is ambigious as to whether a potential plugin is
    really handled then the proxy should use the probe hook to find out. This can
    be especially helpful when two pluxies work on the same file extension.
    
    The proxy's probe() should return PROXY_IGNORED or PROXY_MATCHED accordingly.
    A special flag value, PROXY_NOLOAD, can be or'ed into PROXY_MATCHED to say
    that the file belongs to the proxy, but isn't directly loaded and should not
    be handled by any other proxy or geany itself.
    
    Example for PROXY_IGNORED:
    geanypy only supports python2 at the moment. So, scripts written
    for python3 aren't handled by it and should be skipped for the PM dialog.
    Or perhaps they are handled by another proxy that supports python3.
    
    Example for PROXY_NOLOAD:
    A pluxy registers for the metadata file extension (.plugin) where author etc
    is in. The actual implmentation is in a python script (.py). The .py file
    is tied to the .plugin and should not be processed by other pluxies. Thus,
    the pluxy also registers for the .py extension but returns
    PROXY_MATCHED|PROXY_NOLOAD for it (if it would return only PROXY_MATCHED
    the sub-plugin would show up twice in the PM dialog).

 src/plugindata.h | 10 ++++++++++
 src/plugins.c    | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

commit e5bb6571c60be2169c3d66ae38c72d72709bf10e
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Aug 26 23:58:18 2015 +0200

    plugins: when loading active ones, loop until no more proxy plugins are added
    
    During the loading of the active plugins they are also initialized (done at
    startup). As a result, these plugins could be pluxys and make more plugins
    available, some of which may be active as well.
    
    Because of this the loop has to be restarted if pluxies become
    available to also load active plugins that depend on the pluxy.
    
    The loop is only restarted at the end so only nested pluxys could possibly
    cause the loop to be run more than twice.

 src/plugins.c | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

commit 203644a23397a0f4bca56eff820bac547208561b
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Aug 26 23:58:15 2015 +0200

    plugins: refactor GtkListStore population code into separate function

 src/plugins.c | 57 +++++++++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

commit bdaab9c8378913016d8bc6c76d2100e6d6a9baab
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Aug 26 23:58:12 2015 +0200

    plugins: generic load_data instead of module pointer in Plugin struct
    
    Being a GModule is actually a detail of standard plugins. Future proxy plugins
    might need different handles. Therefore replace the module field with a more
    generic pointer and encapsulate the GModule detail further.
    
    This pointer shall be returned from GeanyProxyFuncs::load and is passed back
    to GeanyProxyFuncs::unload, and isn't interpreted by Geany.

 src/plugindata.h    |   4 +--
 src/pluginprivate.h |   5 ++-
 src/plugins.c       | 100 ++++++++++++++++++++++++++++++++++++++++------------
 src/pluginutils.c   |  11 ++----
 4 files changed, 86 insertions(+), 34 deletions(-)

commit d008675b1bb1360f32360c98f54175783c5f0f2f
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Aug 26 23:58:09 2015 +0200

    plugins: introduce load and unload functions for plugins
    
    Currently they encapsulate loading and unloading of standard plugins. In
    the future plugins can provide such functions to load their types of plugins.
    
    Such a dummy proxy plugin is implemented now to load standard plugins so
    that these aren't going to be specially handled.

 src/plugindata.h    |   9 ++
 src/pluginprivate.h |   9 +-
 src/plugins.c       | 237 +++++++++++++++++++++++++++++++++++-----------------
 3 files changed, 177 insertions(+), 78 deletions(-)

commit e7e5d51d0a239ea64fae9921d467272ea48fb27f
Merge: 932e98f 4742cac
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Oct 4 14:58:03 2015 +0200

    Merge branch 'konsolebox-master'

commit 4742cac866c97f61f081ee78a971dcca90e8909b
Merge: 932e98f c2b7c27
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Oct 4 14:57:42 2015 +0200

    Merge branch 'master' of https://github.com/konsolebox/geany into konsolebox-master

commit 932e98fa91da4b73956e73576e5c62ed8070a09d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Oct 4 12:24:39 2015 +0200

    Update of Greek translation

 NEWS     |   2 +-
 po/el.po | 527 ++++++++++++++++++++++++++++++++-------------------------------
 2 files changed, 270 insertions(+), 259 deletions(-)

commit daf4dd45b874f7d29e30f8eddd4fbb6cae40e687
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Aug 18 19:46:08 2015 +0200

    Don't mix POSIX/GIO operations when opening/saving/stat()ing files
    
    GVFS uses different backends for "native" GIO operations and POSIX
    operations which use the FUSE backend. If the two kinds of operations are
    mixed, we may get races.
    
    The patch checks the value of file_prefs.use_gio_unsafe_file_saving and
    based on it either uses GIO operations or POSIX operations for file loading,
    saving and checking modification time.

 src/document.c | 101 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 29 deletions(-)

commit c2b7c279e98ce620f3111bd3981f3c14c9d92196
Author: Ross Konsolebox <konsolebox@gmail.com>
Date:   Wed Sep 23 17:46:22 2015 +0800

    Update msgid for "Use multi-line matchin_g"
    
    This also includes obvious changes to msgstr of some languages.
    Languages that didn't explicitly use 'l' as previous shortcut or
    didn't have 'g' on their translation were left untouched.

 po/ar.po    | 2 +-
 po/ast.po   | 2 +-
 po/be.po    | 2 +-
 po/bg.po    | 2 +-
 po/ca.po    | 2 +-
 po/cs.po    | 2 +-
 po/de.po    | 2 +-
 po/el.po    | 2 +-
 po/en_GB.po | 2 +-
 po/es.po    | 2 +-
 po/et.po    | 2 +-
 po/eu.po    | 2 +-
 po/fa.po    | 2 +-
 po/fi.po    | 2 +-
 po/gl.po    | 2 +-
 po/he.po    | 2 +-
 po/hi.po    | 2 +-
 po/hu.po    | 2 +-
 po/id.po    | 2 +-
 po/it.po    | 2 +-
 po/ja.po    | 2 +-
 po/kk.po    | 2 +-
 po/ko.po    | 2 +-
 po/lb.po    | 2 +-
 po/lt.po    | 2 +-
 po/mn.po    | 2 +-
 po/nl.po    | 2 +-
 po/nn.po    | 2 +-
 po/pl.po    | 2 +-
 po/pt.po    | 2 +-
 po/pt_BR.po | 2 +-
 po/ro.po    | 2 +-
 po/ru.po    | 2 +-
 po/sk.po    | 2 +-
 po/sl.po    | 2 +-
 po/sr.po    | 2 +-
 po/sv.po    | 2 +-
 po/tr.po    | 2 +-
 po/uk.po    | 2 +-
 po/vi.po    | 2 +-
 po/zh_CN.po | 4 ++--
 po/zh_TW.po | 2 +-
 42 files changed, 43 insertions(+), 43 deletions(-)

commit 04ef30ea06982865cf6ba097e5c6f630f2a554bf
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 20 18:37:11 2015 +0200

    Update Scintilla to version 3.6.1

 data/filetypes.coffeescript            |    1 +
 scintilla/Makefile.am                  |    7 +-
 scintilla/gtk/PlatGTK.cxx              |  108 +--
 scintilla/gtk/ScintillaGTK.cxx         |  138 ++--
 scintilla/include/ILexer.h             |   48 +-
 scintilla/include/Makefile.am          |    3 +-
 scintilla/include/SciLexer.h           |   19 +
 scintilla/include/Sci_Position.h       |   21 +
 scintilla/include/Scintilla.h          |   36 +-
 scintilla/include/Scintilla.iface      |   65 +-
 scintilla/lexers/LexAbaqus.cxx         |   50 +-
 scintilla/lexers/LexAda.cxx            |   10 +-
 scintilla/lexers/LexAsm.cxx            |   26 +-
 scintilla/lexers/LexBash.cxx           |   24 +-
 scintilla/lexers/LexBasic.cxx          |   24 +-
 scintilla/lexers/LexBatch.cxx          |  500 ++++++++++++++
 scintilla/lexers/LexCOBOL.cxx          |   30 +-
 scintilla/lexers/LexCPP.cxx            |   72 +-
 scintilla/lexers/LexCSS.cxx            |   24 +-
 scintilla/lexers/LexCaml.cxx           |   27 +-
 scintilla/lexers/LexCmake.cxx          |   34 +-
 scintilla/lexers/LexCoffeeScript.cxx   |   55 +-
 scintilla/lexers/LexD.cxx              |   26 +-
 scintilla/lexers/LexDiff.cxx           |  153 +++++
 scintilla/lexers/LexErlang.cxx         |   14 +-
 scintilla/lexers/LexForth.cxx          |    4 +-
 scintilla/lexers/LexFortran.cxx        |   37 +-
 scintilla/lexers/LexHTML.cxx           |   80 +--
 scintilla/lexers/LexHaskell.cxx        |   50 +-
 scintilla/lexers/LexLaTeX.cxx          |   73 +-
 scintilla/lexers/LexLisp.cxx           |   18 +-
 scintilla/lexers/LexLua.cxx            |   24 +-
 scintilla/lexers/LexMake.cxx           |  144 ++++
 scintilla/lexers/LexMarkdown.cxx       |   26 +-
 scintilla/lexers/LexMatlab.cxx         |   26 +-
 scintilla/lexers/LexNsis.cxx           |   40 +-
 scintilla/lexers/LexNull.cxx           |   40 ++
 scintilla/lexers/LexOthers.cxx         | 1149 --------------------------------
 scintilla/lexers/LexProps.cxx          |  189 ++++++
 scintilla/lexlib/Accessor.cxx          |    8 +-
 scintilla/lexlib/Accessor.h            |    4 +-
 scintilla/lexlib/LexAccessor.h         |   54 +-
 scintilla/lexlib/LexerBase.cxx         |    4 +-
 scintilla/lexlib/LexerBase.h           |    8 +-
 scintilla/lexlib/LexerModule.cxx       |    8 +-
 scintilla/lexlib/LexerModule.h         |    6 +-
 scintilla/lexlib/LexerNoExceptions.cxx |    8 +-
 scintilla/lexlib/LexerNoExceptions.h   |   12 +-
 scintilla/lexlib/LexerSimple.cxx       |    4 +-
 scintilla/lexlib/LexerSimple.h         |    4 +-
 scintilla/lexlib/StyleContext.cxx      |   20 +-
 scintilla/lexlib/StyleContext.h        |   54 +-
 scintilla/src/AutoComplete.cxx         |    2 +
 scintilla/src/CallTip.cxx              |    2 +
 scintilla/src/CaseConvert.cxx          |    1 +
 scintilla/src/CaseFolder.cxx           |    1 +
 scintilla/src/Catalogue.cxx            |    1 +
 scintilla/src/CellBuffer.cxx           |    1 +
 scintilla/src/CharClassify.cxx         |    2 +
 scintilla/src/ContractionState.cxx     |    2 +
 scintilla/src/Decoration.cxx           |    2 +
 scintilla/src/Document.cxx             |   44 +-
 scintilla/src/Document.h               |   49 +-
 scintilla/src/EditModel.cxx            |    1 +
 scintilla/src/EditView.cxx             |   23 +-
 scintilla/src/Editor.cxx               | 1023 +++++++++++++++++-----------
 scintilla/src/Editor.h                 |   20 +-
 scintilla/src/ExternalLexer.cxx        |    1 +
 scintilla/src/Indicator.cxx            |    1 +
 scintilla/src/KeyMap.cxx               |    1 +
 scintilla/src/LineMarker.cxx           |    1 +
 scintilla/src/MarginView.cxx           |    1 +
 scintilla/src/PerLine.cxx              |    7 +-
 scintilla/src/Position.h               |   22 +
 scintilla/src/PositionCache.cxx        |    1 +
 scintilla/src/RESearch.cxx             |    2 +
 scintilla/src/RunStyles.cxx            |    1 +
 scintilla/src/ScintillaBase.cxx        |   20 +-
 scintilla/src/ScintillaBase.h          |    2 +-
 scintilla/src/Selection.cxx            |   14 +
 scintilla/src/Selection.h              |    2 +
 scintilla/src/SplitVector.h            |    3 +
 scintilla/src/Style.cxx                |    2 +
 scintilla/src/Style.h                  |    2 +-
 scintilla/src/UniConversion.cxx        |    2 +
 scintilla/src/ViewStyle.cxx            |    2 +
 scintilla/src/XPM.cxx                  |    1 +
 scintilla/version.txt                  |    2 +-
 src/highlightingmappings.h             |    3 +-
 wscript                                |    3 +-
 90 files changed, 2615 insertions(+), 2264 deletions(-)

commit c081983e850c4c49df208d603459e79555f22d50
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 20 17:53:13 2015 +0200

    Scintilla update script: properly abort on lexer copy error

 scripts/update-scintilla.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7c0bb4c6ca15fecbb295d90d2493ef39d0307d10
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Sep 10 14:47:37 2015 +0200

    Small update of the French translation

 po/fr.po | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit 83c5ddf3533e7d4d20305e232210213f61c117d0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Sep 10 14:46:08 2015 +0200

    Strip spurious backslashes in an UI string

 data/geany.glade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit af3b15c5ef3f98c25ac01e62542241acb14e1156
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Sep 9 20:25:41 2015 +0200

    Small update of the French translation

 po/fr.po | 450 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 228 insertions(+), 222 deletions(-)

commit 927b364311c785fd9b1d11e21da69709201fff23
Merge: 8b767fe 8253e2b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Sep 9 20:01:37 2015 +0200

    Merge pull request #647 from konsolebox/master
    
    Use 'g' as mnemonic key for "Use multi-line matching" instead of 'l'.
    
    Closes #589.

commit 8253e2bd481e10c49bf5367d996dd36126c82ded
Author: Ross Konsolebox <konsolebox@gmail.com>
Date:   Wed Sep 9 13:29:23 2015 +0800

    Use 'g' as shortcut key for "Use multi-line matching" instead of 'l'.
    
    The current shorcut key for "Use multi-line matching" conflicts with
    "In Selection" when "Use regular expressions" is enabled.  It should be
    convenient if we change it.
    
    We choose 'g' since other letters are already in use:
    
       u: "Use regular expressions"
       s: "Search for"
       e: "Use escape sequences"
       m: "Mark"
       l: "In Selection"
       t: "Match from start of word"
       i: "In Document"
       n: "Replace & Find"
       a: "Case sensitive"
       c: "Close"
       h: "Replace with"

 src/search.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6db80a247f6969ffc14272189da449d566a745c0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 8 16:23:57 2015 +0200

    Don't open more than one document for non-existing paths from the CLI
    
    When creating a new document for a non-existing file from the command
    line, check if we don't already have opened it and simply show the
    existing one if we do.  This avoids creating new documents that will be
    saved to the same location again and again.
    
    Closes https://bugs.launchpad.net/linuxmint/+bug/1482558

 src/libmain.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 8b767fea49f8698ee89e152c8be81d62ef0d8637
Merge: db7a13b 80c4cd0
Author: elextr <elextr@gmail.com>
Date:   Wed Sep 2 09:10:33 2015 +1000

    Merge pull request #638 from Akronix/master
    
    Added multiline comment for filetypes.haskell

commit 80c4cd0de0ba8447d9b7fe04ad9c301b9d791992
Author: Abel 'Akronix' Serrano Juste <akronix5@gmail.com>
Date:   Tue Sep 1 19:12:59 2015 +0200

    Added multiline comment for filetypes.haskell

 data/filetypes.haskell | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d4f26fdb13ff7e76728397c19b6dc8677ce7efaa
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Aug 26 23:51:33 2015 +0200

    plugin api: bump API number for new keybindings APIs

 src/plugindata.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7c2c9dc27a909129007d74bb40ac67a643f6a2f4
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Fri May 29 07:14:05 2015 +0200

    plugin api: add destroy_notify to the new keybinding APIs
    
    The destroy_notify can be used to make Geany automatically free the
    per-KeyGroup or per-KeyBinding user_data. This is particularly useful for
    vala-based plugins or other (future) language bindings.
    
    The destroy functions can be conviniently hooked into the destroy_notify of
    the underlying GPtrArrays, therefore this commit also implements such notifies
    internally.

 src/keybindings.c        | 61 +++++++++++++++++++++++++++++++-----------------
 src/keybindings.h        |  6 +++--
 src/keybindingsprivate.h |  1 +
 src/pluginutils.c        |  5 +++-
 src/pluginutils.h        |  2 +-
 5 files changed, 50 insertions(+), 25 deletions(-)

commit d3f6237505f1627d5b12c9ae5bed6dc736249878
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Fri Aug 22 16:09:49 2014 +0200

    plugin api: introduce keybindings_set_item_full and plugin_set_key_group_full
    
    These function actually set the new GeanyKeyGroupFunc and
    GeanyKeyBindingFunc and are exported for plugins

 src/keybindings.c | 39 +++++++++++++++++++++++++++++++++++++++
 src/keybindings.h |  4 ++++
 src/pluginutils.c | 30 ++++++++++++++++++++++++++++++
 src/pluginutils.h |  3 +++
 4 files changed, 76 insertions(+)

commit 1d08d3db4a0c7f6dc91309f3986d232b26cffb08
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Fri Aug 22 06:35:47 2014 +0200

    plugin api: introduce GeanyKeyGroupFunc and GeanyKeyBindingFunc
    
    These are new keybinding callback functions that take a few more parameters.
    Most importantly they have pdata pointer which allows plugins
    to store context information. This is especially useful for future plugins
    in OOP languages to store an instance pointer there, or interpreted ones to
    store interpreter context.

 src/keybindings.c        | 58 +++++++++++++++++++++++++++---------------------
 src/keybindings.h        | 48 +++++++++++++++++++++++++++------------
 src/keybindingsprivate.h |  2 ++
 3 files changed, 69 insertions(+), 39 deletions(-)

commit db7a13b4781895546ea8e616e633ccda4cea4afd
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue Aug 25 21:53:23 2015 +0200

    Mark "Open in New Window" menu item as translatable

 src/notebook.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b8a99752f0946bfb2840feb3f3ea59085f658dc6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Aug 24 19:40:17 2015 +0200

    Bump API version for new plugin entry points (oops)
    
    Closes #624.

 src/plugindata.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 280163a24411f84a01b107c524d4a6c4f87a6710
Merge: b7bcf14 765000b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 23 23:50:44 2015 +0200

    Merge pull request #469 from kugel-/new_hooks
    
    Plugin loader redesign

commit b7bcf14ddf8ff2f606e5b4c6cd50ec8a31d36bc0
Merge: c251dcb 568787b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 23 23:48:39 2015 +0200

    Merge pull request #613 from SiegeLord/even_more_rust_updates
    
    Rust updates

commit 765000be92262cb3395de82fa933511b6635c9be
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Aug 23 15:23:39 2015 +0200

    plugins: Clarify which API functions may be called within geany_load_module()
    
    Since geany_load_module() is called for non-enabled plugins you may not
    use the plugin API here yet. The only exceptions to this rule are API functions
    required for plugin registration.
    
    This rule is hard to enforce (would need to g_return_if_val(PLUGIN_LOADED_OK(p))
    for all API functions (well, those taking a plugin pointer anyway), so this
    rule is only documented for now.

 doc/plugins.dox  | 3 +++
 src/plugindata.h | 8 ++++++++
 2 files changed, 11 insertions(+)

commit 437837d3a54367393c41d6c1e1f4d1af4481627e
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Aug 23 15:23:37 2015 +0200

    plugins: separate geany_plugin_set_data() dual-use
    
    It was found that because geany_plugin_set_data() could be used by both
    plugin's init() and geany_load_module(), that it introduced some uncertainty
    as to when to call the free_func. init() callers might expect the call
    around the same time as cleanup() is called, while geany_load_module()
    callers expected the call at module unload time.
    
    It was indeed called at module unload time. But that means that init() callers
    cannot call it again reliably after in a init()->cleanup()->init() flow (when
    toggling the plugin) without fully unloading the plugin (which is what we do
    currently but that's we would want to change).
    
    With the separation we can actually destroy the data depending on where
    it was set and do everything unambigiously.

 doc/plugins.dox     | 37 +++++++++++++++++-----------------
 src/plugindata.h    | 20 +++++++++++++++---
 src/pluginprivate.h |  2 ++
 src/plugins.c       | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/pluginutils.c   | 15 +++++++++-----
 5 files changed, 106 insertions(+), 26 deletions(-)

commit d54b65b9ac6d981a7f770abfb11f6dba2e875e2c
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Aug 23 15:23:35 2015 +0200

    plugins: Updated doxygen for the new plugin loader
    
    The documentation provides a quite detailed description of the new loader
    In addition it adds a "how to transition" that briefly describes the old
    loader (for curious newcomers) and lots of hints for porting legacy
    plugins to the new loader.

 doc/plugins.dox     | 551 ++++++++++++++++++++++++++++++++++++++--------------
 doc/pluginsymbols.c |   8 +-
 src/plugindata.h    |   5 +
 3 files changed, 412 insertions(+), 152 deletions(-)

commit 58c8144afc10d31ce4473d70fd542369349c1f70
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Aug 23 15:23:33 2015 +0200

    plugins: Pass pdata to PluginCallback function by default
    
    If the plugin did not set its own user_data we set it to whatever it set
    with geany_plugin_register_full() or geany_plugin_set_data().
    This is particularly convinient because PluginCallback is usually statically
    allocated, at which point dynamically allocated plugin data doesn't exists yet.

 plugins/demoplugin.c | 16 +++++++++++++---
 src/plugindata.h     |  4 +++-
 src/plugins.c        |  3 ++-
 3 files changed, 18 insertions(+), 5 deletions(-)

commit 43c58e0fdde9e79fb902925a5854cde81db8db20
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Aug 23 15:23:31 2015 +0200

    plugins: change return codes of geany_load_module() and GeanyPluginFuncs::init
    
    - The return value from geany_load_module is removed (void). It was ignored
      anyway and we have to check separately whether the plugin loaded OK or not
      anyway. If the plugin specific code fails it should simply not call
      geany_plugin_register() (which it should only call iff all other conditions
      are good).
    
    - GeanyPluginFuncs::init() now returns a bool to allow failing initialization.
      Some plugins might want to defer work to their init() (i.e. only do
      it when the plugin was activated by the user), and some of that work can
      possibly fail (e.g. GtkBuilder fails to load .xml).
    
    Note that the GUI integration of the latter is less than ideal but this kind
    of GUI/policy work is out of scope for this patch set. Therefore a plugin
    failing to init is simply removed from the PM dialog as if it became
    incompatible. However, as the code that generates the list does not call init
    they will show up again if the PM dialog is re-opened.

 plugins/demoplugin.c |  8 +++++---
 src/plugindata.h     |  4 ++--
 src/plugins.c        | 24 ++++++++++++++++++------
 3 files changed, 25 insertions(+), 11 deletions(-)

commit 8241278472ceb23e7341a946c758bc8a30ef0fa8
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Aug 23 15:23:29 2015 +0200

    demoplugin: Adapt demoplugin to the new loader
    
    Demoplugin, while not installed by default, is a nice starting point
    and mini-howto. Therefore it should advertise the new loader from the
    beginning.

 plugins/Makefile.am  |  2 +-
 plugins/demoplugin.c | 70 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 40 insertions(+), 32 deletions(-)

commit 75827c69c0ba5c1b01cd0992fc6ef6354a9b0c38
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Aug 23 15:23:27 2015 +0200

    plugins: Refactor legacy plugin support
    
    With geany_plugin_set_data() the legacy plugin support can be made
    more transparent by using wrapper functions that call the actual plugin_*
    functions. This allows to remove the differentiation in code that's not
    directly concerned with actually loading plugins.
    
    This commit doesn't change anything except for one thing: legacy plugins now
    cannot call geany_plugin_set_data(). But it is meant for new-style plugins
    anyway.

 src/pluginprivate.h |  22 +--------
 src/plugins.c       | 125 +++++++++++++++++++++++++++++++---------------------
 src/pluginutils.c   |  24 ++++------
 3 files changed, 86 insertions(+), 85 deletions(-)

commit f2579141bb4188d4fc97eee494ba36e809661ddf
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Aug 23 15:23:24 2015 +0200

    plugins: Replace geany_plugin_register() pdata with a separate API function
    
    The API function adds a free_func parameter, and can also be called
    after geany_plugin_register(), i.e. in the plugin's init() callback. This
    fixes a by-design memory leak and gives greater flexibility.

 src/plugindata.h    |  7 ++++---
 src/pluginprivate.h |  1 +
 src/plugins.c       | 12 ++++++++----
 src/pluginutils.c   | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 7 deletions(-)

commit babf0083353b1d3501fee439b6228c2fbe84cc82
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Aug 23 15:23:22 2015 +0200

    plugins: Let plugins fill GeanyPlugin::callbacks instead of passing their own pointer
    
    This is easier to handle if we decide to add callbacks. Since we can
    zero-initialize callbacks before passing it to the plugin we can be certain as
    to which callbacks the plugin knew about when it was compiled. This is exactly
    the same method used for GeanyPlugin::info already and easier than inspecting
    the API version.

 src/plugindata.h | 14 ++++++++------
 src/plugins.c    | 27 +++++++++++++++------------
 2 files changed, 23 insertions(+), 18 deletions(-)

commit 721009e262e9bc279122566a60e14af0048d9094
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Aug 23 15:23:20 2015 +0200

    plugins: plugin loader redesign
    
    The old plugin loader has a number of deficiencies:
    
    - plugins need to export a couple of callback functions into the global namespace
    - plugins need to export data pointers, that are written by Geany
    - the exported functions have no user_data param, so there is no way to
      pass context/state back to the plugin (it needs global storage for that)
    - plugin registration is implicit, plugins have no way to not register themselves
      (it may want that due to missing runtime dependencies)
    - plugins perform the ABI/API verification, and even though we provide a
      convinience wrapper, it may get that wrong
    
    As a result, I designed a new loader with the following design principles
    - semantics of callbacks should not change, but they they shouldn't be mess
      with the global namespace
    - each callback receives a self-identifying param (the GeanyPlugin instance) and
      a plugin-defined data pointer for their own use
    - explicit registration through a new API function
    - in-core API/ABI checks
    
    The following principles shall be left unchanged:
    - The scan is done on startup and when the PM dialog is opened
    - Geany allocates GeanyPluginPrivate for each plugin, and GeanyPlugin is
      a member of it
    - Geany initially probes for the validity of the plugin, including file type
      and API/ABI check, thus Geany has the last word in determining what a
      plugin is
    - the PM dialog is updated with the proper, translated plugin information
    - the PM dialog GUI and user interaction in general is unchanged
    
    With the redesign, plugins export a single function: geany_load_module().
    This is called when the GModule is loaded. The main purpose of this function
    is to call geany_plugin_register() (new API function) to register the plugin.
    This is the only function that is learned about through g_module_symbol().
    Within this call the plugin should
    a) set the localized info fields of GeanyPlugin::info
    b) pass compiled-against and minimum API version as well as compiled-against
       ABI version, to allow Geany to verify compatibility
    c) pass a pointer to an instance of GeanyPluginFuncs
       which holds pointers to enhanced versions of the known callbacks (except
       configure_single which is dropped).
    d) optionally pass a plugin-private data pointer for later callbacks
    
    Enhanced means that all callbacks receive the GeanyPlugin pointer as the first
    and a pdata pointer as the last. pdata is private to the plugin and is set
    by geany_plugin_register().
    
    The callbacks need (should) not be globally defined anymore, and the global
    GeanyData, GeanyPlugin and GeanyFunctions pointers are ignored and not set
    anymore. GeanyData is available through GeanyPlugin::geany_data.

 src/plugindata.h    |  72 +++++++++--
 src/pluginprivate.h |  36 +++++-
 src/plugins.c       | 349 ++++++++++++++++++++++++++++++++++------------------
 src/pluginutils.c   |  20 +--
 4 files changed, 331 insertions(+), 146 deletions(-)

commit 568787bc2f48b8762fcc46a64f2d2ef77cb0bdbc
Author: Pavel Sountsov <siege@google.com>
Date:   Fri Aug 21 21:21:18 2015 -0700

    Change Rust tests to be in line with the ones in the universal-ctags tests.

 tests/ctags/test_input.rs       | 15 ++++++++++-----
 tests/ctags/test_input.rs.tags  |  4 +++-
 tests/ctags/test_input2.rs      |  2 ++
 tests/ctags/test_input2.rs.tags |  1 +
 4 files changed, 16 insertions(+), 6 deletions(-)

commit 91ee4376406007b3fceb516059517820527e4c70
Author: Pavel Sountsov <siege@google.com>
Date:   Sun Aug 16 20:45:06 2015 -0700

    Parse 'where' bounds correctly.

 tagmanager/ctags/rust.c        |  3 ++-
 tests/ctags/test_input.rs      | 13 +++++++++++++
 tests/ctags/test_input.rs.tags |  4 ++++
 3 files changed, 19 insertions(+), 1 deletion(-)

commit 6814fc1a6210b257cb76396474c8e20ea602432a
Author: Pavel Sountsov <siege@google.com>
Date:   Sun Aug 16 20:16:35 2015 -0700

    Update Rust keywords.

 data/filetypes.rust             |  4 +--
 tests/ctags/test_input.rs       | 71 ++++++++++++++++++++---------------------
 tests/ctags/test_input.rs.tags  |  6 ++--
 tests/ctags/test_input2.rs      | 15 ++++-----
 tests/ctags/test_input2.rs.tags |  4 +--
 5 files changed, 48 insertions(+), 52 deletions(-)

commit c251dcb45f6333ea63fcc2275f7971e6d01ae5e1
Merge: 31325bb 624048e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 21 22:26:41 2015 +0200

    Merge pull request #394 from SiegeLord/selection_document_mods
    
    Make Document > Strip trailing spaces/Replace tabs/Replace spaces use
    the current selection.

commit 3495cf05abf42e5f08952a19d3798cc27a50b6e6
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Aug 17 17:06:49 2015 +0200

    Remove saved file's mtime check comparing it with the current time
    
    As the edited file can be a remote file on a server with a different time
    zone, the mtime can actually be in the future. In this case the check not
    only shows the misleading warning but more importantly the
    
    doc->priv->mtime < st.st_mtime
    
    check never happens and the user doesn't get the modified file prompt.
    
    Setting
    
    doc->priv->mtime = time(NULL);
    
    to the current time on file creation isn't harmful in any way because the
    saved file's mtime is taken but it's a bit misleading so better to set it
    to 0.

 src/document.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

commit 624048ea5e731336097b6e0be5901b77aae075a8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jan 5 15:40:35 2015 +0100

    Keep selection stable when replacing tabs and spaces

 src/editor.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 2a887fee30c4444db29be4e05a53cb323bc9a5c5
Author: Pavel Sountsov <siege@google.com>
Date:   Thu Jan 15 20:30:17 2015 -0800

    Don't strip spaces from the next line when whole lines are selected.

 src/editor.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 186a43c1d1ea5227ff3d607fd49ce6a633cea415
Author: Pavel Sountsov <siege@google.com>
Date:   Fri Dec 26 20:21:54 2014 -0800

    Document the changes to space/tab replacement

 doc/geany.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 795230c5728a5d91c57d989c5356460dd5209854
Author: Pavel Sountsov <siege@google.com>
Date:   Thu Dec 25 12:23:09 2014 -0800

    Use current selection when replacing tabs/spaces from the menu.
    
    When saving the file, the tabs are removed from the whole file as usual.

 src/callbacks.c |  4 ++--
 src/document.c  |  2 +-
 src/editor.c    | 31 ++++++++++++++++++++++++-------
 src/editor.h    |  4 ++--
 4 files changed, 29 insertions(+), 12 deletions(-)

commit 381d74b1a72d5feef85fef56b25bb15d5403f955
Author: Pavel Sountsov <siege@google.com>
Date:   Thu Dec 25 11:55:02 2014 -0800

    Use current selection when stripping trailing whitespace from the menu.
    
    When the lines are stripped due to the file being saved, ignore the selection.

 src/callbacks.c |  2 +-
 src/document.c  |  2 +-
 src/editor.c    | 18 +++++++++++++++---
 src/editor.h    |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

commit 31325bb2310f3946668ba420910f0e44a734b0fa
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Aug 5 20:50:09 2015 +0200

    Update of Swedish translation

 NEWS     |  4 ++-
 po/sv.po | 97 +++++++++++++++++++++++++++++++---------------------------------
 2 files changed, 50 insertions(+), 51 deletions(-)

commit a26a2257db248e77c192e5284708a7b9149cd71f
Merge: bff71b3 a6c3cdc
Author: Dominic Hopf <dmaphy@googlemail.com>
Date:   Wed Aug 5 10:24:52 2015 +0200

    Merge pull request #599 from oliwer/perlkeywords
    
    Add new keywords for recent versions of Perl

commit a6c3cdc2cdc4bb8ccb261246bc971a9d815d2edc
Author: Olivier Duclos <olivier.duclos@capabilis.com>
Date:   Wed Aug 5 10:05:02 2015 +0200

    Add new keywords for recent versions of Perl
    
    This commit adds the following new keywords for perl:
     - say
     - state
     - given, when, default
     - __SUB__
    
    While __SUB__ was introduced in perl 5.16, the others date back
    to v5.10 released in 2007!

 data/filetypes.perl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bff71b3a88f6fc77a32a642d8d638ed91742ce98
Author: Matthew Brush <matt@geany.org>
Date:   Mon Jul 27 17:52:15 2015 -0700

    Fix "Open in New Window" command arguments
    
    Closes #590

 src/utils.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit 1b5ec633e3a0f15f17ed29b9947cb346a6ee669b
Author: Wayne Nilsen <waynenilsen@gmail.com>
Date:   Wed Jul 8 18:39:53 2015 +0200

    Use Cargo tool for Rust build commands
    
    Closes PR #557

 data/filetypes.rust | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

commit c0898618f9a162913dfdddc74e2526019dcfb9ea
Merge: 50b150b 2ae6c7f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 22 21:52:10 2015 +0200

    Merge pull request #574 from eht16/doxygen_fixes
    
    Fix Doxygen warnings

commit 50b150b66d6ee659446f89749382cf9bd6158a19
Merge: c5b0fc4 97fca1b
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Jul 22 21:50:57 2015 +0200

    Merge pull request #583 from eht16/win32_fix_native_dialogs
    
    Windows: restore modern design of native file dialogs

commit 2ae6c7fd0fcc84cc73fa7506e874ab8a813dba36
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue Jul 14 00:08:51 2015 +0200

    Fix Doxygen warnings
    
    This resolves warnings from Doxygen about non-existing commands
    caused by unescaped backslashes as well as multiply
    defined section names.

 doc/plugins.dox |  4 ++--
 src/spawn.c     | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

commit c5b0fc459a1251c824a44edb5dfab4a8feb0bd00
Merge: 5510a5a 87496f6
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Jul 22 19:59:38 2015 +0200

    Merge pull request #573 from zhekov/cleanup-win32defines
    
    Cleanup win32defines

commit 5510a5a00e2579f4971fca65b1162d3c153668ca
Merge: fb63f9e 21bb11d
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue Jul 21 21:31:43 2015 +0200

    Merge pull request #585 from codebrainz/remove-style-debug-print
    
    Remove needless debug print

commit 21bb11ddd7bfb06573b29e696172c98aec532eec
Author: Matthew Brush <matt@geany.org>
Date:   Tue Jul 21 11:15:27 2015 -0700

    Remove needless debug print
    
    Prevents spamming the console when SCLEX_CONTAINER
    is activated (ex. by plugins).

 src/editor.c | 6 ------
 1 file changed, 6 deletions(-)

commit 97fca1b29d5ca7311180c28084e3f0e07526a277
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Jul 19 23:13:45 2015 +0200

    Windows: restore modern design of native file dialogs
    
    This restores the previously used "modern design" of the Windows
    native file open/save dialogs. Also make the dialogs resizable.
    
    Fixes #578.

 src/win32.c | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

commit fb63f9e43a9d81425d14754d6cf02ddfc564201d
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Jul 18 21:28:40 2015 +0200

    Use monospace font for the message window by default
    
    Since both gcc and llvm use ^ to mark the position of the error now,
    monospace font seems to be a better default font for the message window
    to avoid the ^ character misalignment.
    
    Fixes #435.

 src/keyfile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1658babe452f58f37c84ebcfb34df97e14726351
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jul 14 15:44:47 2015 +0200

    Remove obsolete GTK compatibility code

 plugins/classbuilder.c | 1 -
 src/about.c            | 1 -
 src/gtkcompat.h        | 8 --------
 src/prefs.c            | 2 +-
 4 files changed, 1 insertion(+), 11 deletions(-)

commit 87496f657dccb4294e08e7566116b0e5f4edf591
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Jul 13 19:46:17 2015 +0300

    Cleanup win32defines
    
    The git PR for this change contains a long explanation.

 src/Makefile.am    |  2 +-
 src/socket.c       |  2 --
 src/spawn.c        |  2 --
 src/win32.c        |  5 ++++-
 src/win32defines.h | 32 --------------------------------
 5 files changed, 5 insertions(+), 38 deletions(-)

commit 0f5e379ec8199ba68f7fa44e642d210a71df7d40
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jul 13 00:47:18 2015 +0200

    Update making-a-release
    
    * geany.nsi and doc/geany.html are now generated;
    * freecode.com is dead.

 doc/making-a-release | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit a50306cab3e0d07bd568861dc6b43bbea78d63d3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 12 19:30:44 2015 +0200

    Post release version bump
    
    Say hello to Geany 1.26 "Rosset"!

 NEWS               | 3 +++
 configure.ac       | 2 +-
 doc/geany.txt      | 2 +-
 geany.exe.manifest | 2 +-
 geany_private.rc   | 4 ++--
 src/geany.h        | 2 +-
 win32-config.h     | 2 +-
 wscript            | 2 +-
 8 files changed, 11 insertions(+), 8 deletions(-)

commit 7d9264a6e7498f6ba2fc454ba0cdca29fb0cb6fb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 12 18:04:56 2015 +0200

    Set release date

 NEWS          | 2 +-
 doc/geany.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit ffe7206cc85801e93f5f12d4e43ce7fcb854f9c5
Merge: 59185ae e5471fb
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Jul 12 15:50:15 2015 +0000

    Merge pull request #570 from eht16/win32_header_order
    
    Include win32defines.h before win32.h to fix build errors

commit e5471fb5cedd11ed508971f909939da95a628c15
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Jul 12 16:46:08 2015 +0200

    Include win32defines.h before win32.h to fix build errors

 src/socket.c       |  3 ++-
 src/spawn.c        |  3 ++-
 src/win32.c        |  8 +++----
 src/win32defines.h | 63 +++++++++++++++++++++++++++---------------------------
 4 files changed, 40 insertions(+), 37 deletions(-)

commit 59185ae8e0a3eb0bb29c3558d55c598c4a1242be
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Jul 12 17:06:10 2015 +0200

    Update copyright string to reflect year 2015

 README        | 2 +-
 doc/geany.txt | 4 ++--
 src/about.c   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 6c9a55d6ef2361eb189a7a6ccd547950a4ce2cd1
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Jul 12 17:05:45 2015 +0200

    Update release date inside man-page

 doc/geany.1.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 290a80ab71773520d982486ce5f1c547e16793ed
Merge: 64fb9f9 bb28bdd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 12 16:46:47 2015 +0200

    Merge pull request #569 from b4n/spawn-wif-and-doc
    
    Prefix the WIF* macros with SPAWN_ and add short doc comments, and fix
    Doxygen integration.

commit bb28bdd1d39a58e8682a54077b1933ad72d3dbb0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 12 16:22:13 2015 +0200

    Fix spawn documentation so it appears in the API docs

 doc/plugins.dox | 1 +
 src/spawn.c     | 4 ++++
 2 files changed, 5 insertions(+)

commit feca48b59e838dcd6ca4a8d03697495163d73692
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 12 16:18:38 2015 +0200

    spawn: Move macros documentation so Doxygen can find them

 src/spawn.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 7819cd11c7ac237eb08fbabc210a55eb95c9a0fb
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Jul 12 17:12:20 2015 +0300

    Make the search.c exit status checks platform independent

 src/search.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 2f237c91a104a8b8260047f5a7de9a265278a150
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Jul 12 17:06:02 2015 +0300

    Prefix the WIF* macros with SPAWN_ and add short doc comments

 src/build.c  | 2 +-
 src/search.c | 6 +++---
 src/spawn.c  | 4 ++--
 src/spawn.h  | 9 ++++++---
 src/tools.c  | 2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

commit 64fb9f9a51bc1a6d406bd902161e4dd4bde8cdd4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 12 14:39:39 2015 +0200

    Don't return with an argument in a function returning void

 src/search.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f11a2eb0139b39e4513394af62bcda3743d54cb3
Merge: 5b341b1 b891c84
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Jul 12 12:51:12 2015 +0000

    Merge pull request #563 from geany/elextr-news-addition
    
    Update NEWS to mention windows command quoting

commit b891c84582ea1932206fea074f96150947c4db40
Author: elextr <elextr@gmail.com>
Date:   Sun Jul 12 10:29:57 2015 +1000

    Update NEWS to mention windows command quoting

 NEWS | 2 ++
 1 file changed, 2 insertions(+)

commit 5b341b12316ed0a23d8809a86df5c3f2459fb6eb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 12 14:19:28 2015 +0200

    spawn: Fix a typo in Windows compatibility code
    
    Thanks to Dimitar for spotting this.

 src/spawn.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 01b01cc83a9c15f41b509072aff476184e2a6a4e
Merge: a54cca7 6c753e5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 12 14:15:30 2015 +0200

    Merge pull request #561 from b4n/filebrowser-use-spawn
    
    filebrowser: Use Spawn module to launch the external command

commit a54cca738f788bf0493801abcfab17101f2e2b65
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Jul 12 10:02:56 2015 +0200

    Install src/spawn.h as it is part of the plugin API

 src/Makefile.am | 1 +
 wscript         | 1 +
 2 files changed, 2 insertions(+)

commit c021447394d5b4510212d3c3f450c6b9a4c5d810
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 12 01:45:39 2015 +0200

    Fix a few typos in NEWS

 NEWS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 676f3794fcae6068da770eecc1570c5868bd8a44
Merge: 73822e7 d6d4728
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 11 22:34:41 2015 +0200

    Merge pull request #553 from b4n/no-reload-maintain-history-by-default
    
    Disable "maintain history on reload" by default

commit 73822e77ec3e6c99048298c07d7c06f8c9498532
Merge: 05f35ed e0eb176
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 11 22:22:09 2015 +0200

    Merge pull request #556 from b4n/gtk3-in-news
    
    Replace references to GTK2 with GTK+ and "stabilize" GTK3 in NEWS

commit 6c753e591befda8eefe51f4ca3a4f7b8111c5e36
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 11 22:14:25 2015 +0200

    filebrowser: Use Spawn module to launch the external command
    
    This makes the command syntax consistent with other
    Geany ones and more native on Windows.

 plugins/filebrowser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 05f35ed68327513727765cb09be7564db7718ac0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 11 22:12:08 2015 +0200

    Include spawn.h in geanyplugin.h as it has Plugin API bits in it

 plugins/geanyplugin.h | 1 +
 1 file changed, 1 insertion(+)

commit 5379e1387fcddc28c3bbcc02faa9bbd1b7cdcd8a
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Jul 11 16:36:03 2015 +0200

    Windows installer: fix plugin installation directory

 geany.nsi.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d6d4728f2e708ed275ea9a2b045a8c58c509f138
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 11 15:35:36 2015 +0200

    Rename "maintain history on reload" setting temporarily for 1.25
    
    We want it disabled by default in 1.25 for everyone, but want to be
    able to get it back on by default later on when the UI is more
    polished.
    
    So we will need to have a way to tell whether the configuration comes
    from 1.25 and should be upgraded or was willfully disabled by the user
    in a later version.  So, use a temporary setting name that defaults to
    disabled for 1.25
    
    See #553.

 doc/geany.txt | 2 +-
 src/keyfile.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 8c907dc00f44e66adcfbd50608e8d8a9d38386f4
Merge: fd06d47 e344213
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 11 15:27:02 2015 +0200

    Merge pull request #555 from b4n/less-spawn-api
    
    spawn: Do not export unnecessary API

commit fd06d47c7bec0659e0ce338ac6eee82de6ca9542
Merge: 860e3fb 41184e4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 11 14:59:56 2015 +0200

    Merge pull request #548 from techee/run_script_escape
    
    Properly escape working directory in run script
    
    Closes #554.

commit 860e3fb12e3ccc785b72c0ea030f0ed954d745be
Merge: 8d367d4 10e9dd7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 11 14:09:58 2015 +0200

    Merge pull request #550 from b4n/fix-ubuntu-libdir
    
    autotools: Workaround a Ubuntu issue when installing in /usr/local/lib

commit 8d367d49b98f63a28e2d1a7441faa360f1292fa4
Merge: cea3473 3e2b4a2
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Jul 11 10:05:30 2015 +0200

    Merge pull request #360 from b4n/travis-test
    
    travis: Add a Travis CI settings file

commit 3e2b4a269b592908a6a80240a2c5338c70c25b4a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 10 23:45:48 2015 +0200

    travis: Make it a bit easier to change GTK bundle URLs

 scripts/cross-build-mingw.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 02e6682ea65ad0094d2cee0b14a2c8c4afa738b6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 3 15:33:09 2015 +0200

    travis: Enable Windows cross-compilation
    
    We unfortunately can't run tests as they require running the just build
    (foreign) executable, but at least it tries and build the Windows code
    paths.

 .travis.yml                  |  24 +++++++---
 scripts/cross-build-mingw.sh | 102 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+), 7 deletions(-)

commit e0eb1764189b3b44e1c2d4c16af30ea8b6a3d51b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 10 23:00:22 2015 +0200

    Mention that GTK3 version is not experimental anymore

 NEWS | 1 +
 1 file changed, 1 insertion(+)

commit 3bd7c80776b0fcdb8c6929d5f4553cb865bd31b9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 10 22:58:48 2015 +0200

    Replace references to GTK2 with GTK+
    
    This allows to be GTK version agnostic, not to single out GTK3 builds.

 README           | 4 ++--
 configure.ac     | 2 +-
 doc/geany.txt    | 2 +-
 geany.desktop.in | 2 +-
 geany.pc.in      | 2 +-
 geany.spec.in    | 2 +-
 po/ar.po         | 4 ++--
 po/ast.po        | 4 ++--
 po/be.po         | 4 ++--
 po/bg.po         | 2 +-
 po/ca.po         | 4 ++--
 po/cs.po         | 4 ++--
 po/de.po         | 4 ++--
 po/el.po         | 4 ++--
 po/en_GB.po      | 4 ++--
 po/es.po         | 4 ++--
 po/et.po         | 6 +++---
 po/eu.po         | 4 ++--
 po/fa.po         | 4 ++--
 po/fi.po         | 4 ++--
 po/fr.po         | 4 ++--
 po/gl.po         | 4 ++--
 po/he.po         | 4 ++--
 po/hi.po         | 4 ++--
 po/hu.po         | 4 ++--
 po/id.po         | 4 ++--
 po/it.po         | 4 ++--
 po/ja.po         | 4 ++--
 po/kk.po         | 4 ++--
 po/ko.po         | 4 ++--
 po/lb.po         | 4 ++--
 po/lt.po         | 4 ++--
 po/mn.po         | 2 +-
 po/nl.po         | 4 ++--
 po/nn.po         | 4 ++--
 po/pl.po         | 4 ++--
 po/pt.po         | 4 ++--
 po/pt_BR.po      | 4 ++--
 po/ro.po         | 4 ++--
 po/ru.po         | 4 ++--
 po/sk.po         | 2 +-
 po/sl.po         | 4 ++--
 po/sr.po         | 2 +-
 po/sv.po         | 4 ++--
 po/tr.po         | 4 ++--
 po/uk.po         | 4 ++--
 po/vi.po         | 4 ++--
 po/zh_CN.po      | 4 ++--
 po/zh_TW.po      | 4 ++--
 49 files changed, 90 insertions(+), 90 deletions(-)

commit e34421377c7f82cbb4d7965227a64c6d3162466d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 10 22:41:02 2015 +0200

    spawn: Remove unnecessary and redundant comments

 src/spawn.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

commit 7a91a8661dceff94623da7569b381cd479af301b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 10 18:15:14 2015 +0200

    spawn: Do not export unnecessary API
    
    Hide spawn_get_program_name(), spawn_async_with_pipes() and
    spawn_get_exit_status_cb(), which are not used by anyone else and
    should not be part of the plugin API unless explicitly required.
    
    See http://lists.geany.org/pipermail/devel/2015-June/thread.html#9521
    
    Note: this duplicates some documentation when a now hidden function was
    referred to.

 NEWS        |  8 +++-----
 src/spawn.c | 63 ++++++++++++++++++++++++++++++++++++++++---------------------
 src/spawn.h |  8 --------
 3 files changed, 44 insertions(+), 35 deletions(-)

commit cea34734c472c0374ddbfc0b0655665d47027413
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 8 18:39:53 2015 +0200

    Update NEWS

 NEWS | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

commit 96d5eec50f35b9daeb7da882ed6b98ff47edaf17
Merge: c5b8647 4476ed9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 8 18:04:05 2015 +0200

    Merge pull request #544 from b4n/cxx11-override
    
    c++: Properly parse C++11 overrides, finals and noexcepts

commit 6f5d5db2cb6da4970aa78a64efee3a91727fea51
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 8 17:47:49 2015 +0200

    Disable "maintain history on reload" by default
    
    While the feature is nice, it might be unexpected and lacks user
    feedback.  This might lead to user thinking they lost their work
    because they don't know they can undo the reload operation.
    
    So, disable the feature by default until we introduce appropriate user
    feedback allowing the user to learn about the feature and new behavior.
    
    See http://lists.geany.org/pipermail/devel/2015-June/thread.html#9537

 NEWS          | 4 ++--
 doc/geany.txt | 2 +-
 src/keyfile.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit c5b86474adccb2dbcbf4631e96631bb653dae759
Merge: 6ebf90a 71ce7c0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jul 7 17:34:43 2015 +0200

    Merge pull request #539 from kugel-/win32-fix
    
    Win32 Autotools build and installer fixes.

commit 71ce7c077d05353adbe1f0a78cc3c5204ceeb1ec
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Jul 1 16:39:08 2015 +0200

    win32: Add some window-specifc LDFLAGS to geany itself as well
    
    Since we build libgeany some ld flags were applied to libgeany only.
    Some of them need to be applied to the main binary as well.
    
    This fixes the problem that a sticky terminal window starts together
    with geany.

 src/Makefile.am | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 9224c3c3912960e321d29875353cb166427060e6
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Tue Jun 23 07:11:08 2015 +0200

    win32: run geany.nsi.in through automake to replace @GTK_VERSION@ variable
    
    This automatically keeps the installer's idea of Gtk version with the one
    used to compile geany in sync.
    
    Traditionally we use the bundles from gtk.org to compile geany, and this
    is also used for the installer. With msys2, we can use precompiled
    msys2 binaries. These exist for GTK3 as well so we can actually provide a
    GTK3 based installer. The installer naturually should reflect this.
    Msys2's GTK2 is also newer.
    
    Use the new script gtk-bundle-from-msys2.sh to extract the precompiled
    GTK binaries from msys2 / pacman for packing the installer (can also be
    used to make a zip for sharing).
    
    mkdir gtk; cd gtk; ../scripts/gtk-bundle-from-msys.sh [-c] [-z] [-2 | -3]
    
    waf is also adapted to process geany.nsi.in. This implies geany.nsi is now
    under _build_, not in the root anymore.

 .gitignore                       |   1 +
 configure.ac                     |   2 +
 geany.nsi                        | 449 -------------------------------------
 geany.nsi.in                     | 462 +++++++++++++++++++++++++++++++++++++++
 scripts/gtk-bundle-from-msys2.sh | 109 +++++++++
 wscript                          |  10 +
 6 files changed, 584 insertions(+), 449 deletions(-)

commit 2e76e3792e7d8a568aeadc5a9cdbf37c9eca8661
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Tue Jun 23 07:07:02 2015 +0200

    win32: port some defines from win32-config.h & waf to a new win32defines.h
    
    autotools based build system uses only config.h. This file was lacking some
    important defines. Rather than maintaining the defines in all build systems,
    we can simply define in a specialized header that is included by all .c files
    that use windows.h

 src/Makefile.am    |  2 +-
 src/socket.c       |  1 +
 src/spawn.c        |  1 +
 src/win32.c        |  4 ++--
 src/win32defines.h | 31 +++++++++++++++++++++++++++++++
 win32-config.h     |  6 ------
 wscript            |  3 ---
 7 files changed, 36 insertions(+), 12 deletions(-)

commit ba80af0822da934f6d11a1c7564d0013bdebf976
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Tue Jun 23 07:05:35 2015 +0200

    win32: install a few more files needed by the installer

 Makefile.am | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 10e9dd70899cf7bc28246d84dce8a6483ed85f80
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 5 16:17:55 2015 +0200

    autotools: Workaround a Ubuntu issue when installing in /usr/local/lib
    
    Ubuntu's linker apparently has a bug when installing in /usr/local/lib,
    as it is setup in such a way that makes libtool recognize it correctly
    as a system path so doesn't add RPATH to our executable, but ld can't
    find the library without an explicit ldconfig call (unlike when
    installing in /usr/lib).
    
    So, workaround this by explicitly calling ldconfig when installing in
    /usr/local/lib -- and when our library is actually not found, to try
    and avoid doing something unnecessary on working systems, like e.g.
    Debian.

 src/Makefile.am | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 6ebf90ad1d04b5c8eb50f69e9b497486ac66a10c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 5 02:04:22 2015 +0200

    Add an explicit entry about libgeany in the NEWS

 NEWS | 2 ++
 1 file changed, 2 insertions(+)

commit 43a76923dbee4726e140879714eeefc026fb528c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 4 18:44:39 2015 +0200

    Fix a small inconsistency in the French translation
    
    In the VTE, the "Input Method" string mimics a GTK string, so use the
    same translation as GTK.

 po/fr.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4017442f86b2374dce86cb3855b48d3d7c9e24fe
Merge: a90b99b 8a6fbd9
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Jul 4 12:52:46 2015 +0200

    Merge pull request #477 from eht16/ctags_powershell
    
    Add PowerShell tag parser

commit a90b99b968be529c59d0f371975c8be0bfbfa258
Merge: aa40250 0b4228b
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Jul 4 12:29:22 2015 +0200

    Merge pull request #540 from kugel-/win32-plugindir
    
    win32: change default plugin dir to match Linux.

commit 41184e4b986b513da7163136da38eb6401ca88e5
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Jul 3 10:30:23 2015 +0200

    Properly escape working directory in run script using g_shell_quote()
    
    The g_strescape() function escapes non-ASCII characters so that bash
    doesn't understand them.

 src/build.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e22f0ca05417d026b434518ce60e344a62514738
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 20 18:49:41 2014 +0200

    travis: Add a Travis CI settings file

 .travis.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

commit 0b4228b94c6d647cb761f96ffd9f619bb38c4306
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sat Jun 27 23:49:20 2015 +0200

    win32: change default plugin dir to match Linux.
    
    There is no need to do it differently as Linux here, and it confuses the
    autotools based compilation of geany-plugins which installs to libdir/geany
    unconditionally.

 geany.nsi           | 2 +-
 plugins/Makefile.am | 4 ----
 src/utils.c         | 2 +-
 wscript             | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

commit aa40250fdab5b1b5867b48a19d12c2a9cf2ecf7b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 1 23:03:38 2015 +0200

    Fix invalid memory access when quitting
    
    When quitting and the prefs dialog has been created, the StashPrefs are
    destroyed before the stash tree and so the stash tree cleanup code
    accesses freed memory.  Fix this by removing access to the StashPref in
    the tree cleanup code, as fixing it properly is a bit of a mess.
    
    Closes #538.

 src/stash.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 11d0d54552aa3565c88db646169a13405b6692aa
Merge: 89f7a2e 891997a
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Jul 1 20:42:12 2015 +0200

    Merge pull request #519 from techee/cxx_o2
    
    Add -O2 flag also for C++ files when building with waf

commit 4476ed9c4b238072f52cefd7baf93f725048cde1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 1 03:30:29 2015 +0200

    c++: Add a small test combining various C++14 things

 tests/ctags/Makefile.am             | 1 +
 tests/ctags/cxx14-combined.cpp      | 8 ++++++++
 tests/ctags/cxx14-combined.cpp.tags | 6 ++++++
 3 files changed, 15 insertions(+)

commit f60b31385e4da74d3b926c8e0c8f97c00a508d7b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 1 03:21:04 2015 +0200

    c++: Handle C++11 noexcept

 tagmanager/ctags/c.c                | 4 +++-
 tests/ctags/Makefile.am             | 1 +
 tests/ctags/cxx11-noexcept.cpp      | 7 +++++++
 tests/ctags/cxx11-noexcept.cpp.tags | 5 +++++
 4 files changed, 16 insertions(+), 1 deletion(-)

commit 95a0d4db7e2188a62cf7770496ee2a51591f1962
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 30 14:40:55 2015 +0200

    c++: Properly parse C++11 override and final members
    
    As `override` and `final` aren't real keywords, handle them manually
    not to break identifiers of those names.

 tagmanager/ctags/c.c                |  8 +++++++-
 tests/ctags/Makefile.am             |  1 +
 tests/ctags/cxx11-final.cpp         |  2 +-
 tests/ctags/cxx11-override.cpp      | 23 +++++++++++++++++++++++
 tests/ctags/cxx11-override.cpp.tags |  9 +++++++++
 5 files changed, 41 insertions(+), 2 deletions(-)

commit 641863c2647c21abb36aedc40ac93e6cc478f920
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 30 23:15:09 2015 +0200

    c++: Fix handling of the `final` contextual keyword
    
    `final` is not a normal keyword, as it only have a special meaning in
    some specific context.  So, use a special case instead of a keyword not
    to break identifiers of that name.

 tagmanager/ctags/c.c             | 19 ++++++++++---------
 tests/ctags/Makefile.am          |  1 +
 tests/ctags/cxx11-final.cpp      | 23 +++++++++++++++++++++++
 tests/ctags/cxx11-final.cpp.tags |  9 +++++++++
 4 files changed, 43 insertions(+), 9 deletions(-)

commit 89f7a2eec92b8d37dd71349952328f091f096b42
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Jun 30 13:23:02 2015 +0200

    Fix leaking typename_array in tag manager

 tagmanager/src/tm_workspace.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8a6fbd978691fa324bd5c5ff171bcd508e3b466c
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Apr 25 16:17:03 2015 +0200

    Add PowerShell tag parser

 src/filetypes.c                 |   2 +-
 src/symbols.c                   |   3 +-
 tagmanager/ctags/Makefile.am    |   1 +
 tagmanager/ctags/makefile.win32 |   2 +-
 tagmanager/ctags/parsers.h      |   3 +-
 tagmanager/ctags/powershell.c   | 628 ++++++++++++++++++++++++++++++++++++++++
 tagmanager/src/tm_parser.h      |   1 +
 tests/ctags/Makefile.am         |   1 +
 tests/ctags/simple.ps1          | 112 +++++++
 tests/ctags/simple.ps1.tags     |  16 +
 wscript                         |   1 +
 11 files changed, 766 insertions(+), 4 deletions(-)

commit db30fdc6ecfb4dc0580bd635541854bfb5d8dc53
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 27 15:17:34 2015 +0200

    Recognize XPM files as C sources

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d32ca92a8a7077472cd98ef89954557405186927
Merge: 01612a9 14bcd9c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 27 14:37:13 2015 +0200

    Merge pull request #537 from b4n/fix-binreloc
    
    Fix binary relocation support

commit 01612a9505cd3671e6b5d899454b098cfae28d0a
Merge: 46a123d fc82f9d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 27 14:33:11 2015 +0200

    Merge pull request #536 from zhekov/spawn
    
    Spawn fixes/improvements

commit 14bcd9c87df27ee64e17c22ba01194c6011f4a02
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jun 26 22:33:16 2015 +0200

    Fix binary relocation support

 src/Makefile.am | 4 ++++
 src/utils.c     | 1 +
 2 files changed, 5 insertions(+)

commit fc82f9d9e1bc3077f7d36feb690a7f90bba1399d
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Fri Jun 26 18:57:44 2015 +0300

    Fix spawn with -DSPAWN_TEST not to require GEANY_API_SYMBOL
    
    As stated in spawn.c, "This module does not depend on Geany when
    compiled for testing (-DSPAWN_TEST)."

 src/spawn.c | 1 +
 1 file changed, 1 insertion(+)

commit 8aebf54b4716c7ca443851c1c72e6bc926e03371
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Fri Jun 26 18:44:56 2015 +0300

    Fix spawn_async_with_pipes() to work without watch for child_pid=NULL
    
    On child_pid=NULL, the Windows process handle is now closed ASAP, so
    no main glib event loop is required.

 src/spawn.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

commit 46a123d6fe6279896197738d709d4420861df651
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 20 14:04:17 2015 +0200

    python: Fix handling of inline comments
    
    If there was two hashes (#) in an inline comment, only the content
    between the two was considered a comment.
    
    X-Universal-CTags-Commit-ID: ee93f5b9f393e76a850cf8c894cc748a62981156

 tagmanager/ctags/python.c           | 5 ++++-
 tests/ctags/Makefile.am             | 1 +
 tests/ctags/python-comments.py      | 8 ++++++++
 tests/ctags/python-comments.py.tags | 2 ++
 4 files changed, 15 insertions(+), 1 deletion(-)

commit d2052b55bafeb0a6433dfdc9f3b7f95623bb73c2
Merge: 54eff29 6781ab3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 25 22:39:02 2015 +0200

    Merge pull request #532 from techee/optimize_python
    
    python: optimize skipEverything()

commit 6781ab30c54efdb29d41e45bc20cc2eec0124f66
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Jun 25 22:10:32 2015 +0200

    python: optimize skipEverything()
    
    Most of the time there's no start of a string which means all the 10
    strcmp()s are done for every character of the input. This is very expensive:
    before this patch this function alone takes 55% of the parser time.
    When comparing by character (and avoiding further comparison if the first
    character doesn't match), this function takes only 11% of the parser time
    so the performance of the parser nearly doubles.
    
    In addition check for the "rb" prefix which is possible in Python 3.
    
    Ported from universal-ctags.

 tagmanager/ctags/python.c | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

commit 54eff298bdff43bf86c40fb12210e2a761abeca6
Author: elextr <elextr@gmail.com>
Date:   Thu Jun 25 05:56:43 2015 +1000

    Fix Manual for Build Menu Keybindings
    
    Only fixed items can have keybindings but this manual entry was missed when one execute item was changed from fixed to optional.

 doc/geany.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 98748707b80eca34bd939cfac06095b2323132cb
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Jun 24 15:47:01 2015 +0200

    Update of Belarussian translation

 po/be.po | 2081 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 918 insertions(+), 1163 deletions(-)

commit d124f563759e6dfd133bf37d61dc74344f773806
Merge: b165de1 e7a52cc
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Jun 24 10:30:35 2015 +0200

    Merge pull request #529 from xhacker/zh_CN
    
    Update Simplified Chinese translation

commit e7a52ccec5731835fae13d9ceb1348d0fd96745d
Author: LIU Dongyuan / 柳东原 <liu.dongyuan@gmail.com>
Date:   Tue Jun 23 23:10:52 2015 -0700

    Update Simplified Chinese translation

 po/zh_CN.po | 156 ++++++++++++++++++++++++++++--------------------------------
 1 file changed, 73 insertions(+), 83 deletions(-)

commit b165de1f77d4c726489b9eaac665df4c81b25962
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 23 01:54:22 2015 +0200

    Fix color of unmodified build commands on GTK3
    
    Also, as changing the color of the label button doesn't currently work
    on GTK2, but would on GTK3 with this change, explicitly skip it for
    consistency.
    
    Closes #528.

 src/build.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

commit 09cd9b4d30fc92ccc0d966ee314f424a34fa3171
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 23 00:04:19 2015 +0200

    Small update of the French translation

 po/fr.po | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

commit 15f012c2bf32f9b700c0e7eb9ef7f1def6229fa3
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 22 23:14:02 2015 +0200

    Update of Portuguese translation

 po/pt.po | 76 ++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 40 insertions(+), 36 deletions(-)

commit e274dba084378aeb9ee87ff137b1a984da6097a7
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 22 21:56:02 2015 +0200

    Update of German translation

 po/de.po | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit a26bd58639123d91b703e3b27269705184cf6437
Merge: 094a71c 3c38434
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 22 19:13:20 2015 +0200

    Merge pull request #526 from b4n/po/fr
    
    French translation update

commit 094a71c2cbc3f60a0ede5d37fbf2cb8901433a0c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 22 19:12:14 2015 +0200

    Update of Spanish translation

 po/es.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0cc3bf31c2b83d53d48b9e3feda90715833e84ed
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 22 15:46:11 2015 +0200

    Move comment meant for translators so xgettext can pick them
    
    Apparently xgettext only recognize comments that are straight above the
    translation, so move them where it can find them.

 src/spawn.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 3c38434d51e270940f4a20ffa15c0fd2763af398
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 22 15:40:55 2015 +0200

    French translation update

 po/fr.po | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

commit d37588241a6664ac2ad57b557daa9b56b28b47c9
Merge: 5e91765 5bb2106
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 22 10:35:31 2015 +0200

    Merge pull request #525 from scriptum/russian-translation
    
    Update of Russian translation

commit 5bb21066abd274981c0e7b235825a790e25bbc34
Author: Pavel Roschin <rpg@scriptumplus.ru>
Date:   Mon Jun 22 11:00:00 2015 +0300

    Update of Russian translation

 po/ru.po | 56 ++++++++++++++++++++++++++------------------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

commit 5e9176512dca0a22f00debc6ae8854ee27419cad
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Jun 21 15:17:46 2015 +0200

    Update of Spanish translation

 po/es.po | 114 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

commit 5ebed27d4bc691908825a4af06605215cee6206e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 21 14:23:44 2015 +0200

    Fix incorrect variadic argument type fetch (oops)

 src/symbols.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 37794432ccf22acd24dbc3b29000ad06ad904afc
Author: Matthew Brush <matt@geany.org>
Date:   Sat Jun 20 20:25:08 2015 -0700

    Add G_BEGIN_DECLS and G_END_DECLS to spawn.h

 src/spawn.h | 4 ++++
 1 file changed, 4 insertions(+)

commit f7a036aab8f022195ba017895a4b77283a6da65c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 20 19:03:31 2015 +0200

    VTE: Switch directory on startup when following current document's path

 src/vte.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 5c2ac4c856061d7f4c383d6073e4fa78894db670
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Jun 20 18:17:26 2015 +0200

    Initial update of po files for string freeze of Geany 1.25

 po/ar.po    | 3291 +++++++++++++++++++++++---------------------
 po/ast.po   | 3340 ++++++++++++++++++++++----------------------
 po/be.po    | 3320 ++++++++++++++++++++++----------------------
 po/bg.po    | 3345 ++++++++++++++++++++++----------------------
 po/ca.po    | 3336 ++++++++++++++++++++++----------------------
 po/cs.po    | 3332 ++++++++++++++++++++++----------------------
 po/de.po    |  445 +++---
 po/el.po    | 1858 +++++++++++++------------
 po/en_GB.po | 3327 ++++++++++++++++++++++----------------------
 po/es.po    | 3345 ++++++++++++++++++++++----------------------
 po/et.po    | 3292 +++++++++++++++++++++++---------------------
 po/eu.po    | 3292 +++++++++++++++++++++++---------------------
 po/fa.po    | 3325 ++++++++++++++++++++++----------------------
 po/fi.po    | 3333 ++++++++++++++++++++++----------------------
 po/fr.po    | 1990 +++++++++++++--------------
 po/gl.po    | 4397 +++++++++++++++++++++++++++++++---------------------------
 po/he.po    | 3322 +++++++++++++++++++++++---------------------
 po/hi.po    | 3171 +++++++++++++++++++++---------------------
 po/hu.po    | 4423 +++++++++++++++++++++++++++++++----------------------------
 po/id.po    | 4290 +++++++++++++++++++++++++++++++++------------------------
 po/it.po    | 1960 +++++++++++++-------------
 po/ja.po    | 1681 ++++++++++++-----------
 po/kk.po    | 3310 +++++++++++++++++++++++---------------------
 po/ko.po    | 3319 ++++++++++++++++++++++----------------------
 po/lb.po    | 3341 ++++++++++++++++++++++----------------------
 po/lt.po    | 3335 ++++++++++++++++++++++----------------------
 po/mn.po    | 3326 ++++++++++++++++++++++----------------------
 po/nl.po    | 1690 ++++++++++++-----------
 po/nn.po    | 3251 ++++++++++++++++++++++---------------------
 po/pl.po    | 1762 ++++++++++++------------
 po/pt.po    | 1646 +++++++++++-----------
 po/pt_BR.po |  507 +++----
 po/ro.po    | 3337 ++++++++++++++++++++++----------------------
 po/ru.po    | 1767 ++++++++++++------------
 po/sk.po    | 3331 ++++++++++++++++++++++----------------------
 po/sl.po    | 3345 ++++++++++++++++++++++----------------------
 po/sr.po    |  869 ++++++------
 po/sv.po    | 3331 ++++++++++++++++++++++----------------------
 po/tr.po    | 3326 ++++++++++++++++++++++----------------------
 po/uk.po    | 3333 ++++++++++++++++++++++----------------------
 po/vi.po    | 3337 ++++++++++++++++++++++----------------------
 po/zh_CN.po | 3321 +++++++++++++++++++++++---------------------
 po/zh_TW.po | 3320 ++++++++++++++++++++++----------------------
 43 files changed, 65128 insertions(+), 60391 deletions(-)

commit 3a8ef62794731c3c0541296e4dba5c832bd08494
Author: Matthew Brush <matt@geany.org>
Date:   Fri Jun 19 17:12:53 2015 -0700

    Fix GLib version number missed in last bump (oops)

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b1f20037b8cfc7d63ff852be1d654d3f806714f
Merge: f427a3a 3ad1627
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Thu Jun 18 23:11:32 2015 +0200

    Merge pull request #291 from bittner/master
    
    Autodetect .bashrc, .bash_aliases, and the like

commit f427a3a6e19fe8c7190b0f8a1c269f3e739fbfb3
Merge: f715f8a 358758c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 18 16:49:37 2015 +0200

    Merge pull request #455 from techee/filebrowser_icons
    
    Show icons corresponding to MIME types in the file browser plugin

commit f715f8a35c79e7f5c1ef70b276d7b1bbc51d0bc2
Merge: 67b464a 5a8e89c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 18 16:22:25 2015 +0200

    Merge pull request #425 from b4n/remove-some-unused-sciwrappers
    
    Remove a few unused Scintilla wrappers functions

commit 891997a5bf55f50d2ded04dbbd9b09f517d26b84
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Jun 18 10:28:02 2015 +0200

    Add -O2 -g flags also for C++ files when building with waf

 wscript | 4 ++++
 1 file changed, 4 insertions(+)

commit 67b464a586f62d2e4294f9325ac72d977ad34828
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 2 14:45:22 2015 +0200

    GTK: Fix runtime completion popup warning
    
    GtkScrolledWindow in GTK 3.16 might have a minimum and natural height
    of 0 if GTK_OVERLAY_SCROLLING is enabled (which is the default), so we
    need to fix our overridden minimal height to never be greater than the
    natural height.
    
    Do that by only changing the minimal height if it is greater than what
    we want.
    
    I don't know why we didn't use to set 0 here, but it might be that a
    height of 0 caused problems on older GTK versions, so keep 1 to be sure.
    
    X-Scintilla-Commit-ID: e9f9c964236a6b740f75d09a8b0ac76e5d6dd09f

 scintilla/gtk/PlatGTK.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3ad162724981b65937edbb4a9776b77a11063574
Author: Peter Bittner <django@bittner.it>
Date:   Thu Jun 19 16:24:07 2014 +0200

    Autodetect .bashrc, .bash_aliases, and the like
    
    Autodetect /etc/bash_completion (and the like)
    
    Splitted up autodetection patterns for Bash
    
    This will match:
    
    - `*.bash` (any manufactured Bash scripts)
    - `~/.bashrc` (hidden Bash configuration in your home directory)
    - `~/.bash_*` (partials included by bashrc, e.g. `.bash_aliases`,  `.bash_history`,  `.bash_logout`)
    - `/etc/bash.bashrc` (global Bash configuration)
    - `/etc/bash_completion` (and potentially any other `/etc/bash_*` file)

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 358758c9f8feddac6c3a06005f309b53506c99d5
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Jun 16 15:43:45 2015 +0200

    Show icons corresponding to MIME types in the file browser plugin

 plugins/filebrowser.c | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

commit f86b39c7cb5242cd0753ef31e3d30f1026a07de0
Merge: 1306bc5 ecc4e02
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 15 21:39:22 2015 +0200

    Merge pull request #491 from techee/ft_config
    
    Add filetype configuration menu entries

commit ecc4e0285af770865edb96a293913c80c0b1fd66
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Jun 15 17:14:00 2015 +0200

    Add filetype configuration menu entries
    
    This adds a "Filetype Configuration" under Tools->Configuration Files
    with all filetype configuration files (grouped by language type).
    
    This patch mostly reuses the stuff we already have in Geany - the menu
    creation code from Document->Set Filetype, file creation in the .config
    directory if it doesn't exist (similarly to filetypes.common) and config
    file reloading when the file gets updated.

 src/filetypes.c | 82 +++++++++++++++++++++++++++++++++++++++------------------
 src/ui_utils.c  | 15 ++++++++++-
 src/ui_utils.h  |  3 +--
 3 files changed, 72 insertions(+), 28 deletions(-)

commit 1306bc52d8e081ce0dee45d3610ebe1f83c10621
Merge: 6f60de3 8eaaf72
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 15 15:39:24 2015 +0200

    Merge pull request #506 from techee/msgwin_resize
    
    Don't resize message window when changing Geany's window height

commit 6f60de3656b48b954da5d2b3dd1dc46c96844025
Merge: 48ea3e6 e26c9ba
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 15 14:56:07 2015 +0200

    Merge pull request #514 from techee/linear_tag_remove
    
    Add linear tag remove path for cases where not many files are open

commit 48ea3e6f85d2d86353a552c6542b8f3684703cb1
Merge: 733b10e cdd07e1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 15 14:29:12 2015 +0200

    Merge pull request #515 from b4n/symbol-icons-fixes
    
    Fix unreffing NULL icons when generating tags

commit 733b10efc4f3d757726376e453e880d6409db62d
Merge: 195d2e3 882687e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 15 00:10:09 2015 +0200

    Merge branch 'universal-ctags-fixes'
    
    Import some various parser fixes from Universal CTags.

commit cdd07e15f5f4ad48b2aff3979b620916cfd78446
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 14 23:43:17 2015 +0200

    Fix unreffing NULL icons when generating tags

 src/symbols.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 195d2e3a77f6922b7575c52c5abb11b44667bb6d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 14 23:17:27 2015 +0200

    Don't try and query the theme when we don't have a screen
    
    This happens when generating tags.

 src/ui_utils.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 23eff5cadfd6a824d745fd4cffd0749d41ff44fc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 14 20:19:55 2015 +0200

    Over-engineer symbol tree icon cache a little
    
    This will get useful to fix problems when generating tags.

 src/symbols.c | 418 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 217 insertions(+), 201 deletions(-)

commit 882687ec37d41bcd74e07ab13ead45ce2141ecad
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 18 18:39:32 2015 +0200

    C#: Don't ignore the character following an '@'
    
    The character following an '@' was dropped if it didn't start a string
    literal.
    
    This could lead to unexpected problems if '@' was valid in other
    situations.
    
    X-Universal-CTags-Commit-ID: 2e62f475af1db08850447de46f56db14ce99d2eb

 tagmanager/ctags/get.c | 2 ++
 1 file changed, 2 insertions(+)

commit dbbc042786e7d78e16a7b63dc2fd58cae0fab8f1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 18 18:38:09 2015 +0200

    c family: Add support for digraphs
    
    See http://www.open-std.org/jtc1/sc22/WG14/www/docs/n1256.pdf 6.4.6§3.
    
    Note: This is not exactly the upstream Universal CTags commit because
    it depends on another change for adding the `enter` label, which was
    then included here.
    
    X-Universal-CTags-Commit-ID: 3b3b60c7664a321a31ec87de336fc6bda90c405e

 tagmanager/ctags/get.c        | 37 +++++++++++++++++++++++++++++++++++++
 tests/ctags/Makefile.am       |  1 +
 tests/ctags/c-digraphs.c      | 35 +++++++++++++++++++++++++++++++++++
 tests/ctags/c-digraphs.c.tags | 12 ++++++++++++
 4 files changed, 85 insertions(+)

commit b737f031cab65e345cb29504c2b39f1924900781
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 18 14:51:44 2015 +0200

    c family: Fix trigraph handling
    
    X-Universal-CTags-Commit-ID: d6d1a0f2b90a600bdec9cd6ba964ee69382743e4

 tagmanager/ctags/get.c         |  4 +--
 tests/ctags/Makefile.am        |  1 +
 tests/ctags/c-trigraphs.c      | 56 ++++++++++++++++++++++++++++++++++++++++++
 tests/ctags/c-trigraphs.c.tags | 15 +++++++++++
 4 files changed, 73 insertions(+), 3 deletions(-)

commit b975c2652da201c9e84f4b817c18408814364f36
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 18 14:43:10 2015 +0200

    read: Allow to unget up to 3 characters
    
    Some parsers need to unget more than one characters, so add support for
    this.
    
    X-Universal-CTags-Commit-ID: 956af0555d3a8ef33304c5ae6ed873f22b4e4284

 tagmanager/ctags/read.c | 12 ++++++++----
 tagmanager/ctags/read.h |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

commit e26c9ba2ced88d5bcf1804e228918b63cae76b20
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Jun 14 17:52:24 2015 +0200

    Add linear tag remove path for cases where not many files are open
    
    When tested with 200000 LOC python file (created by making many copies
    of scripts/create_py_tags.py), the tm_tags_remove_file_tags() function
    takes about 50% of the CPU time when only this file is open. After adding
    the linear path to tm_tags_remove_file_tags() it takes just about 2%. See
    the comment in the patch for more details.

 tagmanager/src/tm_tag.c | 74 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 24 deletions(-)

commit 944bffb9673660b4d0b37fee2037541b148f0627
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 9 15:06:12 2015 +0200

    json: Fix handling of tags containing a dot
    
    X-Universal-CTags-Commit-ID: 7ae28a3d8a7ad5f8a9d6399a4e357fcf19ad2b2e

 tagmanager/ctags/json.c            | 10 +---------
 tests/ctags/Makefile.am            |  1 +
 tests/ctags/dotted-names.json      | 25 +++++++++++++++++++++++++
 tests/ctags/dotted-names.json.tags | 20 ++++++++++++++++++++
 4 files changed, 47 insertions(+), 9 deletions(-)

commit f30b72d91e266236af145f84b8fc01444c66c813
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 9 19:09:55 2015 +0200

    vstring: Add vStringTruncate()
    
    Add API to truncate a vString to a certain length. This doesn't support
    growing the string, only shrinking it.
    
    X-Universal-CTags-Commit-ID: 4e3d9edf2e7a8a476ff97bc678e71c3919b960f9

 tagmanager/ctags/vstring.c | 13 ++++++++++---
 tagmanager/ctags/vstring.h |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

commit d75598cc4895c0dc68dbd00a5ed819943a31242f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jun 10 15:01:24 2015 +0200

    python: Fix resetting scope on anonymous blocks
    
    The previous fix, coming from [CTags bug #1988026], was incorrect if
    the parent was not a root-level element, as it checked the level name
    (unqualified) against the parent name (qualified).
    
    However, there is no need to check the level name, all what counts is
    the indentation level itself: if it's smaller than an existing level,
    it ends it.
    
    This fixes [CTags bug #356].
    
    [CTags bug #1988026]: https://sourceforge.net/p/ctags/bugs/227/
    [CTags bug #356]: https://sourceforge.net/p/ctags/bugs/356/
    
    X-Universal-CTags-Commit-ID: ab91e6e1ae84b80870a1e8712fc7f3133e4b5542

 tagmanager/ctags/python.c                              | 18 ++++++------------
 tests/ctags/Makefile.am                                |  1 +
 .../ctags/python-anonymous-nestlevel_ctags-bug-356.py  |  6 ++++++
 .../python-anonymous-nestlevel_ctags-bug-356.py.tags   |  4 ++++
 4 files changed, 17 insertions(+), 12 deletions(-)

commit 935c389f285e52fb690dc6d743c90ad3f26d0b49
Merge: 7006bdf 6792bf0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jun 12 19:06:41 2015 +0200

    Merge pull request #509 from techee/child_icon + followup
    
    Cache symbol tree icons

commit 6792bf0db761332742c133b93419d10a18fb9316
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jun 12 18:54:34 2015 +0200

    Simplify some code a little

 src/symbols.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

commit 9458d5cfe62b9164512b62a7ced32d25404d64da
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jun 12 18:48:29 2015 +0200

    Release symbols icons when quitting

 src/symbols.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 7006bdfd8ca696f7f53328cc7f0414fefe9ca94a
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Jun 10 23:46:23 2015 +0200

    Sync the fold_changed() implementation with SciTE
    
    SciTE added the SCI_GETALLLINESVISIBLE check in revision
    8dc4127cc8d76ecdf988928ac34e79955c09bda4:
    
    "Minimize cost of processing fold level changes to ensure visibility for
    the common case where the whole document is already visible."
    
    When nothing is folded, this improves the performance considerably which
    is visible e.g. when pasting larger amounts of text.
    
    Closes #507.

 src/editor.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 62e6de9f10cd6143478c1f8f8b1004d50f502e65
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Jun 11 12:42:28 2015 +0200

    Cache symbol tree icons
    
    When profiling Geany I/O activity, there are lots of I/O operations happening
    when just typing in the editor caused by the updates of the symbol tree
    and loading the icon files.
    
    In addition, in the case of tag_other the leaves of the tree use
    classviewer-var instead of the parent icon (e.g. with enums). In this case
    the icon is loaded from the disk every time it's requested which takes
    about 70% of the tree creation time when the tree consists only of such
    nodes.
    
    To fix these problems load the icons once and return the loaded icons when
    requested instead of reloading them from the disk all the time.

 src/symbols.c | 300 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 157 insertions(+), 143 deletions(-)

commit ccec1fe29acc88c72b8324d74d2e63c1b0bc8466
Merge: e38b803 65c34bd
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Jun 5 18:45:56 2015 +0200

    Merge pull request #414 from eht16/plugin_manager_usability
    
    Plugin manager usability improvements

commit 65c34bd37e8d0102696a0ccbd8eeec04da34c862
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Feb 22 18:58:34 2015 +0100

    Improved search for the plugin manager
    
    Search in name, description, author fields and show all results
    which contain all the words from the search query.
    Search plugins also by filename

 src/plugins.c | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

commit e38b803ccde65f40fc25b1c21edde82bf67cdaf8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jun 3 14:45:29 2015 +0200

    stash: Fix invalid free in sync from object property

 src/stash.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 94389788da4c332776c4d37ab024257bd4f0146a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jun 3 14:43:39 2015 +0200

    stash: Fix sync to object property

 src/stash.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

commit 8eaaf723b8c1fff2c752d7ae31d19e42ef023018
Author: Jiří Techet <techet@gmail.com>
Date:   Thu May 28 21:21:54 2015 +0200

    Don't resize message window when changing Geany's window height
    
    At the moment the message window is set to resize when the height of the
    main window changes. This is a bit annoying when the message window size
    is set to fit all the tabs exactly and when shrinking the window, the
    tabs don't fit the shrinked message window.
    
    Set the flag not to resize the notebook_info notebook (similar thing is
    already done with the sidebar in the horizontal direction so no change
    needed there).
    
    Works fine also when the message window is set to be on the right side.

 data/geany.glade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3c9e5459748a9f46fbdcee7811e51ae75c17fd36
Merge: f1c98e5 97a431f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 28 17:55:46 2015 +0200

    Merge pull request #501 from b4n/wordchars-default
    
    Respect filetype.common's wordchars if a filetype doesn't have its own

commit 97a431faf2c146cc79534fb23ab9032d7f435974
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 28 17:55:21 2015 +0200

    Update the documentation on wordchars

 doc/geany.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit f1c98e5423bab3b159f1a6e9a7b37673752eeb30
Merge: b5702f0 dde13c7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 28 16:50:01 2015 +0200

    Merge pull request #481 from techee/go
    
    Go ctags parser, Scintilla lexer and Geany support improvements
    
    Closes #238.

commit dde13c7a1627fa3e614e4a3900bad8c0f2b43ca4
Author: Jiří Techet <techet@gmail.com>
Date:   Wed May 20 15:28:28 2015 +0200

    Syntax-highlight go types

 src/document.c | 1 +
 1 file changed, 1 insertion(+)

commit 4665034cb274a2e42d59e4a897f3104a7929fdb6
Author: Jiří Techet <techet@gmail.com>
Date:   Tue May 19 11:24:27 2015 +0200

    Update go keywords
    
    error was missing in secondary keywords (also sorted alphabetically now)
    
    Add true false iota nil into primary keywords which, while not strictly
    speaking keywords (they are predeclared identifiers), are nice to have
    highlighted.

 data/filetypes.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a6e7893c10dd9524aceca23b0a49822b49c57ca6
Author: Jiří Techet <techet@gmail.com>
Date:   Thu May 28 16:18:26 2015 +0200

    Enable backquoted strings for go in cpp lexer
    
    In addition, disable (or make less visible) syntax highlighting not related
    to go.

 data/filetypes.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 95368425f4058112a021590b9f8fb52f9e51fb48
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Apr 30 23:27:32 2015 +0200

    Use pascal-like function prototypes for go in symbol tree

 src/editor.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 206379a272ebce073910a49dbcb15b21909b3d3a
Author: Jiří Techet <techet@gmail.com>
Date:   Thu May 28 16:27:23 2015 +0200

    Parse return value of go functions
    
    Unfortunately varType is Geany-only so this patch cannot be ported to ctags.
    
    The removal of the extra { read is not the most elegant thing but making
    skipType() aware of the argList collection complicates things too much.

 tagmanager/ctags/go.c            | 43 ++++++++++++++++++++++++++--------------
 tests/ctags/Makefile.am          |  1 +
 tests/ctags/return-types.go      | 16 +++++++++++++++
 tests/ctags/return-types.go.tags |  6 ++++++
 tests/ctags/test.go.tags         | 12 +++++------
 5 files changed, 57 insertions(+), 21 deletions(-)

commit e973841ceca799c3301830f792df0c39d9bab1b2
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Mar 16 22:45:27 2015 +0100

    Show go interfaces, structs and struct members in symbol tree

 src/symbols.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit e433490672da19a19554bc7f40aa6e90c67fb08b
Author: Jiří Techet <techet@gmail.com>
Date:   Wed May 27 16:15:01 2015 +0200

    Sync go parser with fishman-ctags
    
    New features include:
    * struct/interface detection
    * struct member parsing
    * function prototype parsing

 tagmanager/ctags/go.c    | 249 ++++++++++++++++++++++++++++++++++++++---------
 tests/ctags/test.go      |   9 +-
 tests/ctags/test.go.tags |  21 ++--
 3 files changed, 220 insertions(+), 59 deletions(-)

commit b5702f03dc04d774a165ff9e023ade0af38fec1e
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed May 27 21:59:27 2015 +0200

    Update of German translation

 po/de.po | 49 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 12 deletions(-)

commit e12fa5d270a6f8a7093977b0df77482bb46a18a7
Merge: de8470d 942d4c6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 26 22:49:58 2015 +0200

    Merge pull request #456 from techee/osx_vte_improvements
    
    Osx vte improvements

commit de8470dc5661474739ebe8f6ef8100ac6377723a
Merge: 4b9f816 09ee496
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 26 22:37:34 2015 +0200

    Merge pull request #499 from techee/vte_prompt
    
    VTE prompt fixes

commit 4b9f816a0388f90c4d1a56e6f9a2bb52abb2d37a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 26 13:25:04 2015 +0200

    Update NEWS
    
    Note that although the last Scintilla update was a pre-release update,
    the final 3.5.6 release has no changes.

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b98d55defc918c951660f05e9ebdd30e9bfb184
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun May 24 18:44:02 2015 +0200

    Update Scintilla to 3.5.6 pre-release
    
    Fixes broken auto-completion popup on Windows.

 scintilla/gtk/PlatGTK.cxx       | 18 +++++++++++++++++-
 scintilla/gtk/ScintillaGTK.cxx  |  2 +-
 scintilla/lexers/LexCPP.cxx     |  6 ++----
 scintilla/lexers/LexFortran.cxx |  1 +
 scintilla/lexers/LexVHDL.cxx    |  7 ++++---
 scintilla/lexers/LexVerilog.cxx |  4 +++-
 scintilla/src/Document.cxx      |  2 ++
 scintilla/src/EditModel.h       |  2 +-
 scintilla/src/Editor.h          |  2 +-
 scintilla/src/ScintillaBase.h   |  2 +-
 scintilla/version.txt           |  2 +-
 11 files changed, 34 insertions(+), 14 deletions(-)

commit 19da68e1d02f99dae1a193c0e29eb5b9bf916909
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat May 23 12:25:50 2015 +0200

    Fix a small typo in NEWS

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3748895e32211de1ee71de02c52821dbae17ef75
Merge: 3e42c9b c153333
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun May 24 10:58:21 2015 +0200

    Merge pull request #504 from philippwiesemann/update-links
    
    Update some links

commit c1533332a79ead73c6d55021d82c705dc4972c9b
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Fri May 22 23:14:47 2015 +0200

    Update link in translation file
    
    The old link was an empty page.

 po/de.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8ffe0467b782802eea14974ffb68a5cd2dd1a6cf
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Fri May 22 23:11:25 2015 +0200

    Update link in development documentation
    
    The old link was a 404 page.

 HACKING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 62157ebbdf86127f51847f9c43c6f3bbf98fe20f
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Fri May 22 23:06:18 2015 +0200

    Update link in development documentation
    
    The project moved from Google to GitHub.

 HACKING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3e42c9b05b40498a9abf6d6ef0e81226c8f79f4d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 21 22:39:55 2015 +0200

    Initial NEWS update to prepare for 1.25

 NEWS | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)

commit 02ca046991d4679c59a5a8025a730b227e3e4c63
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue May 19 17:42:34 2015 +0200

    Add src/spawn.c to translatable files to fix 'make check'

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 40b9a2ba0d2e75196682451e78dbc1dc10333994
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 19 14:25:40 2015 +0200

    Respect filetype.common's wordchars if a filetype doesn't have its own
    
    Use filetype.common's wordchars instead of GEANY_WORDCHARS as default
    for filetypes not having their own.  This allows to change the
    wordchars for all filetypes at once.
    
    Part of issue #492.

 data/filetypes.common |  1 +
 src/highlighting.c    | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

commit 93950a6a7b7b62fe285334914f0b371d5c09fb67
Merge: b5eabc5 9be6ce8
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue May 19 13:44:02 2015 +0200

    Merge pull request #500 from fbobraga/master
    
    Fix header of translation file

commit 9be6ce81e48b2aa035e30f3e1a30320096bda1e9
Author: Felipe Braga <fbobraga@gmail.com>
Date:   Tue May 19 07:57:51 2015 -0300

    Fixed heade

 po/pt_BR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 09ee4965f7ad56fe03dbd3b87f3d28842b447f0c
Author: Jiří Techet <techet@gmail.com>
Date:   Tue May 19 11:55:40 2015 +0200

    Add TERM_PROGRAM to excluded environment variables for VTE
    
    On OS X /etc/bashrc does some Apple-terminal-specific thing:
    
    # Tell the terminal about the working directory at each prompt.
    if [ "$TERM_PROGRAM" == "Apple_Terminal" ] && [ -z "$INSIDE_EMACS" ]; then
        update_terminal_cwd() {
            # Identify the directory using a "file:" scheme URL,
            # including the host name to disambiguate local vs.
            # remote connections. Percent-escape spaces.
            local SEARCH=' '
            local REPLACE='%20'
            local PWD_URL="file://$HOSTNAME${PWD//$SEARCH/$REPLACE}"
            printf '\e]7;%s\a' "$PWD_URL"
        }
        PROMPT_COMMAND="update_terminal_cwd; $PROMPT_COMMAND"
    fi
    
    
    This however doesn't work in VTE when Geany is started from the Terminal
    application so we get some strange prefix for the prompt. Unset the
    TERM_PROGRAM variable so it isn't set to Apple_Terminal when running
    inside VTE.

 src/vte.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b5eabc5986d415614079c847bbf5b456f552fb79
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon May 18 07:58:07 2015 +0200

    Small Update of German translation

 po/de.po | 408 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 199 insertions(+), 209 deletions(-)

commit 9c2d51f92012b74ce75c967d9940c97fd71c5fa0
Merge: 826f651 2693a7b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon May 18 09:14:37 2015 +0200

    Merge pull request #498 from fbobraga/master
    
    Updated pt_BR translation

commit 2693a7b6484c3c9f96d9a3c43683293bfa479e97
Author: Felipe Braga <fbobraga@gmail.com>
Date:   Sun May 17 18:44:32 2015 -0300

    Updated pt_BR translation

 po/pt_BR.po | 1943 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 957 insertions(+), 986 deletions(-)

commit bd4956b555dfccb7546796866261d7946450536d
Author: Jiří Techet <techet@gmail.com>
Date:   Sun May 17 18:22:32 2015 +0200

    Fix corrupted initial prompt
    
    The initial prompt may get corrupted so it looks something like
    
    any/src $ het-vm ~/projects/gea
    
    instead of
    
    techet@techet-vm ~/projects/geany/src $
    
    This is just the initial display problem - when enter is pressed, the
    second line already shows correct prompt.
    
    It appears that VTE isn't fully initialized when starting the shell process
    and when the shell start is delayed a bit (performed on idle), the prompt
    looks correct.

 src/vte.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit 826f6516d36ec7a7bed35116fda32d42449c1e5d
Merge: cdb7521 df39fc7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri May 15 18:54:23 2015 +0200

    Merge pull request #441 from zhekov/spawn
    
    Add a spawn module for Geany
    
    Thanks a lot for Dimitar's hard work, commitment and endless patience!
    
    Closes #274, #441, and https://sourceforge.net/p/geany/bugs/943/
    Should also fix https://sourceforge.net/p/geany/bugs/898/

commit cdb7521b9bb52697a4169811893eaae84290da2b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu May 14 20:34:48 2015 +0200

    Update of German translation

 po/de.po | 1380 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 697 insertions(+), 683 deletions(-)

commit 48977780c6ab7216cdcb17c79cbd689383f5bd8c
Merge: ece9fb3 d665c23
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon May 11 16:48:04 2015 +0200

    Merge pull request #490 from philippwiesemann/fix-typos-messages
    
    Fix typos in messages

commit d665c23a03b58004f35a305c0d2898e8e1e9cbb4
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Sun May 10 21:36:39 2015 +0200

    Fix typo in message
    
    It was already fixed in source.

 po/ar.po    | 2 +-
 po/ast.po   | 2 +-
 po/be.po    | 2 +-
 po/bg.po    | 2 +-
 po/ca.po    | 2 +-
 po/cs.po    | 2 +-
 po/el.po    | 2 +-
 po/en_GB.po | 4 ++--
 po/es.po    | 2 +-
 po/et.po    | 2 +-
 po/eu.po    | 2 +-
 po/fa.po    | 4 ++--
 po/fi.po    | 2 +-
 po/gl.po    | 2 +-
 po/he.po    | 2 +-
 po/hi.po    | 2 +-
 po/hu.po    | 2 +-
 po/id.po    | 2 +-
 po/it.po    | 2 +-
 po/kk.po    | 2 +-
 po/ko.po    | 2 +-
 po/lb.po    | 2 +-
 po/lt.po    | 2 +-
 po/mn.po    | 2 +-
 po/nn.po    | 2 +-
 po/ro.po    | 2 +-
 po/sk.po    | 2 +-
 po/sl.po    | 2 +-
 po/sv.po    | 2 +-
 po/tr.po    | 2 +-
 po/uk.po    | 2 +-
 po/vi.po    | 2 +-
 po/zh_CN.po | 2 +-
 po/zh_TW.po | 2 +-
 34 files changed, 36 insertions(+), 36 deletions(-)

commit 999e17a5fb41f81c5247e81ccfe2968ce4fc3347
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Sun May 10 21:30:06 2015 +0200

    Fix typo in messages

 data/geany.glade |  6 +++---
 po/ar.po         |  6 +++---
 po/ast.po        |  6 +++---
 po/be.po         |  6 +++---
 po/bg.po         |  6 +++---
 po/ca.po         |  6 +++---
 po/cs.po         |  6 +++---
 po/de.po         |  6 +++---
 po/el.po         |  6 +++---
 po/en_GB.po      | 12 ++++++------
 po/es.po         |  6 +++---
 po/et.po         |  6 +++---
 po/eu.po         |  6 +++---
 po/fa.po         | 12 ++++++------
 po/fi.po         |  6 +++---
 po/fr.po         |  6 +++---
 po/gl.po         |  6 +++---
 po/he.po         |  6 +++---
 po/hi.po         |  6 +++---
 po/hu.po         |  6 +++---
 po/id.po         |  6 +++---
 po/it.po         |  6 +++---
 po/ja.po         |  6 +++---
 po/kk.po         |  6 +++---
 po/ko.po         |  6 +++---
 po/lb.po         |  6 +++---
 po/lt.po         |  6 +++---
 po/mn.po         |  6 +++---
 po/nl.po         |  6 +++---
 po/nn.po         |  6 +++---
 po/pl.po         |  6 +++---
 po/pt.po         |  6 +++---
 po/pt_BR.po      |  6 +++---
 po/ro.po         |  6 +++---
 po/ru.po         |  6 +++---
 po/sk.po         |  6 +++---
 po/sl.po         |  6 +++---
 po/sr.po         |  6 +++---
 po/sv.po         |  6 +++---
 po/tr.po         |  6 +++---
 po/uk.po         |  6 +++---
 po/vi.po         |  6 +++---
 po/zh_CN.po      |  6 +++---
 po/zh_TW.po      |  6 +++---
 44 files changed, 138 insertions(+), 138 deletions(-)

commit 32ee98da17f1118868b691d69526de5a8a4ae498
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Sun May 10 21:20:55 2015 +0200

    Fix typo in message

 po/ar.po      | 2 +-
 po/ast.po     | 2 +-
 po/be.po      | 2 +-
 po/bg.po      | 2 +-
 po/ca.po      | 2 +-
 po/cs.po      | 2 +-
 po/de.po      | 2 +-
 po/el.po      | 2 +-
 po/en_GB.po   | 2 +-
 po/es.po      | 2 +-
 po/et.po      | 2 +-
 po/eu.po      | 2 +-
 po/fa.po      | 2 +-
 po/fi.po      | 2 +-
 po/fr.po      | 2 +-
 po/gl.po      | 2 +-
 po/he.po      | 4 ++--
 po/hi.po      | 2 +-
 po/hu.po      | 2 +-
 po/id.po      | 2 +-
 po/it.po      | 2 +-
 po/ja.po      | 2 +-
 po/kk.po      | 2 +-
 po/ko.po      | 2 +-
 po/lb.po      | 2 +-
 po/lt.po      | 2 +-
 po/mn.po      | 2 +-
 po/nl.po      | 2 +-
 po/nn.po      | 2 +-
 po/pl.po      | 2 +-
 po/pt.po      | 2 +-
 po/pt_BR.po   | 2 +-
 po/ro.po      | 2 +-
 po/ru.po      | 2 +-
 po/sk.po      | 2 +-
 po/sl.po      | 2 +-
 po/sr.po      | 2 +-
 po/sv.po      | 2 +-
 po/tr.po      | 2 +-
 po/uk.po      | 2 +-
 po/vi.po      | 2 +-
 po/zh_CN.po   | 2 +-
 po/zh_TW.po   | 2 +-
 src/libmain.c | 2 +-
 44 files changed, 45 insertions(+), 45 deletions(-)

commit ece9fb37c75acc210c3edd6aaacdef51f9ccb063
Merge: 5cfc3f2 2d5428b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun May 10 06:56:18 2015 +0200

    Merge pull request #489 from philippwiesemann/fix-wrong-po-de
    
    Fix wrong German translations

commit 2d5428b09ebf4a36eaa56c187a5a8c8236c27085
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Sat May 9 23:19:05 2015 +0200

    Add three exclamation marks in German translation

 po/de.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 19883aeb8a2f9b0568e65a536d3fad842c7163e1
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Sat May 9 23:15:59 2015 +0200

    Add three hyphens in German translation
    
    The translation for "document" already had one.

 po/de.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ab43cd9839ee2f3eac6b4a2fa56a2edb0c5d1e11
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Sat May 9 23:10:41 2015 +0200

    Fix wrong German translation
    
    The translation did not distinguish between "source file" and "file"
    although it makes sense (e.g. for diff files which are not source).

 po/de.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7db70998bf82d9780854072b91edf2a83d52475b
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Sat May 9 23:07:26 2015 +0200

    Fix two wrong German translations

 po/de.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5cfc3f20f6525b1c7c8071808fbfdecd2f562189
Merge: 3973362 81fb120
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 6 19:03:18 2015 +0200

    Merge pull request #487 from techee/goto_tag_fix
    
    Fix language check in tm_workspace_find()

commit 3973362c1bb844754c7e05e6da5b3c4c278eef13
Merge: dbcbd57 1903b0a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 6 18:51:43 2015 +0200

    Merge pull request #486 from techee/fix_empty_symbol_tree
    
    Fix empty symbol tree under some conditions

commit 1903b0a9b9991733dd48f8cd55446200c647efbd
Author: Jiří Techet <techet@gmail.com>
Date:   Tue May 5 23:37:51 2015 +0200

    Add a flag indicating the tag tree needs updating
    
    When the Symbols tab isn't shown, symbol tree isn't updated. However,
    we should record the cases when update should have been performed
    and once the symbols tab is shown, perform update if something changed.
    
    Thanks to this patch we also don't have to always perform symbol tree
    update when switching to the Symbols tab but only when something has
    actually changed.

 src/documentprivate.h | 2 ++
 src/sidebar.c         | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

commit 81fb120f508be4b8f472a818b708039c3942b642
Author: Jiří Techet <techet@gmail.com>
Date:   Wed May 6 18:37:46 2015 +0200

    Fix language check in tm_workspace_find()
    
    The tags_lang variable is set from the first tag in the found array but
    the array may actually contain tags from several languages. This may
    lead to two things:
    
    1. Goto tag definition goes to a tag from a different filetype
    2. Worse, the first tag is from a different language than the current file
    and we get a message that no tag was found
    
    Get lang for every tag in the array and rename tags_lang to tag_lang.

 tagmanager/src/tm_workspace.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

commit dbcbd57ee638d410de73032cad29c9a4c9de9a99
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue May 5 19:55:15 2015 +0200

    Update of Serbian translation

 po/sr.po | 4736 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 2439 insertions(+), 2297 deletions(-)

commit 80d7aa213c0eb8d353032882616957f155b49380
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun May 3 23:41:32 2015 +0200

    Allow to select None filetype in Open File dialog
    
    Closes #483.

 src/dialogs.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit 62a8232901a831c694109b491f60b35aeaa579cc
Merge: 97b869b 44fec8f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun May 3 22:36:16 2015 +0200

    Merge pull request #475 from techee/retval_refresh
    
    Reload tooltip in the symbol tree also on tag update

commit 97b869bcd6ed19d8050f954c9c22f25439934998
Merge: b92b4ad d31c770
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun May 3 22:35:08 2015 +0200

    Merge pull request #476 from techee/dirty_vte
    
    Communicate terminal dirty-ness to users in a better way

commit 44fec8f7518d63eeb4e1a784ec7fe465d0002270
Author: Jiří Techet <techet@gmail.com>
Date:   Sun May 3 11:34:30 2015 +0200

    Prepend values to GtkTreeStore to eliminate quadratic complexity
    
    The tree model nodes consist of GNode structs:
    
    struct GNode {
      gpointer data;
      GNode	  *next;
      GNode	  *prev;
      GNode	  *parent;
      GNode	  *children;
    };
    
    where children are a linked list. To append a value, the list has to be
    walked to the end and with nodes with many children (which is our case)
    this becomes very expensive.
    
    We sort the tree afterwards anyway so it doesn't matter where we insert the
    value.

 src/symbols.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8ffd687af78f372da8063a4a480f4b0480613cc4
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Apr 20 23:47:49 2015 +0200

    Don't update the symbol tree when not shown

 src/sidebar.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit e3e46ed63b722a83510acfa2615e34d1f0e23f32
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Apr 20 21:41:36 2015 +0200

    Use gtk_tree_store_insert_with_values() to speed-up tree creation
    
    About 30% faster tree creation.

 src/symbols.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 35bde6c5ad0d008f807b88f8430517c282d2bc00
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Apr 20 21:23:54 2015 +0200

    Reload a tag in the sidebar only when it differs from the existing tag
    
    gtk_tree_store_set() becomes very slow when the tree gets bigger
    because internally it calls gtk_tree_store_get_path() which counts
    all the entries in a linked list of elements at the same tree level
    to get the tree path.
    
    Avoid the call of this function when not needed.

 src/symbols.c           | 28 ++++++++++++++++------------
 tagmanager/src/tm_tag.c | 20 ++++++++++++++++++++
 tagmanager/src/tm_tag.h |  1 +
 3 files changed, 37 insertions(+), 12 deletions(-)

commit 5d94d15976ab83f8bea2a6bda866d19a549f787e
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Apr 19 18:53:42 2015 +0200

    Reload tooltip in the symbol tree also on tag update
    
    Because function return types are not used to determine tag equality,
    we need to also update the tooltip of an existing tag otherwise the return
    type doesn't get updated when changed.

 src/symbols.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit b92b4ad36426fd6a4db4488b058808032fbe4818
Merge: 3b484d8 14e110e
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun May 3 17:09:39 2015 +0200

    Merge pull request #482 from philippwiesemann/fix-typos-po-de
    
    Fix typos in German translation

commit 14e110ecdc76315e22fafd35c1b9488e7b464d1e
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Sat May 2 22:34:58 2015 +0200

    Fix typos in German translation

 po/de.po | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

commit d31c770a3d408778540fffc6c1441fde484d3c03
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Apr 26 11:55:41 2015 +0200

    Tell users how to clear the terminal in the error message
    
    This is not completely obvious - when I first saw the message, I started
    pressing backspace which really doesn't help.
    
    Also clarify and shorten the message a bit - in "Could not execute the file
    in the VTE because it probably contains a command" it's not clear if it's
    the file or VTE which contains the command. Also use "terminal" instead
    of "VTE" which is more user-friendly.

 src/build.c | 6 +++---
 src/vte.c   | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

commit 9f0bfec04526b07882ab644830bef4c9c8ddebba
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Apr 24 22:15:10 2015 +0200

    Add "dirty" terminal indication
    
    Right now users are confused when various VTE actions don't work because
    there's no indication that the terminal is in the non-clean state.
    
    Visualise "modified" terminal in the same way as modified document - by
    a red label in the tab so it's clearer when terminal isn't clean.
    
    Avoid quick red flashes when pressing enter by delaying the color change
    a bit.

 data/geany.css   |  5 +++++
 data/geany.gtkrc |  3 +++
 src/vte.c        | 44 ++++++++++++++++++++++++++++++++++++++------
 3 files changed, 46 insertions(+), 6 deletions(-)

commit 3b484d8f9e5526709dd8ff8d0604cc541ca1ce5e
Merge: 9fd566e a23f4b2
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Apr 25 10:22:52 2015 +0000

    Merge pull request #464 from eht16/undeprecate_plugins
    
    Remove deprecated and unnecessary use of GeanyFunctions declaration

commit 9fd566e0407281ded5a1475c1bfad45e165741eb
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Apr 25 12:19:28 2015 +0200

    Windows: don't link geany_private.rc to libgeany as it is not necessary

 wscript | 1 -
 1 file changed, 1 deletion(-)

commit df39fc7bf7f6d429acded128476220a53668c6a4
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Fri Apr 24 19:35:59 2015 +0300

    Mark the exported spawn functions as GEANY_API_SYMBOL and @since 1.25

 src/spawn.c | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

commit b6fc3e97df348297e8efb8b91b1b8221fe110eee
Author: Daniel Guerrero Miralles <dguerrero@zemsania.com>
Date:   Tue Apr 21 17:51:39 2015 +0200

    Fix catalan translation
    
    This small patch fixes some entries in the contextual menu.

 po/ca.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 10a04f71c372734f6bfec3d7a04e4e4064cfbe14
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 21 16:21:37 2015 +0200

    Update Scintilla to version 3.5.5

 scintilla/gtk/ScintillaGTK.cxx    | 13 ++++++------
 scintilla/include/Platform.h      |  6 ------
 scintilla/include/Scintilla.h     |  4 ++--
 scintilla/include/Scintilla.iface | 40 +++++++++++++++++++++++++-----------
 scintilla/lexers/LexSQL.cxx       |  9 ++++----
 scintilla/lexers/LexTCL.cxx       |  7 ++-----
 scintilla/lexers/LexVHDL.cxx      | 10 ++++++++-
 scintilla/lexers/LexVerilog.cxx   | 43 +++++++++++++++++++++++++++++++++------
 scintilla/lexlib/SubStyles.h      |  3 ++-
 scintilla/src/AutoComplete.cxx    |  4 +++-
 scintilla/src/EditView.cxx        |  5 +++--
 scintilla/src/EditView.h          |  1 +
 scintilla/src/Editor.cxx          |  2 ++
 scintilla/src/Style.cxx           |  3 ---
 scintilla/version.txt             |  2 +-
 15 files changed, 102 insertions(+), 50 deletions(-)

commit 2523a25f9ca2db34f369f1b0bdb7107895bae762
Merge: 1d9bb56 39daab1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 21 16:19:11 2015 +0200

    Merge branch 'scintilla-update-script'
    
    Small improvements to the Scintilla update script

commit 39daab1dc758550b993dc4ba4cea212aa9754d5b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 21 16:09:57 2015 +0200

    hacking: Add a section on how to upgrade the bundled Scintilla copy

 HACKING | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit efb639435c8ad0790951d7bde261463e57376905
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 21 15:40:15 2015 +0200

    Scintilla update script: only ask for checking when something changed
    
    Only ask the user to check the SciLexer.h diff if the file actually
    changed.

 scripts/update-scintilla.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

commit 264df2ec7bc883e27b2668f43b08aad0cc244afb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 21 15:39:30 2015 +0200

    Scintilla update script: improve success banner

 scripts/update-scintilla.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 96cc37946f24ba8ff203cbfed5e816b966fa95d6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 21 15:34:54 2015 +0200

    Scintilla update script: strip "a/" and "b/" automatically

 scripts/update-scintilla.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 1d9bb56c4a01f758244e86b81a8b0715ae0be4c1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 21 15:12:44 2015 +0200

    Fix incorrect safety check in non-regex search code
    
    Only warn if MULTILINE is passed *together* with REGEX, but simply
    ignore if it not.

 src/search.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 97ab68244cd889730c61842eb94c1d23b20460b6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 20 20:34:00 2015 +0200

    Fix "select-all" to work with any GtkTextView, not only the scribble
    
    This makes the code more generic and allows the "select-all" keybinding
    to work in any GtkTextView, e.g. potentially plugin's ones.

 src/callbacks.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2110fc785d77355600229b9d41c399c565d13bf9
Merge: b839611 4c504c2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 20 22:19:49 2015 +0200

    Merge pull request #467 from pik/splitwindow
    
    Fix basic callbacks to work with splitwindow
    
    Closes #460 and #467.

commit 4c504c2be245e3860ad546948f64553263c2fe79
Author: pik <alexander.maznev@gmail.com>
Date:   Sun Apr 19 12:28:34 2015 -0400

    Reorganize select callback
    
    * select_all now works with splitwindow
    * select_all now works with file-browser pane
    * menu_select_all now works everywhere select_all hotkey does

 src/callbacks.c   | 22 ++++++++++++++++++++--
 src/keybindings.c | 54 ++++++++++++------------------------------------------
 2 files changed, 32 insertions(+), 44 deletions(-)

commit c214056ea1d000c6e53b158f616b680d1e02eb53
Author: pik <alexander.maznev@gmail.com>
Date:   Sun Apr 19 12:20:55 2015 -0400

    Fix callbacks to scintilla functions to work with splitwindow
    
    * Use Scintilla focus object instead of notebook document to fix
      splitwindow behaviour for cut, copy, paste and delete callbacks.
    * move else-if to same line (style)

 src/callbacks.c   | 44 +++++++++++++++-----------------------------
 src/keybindings.c | 11 +++++------
 2 files changed, 20 insertions(+), 35 deletions(-)

commit b839611e517f9ae853fc1eb9232ff3452a7e36bd
Merge: 5e8c17e 04c721c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 20 20:04:47 2015 +0200

    Merge branch 'ctags/make'
    
    Import make parser improvements from fishman/ctags#272

commit 04c721c3b41dee1fbc82e94dab74f35087b60333
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 7 04:10:10 2015 +0200

    make: Avoid reading an uninitialized value on empty target names
    
    Fixing this is however only theoretically useful, as:
    * no actual code paths can currently lead to it;
    * even if the code actually ended up reading the uninitialized value,
      it would still have a fully defined behavior as the result of the
      check is irrelevant in the only case the uninitialized read can
      happen.
    
    Anyway, fix this to avoid any possible bad surprises in the future.

 tagmanager/ctags/make.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 39f359b09aeeaeca18be4da06ec89bd9d18ea806
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Apr 4 01:27:58 2015 +0200

    make: Add support for GNU make pattern rules

 tagmanager/ctags/make.c                         | 2 +-
 tests/ctags/Makefile.am                         | 1 +
 tests/ctags/make-gnumake-pattern-rules.mak      | 8 ++++++++
 tests/ctags/make-gnumake-pattern-rules.mak.tags | 6 ++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

commit a11d67bb0b46a94d08ff32676a724838be97a680
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 2 20:00:40 2015 +0200

    make: Fix handling comments inside rules
    
    A line consisting only of blanks or comments should not end a rule,
    even if it doesn't start with a tabulation character.

 tagmanager/ctags/make.c                   | 14 ++++++--------
 tests/ctags/Makefile.am                   |  1 +
 tests/ctags/make-comment-in-rule.mak      | 17 +++++++++++++++++
 tests/ctags/make-comment-in-rule.mak.tags |  2 ++
 4 files changed, 26 insertions(+), 8 deletions(-)

commit 2d31d8f836e3a16ae86dfb3f3426e5a272ca6f8c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 2 17:19:43 2015 +0200

    make: Support for combined targets

 tagmanager/ctags/make.c                | 130 +++++++++++++--------------------
 tests/ctags/Makefile.am                |   1 +
 tests/ctags/make-multi-target.mak      |   8 ++
 tests/ctags/make-multi-target.mak.tags |   5 ++
 tests/ctags/simple.mak.tags            |   2 +-
 5 files changed, 67 insertions(+), 79 deletions(-)

commit 5bed3b58f337c95f7069ffbc9fbd23e83f55ad04
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 2 14:56:16 2015 +0200

    make: Support for variable expansions in target names

 tagmanager/ctags/make.c                           | 37 +++++------------------
 tests/ctags/Makefile.am                           |  1 +
 tests/ctags/make-target-with-parentheses.mak      |  1 +
 tests/ctags/make-target-with-parentheses.mak.tags |  3 ++
 tests/ctags/simple.mak.tags                       |  1 +
 5 files changed, 14 insertions(+), 29 deletions(-)

commit 0d60359428a82b8c371b920ba0a7bce0e59e59db
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 1 18:31:26 2015 +0200

    make: Fix incorrectly generating tags for rules content

 tagmanager/ctags/make.c                       | 3 ++-
 tests/ctags/Makefile.am                       | 1 +
 tests/ctags/make-variable-on-cmdline.mak      | 2 ++
 tests/ctags/make-variable-on-cmdline.mak.tags | 2 ++
 tests/ctags/simple.mak.tags                   | 2 --
 5 files changed, 7 insertions(+), 3 deletions(-)

commit 5e8c17eea266a936738c05a763a95fbb1f899ac0
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Apr 20 07:43:50 2015 +0200

    Update of Portuguese translation

 po/pt.po | 1073 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 536 insertions(+), 537 deletions(-)

commit c1db044b30d202c9a74d7490b332d9cf72dc5faa
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Apr 19 19:17:44 2015 +0300

    Separate spawn_read_cb() condition into input_cond and failure_cond

 src/spawn.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

commit 26a417d04d2ce58821a487ed32a78f9043721093
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 19 16:09:09 2015 +0200

    Fix typo

 tagmanager/ctags/php.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit e3ef006d59bbf2f034638be07e874cb8688da178
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 19 16:04:26 2015 +0200

    Drop the paragraph about self-hosted GTK API docs
    
    We assume that the GTK 2.24 API docs will remain online in the long-term
    so there is no reason why we should self-host those docs any longer.
    This is the last missing bit of #245.

 HACKING | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

commit 3f89d8d6a38442a25c877c6a7bd0aa45f3f01e35
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Apr 18 10:46:54 2015 +0000

    Add translation block to properly set version information
    
    This seems necessary to properly display version information
    in the Windows Explorer file properties dialog.
    I think it worked on older Windows versions without but
    at least on Windows 7 this seems necessary.

 geany_private.rc | 4 ++++
 1 file changed, 4 insertions(+)

commit d8ad369f8edf2468c31e3391c43648af7fe3d518
Merge: 902681d b8684a0
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sat Apr 18 12:31:41 2015 +0300

    Merge branch 'master' of https://github.com/geany/geany into spawn
    
    Conflicts:
    	src/build.c
    	src/tools.c

commit 902681d260435fde5181652839a9e49170150c41
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sat Apr 18 11:47:31 2015 +0300

    Fix for the broken I/O watch conditions on child exit under OSX
    
    Under OSX, after child death, the read watches receive input
    conditions instead of error conditions, so we convert the termination
    statuses (ERROR and EOF) into their respective conditions. Should not
    hurt the other OS.

 src/spawn.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

commit b8684a00f0b9bccbe739f797ffea92bb6b33613a
Merge: 723f430 e9f4365
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Apr 18 09:43:07 2015 +0200

    Merge pull request #472 from huth/fixes
    
    Fix typos in comments

commit e9f4365a378ad254e97c8d43a70499958ce3224e
Author: Thomas Huth <huth@tuxfamily.org>
Date:   Sat Apr 18 08:25:59 2015 +0200

    Fix typos in comments (discovered with the codespell utility)

 doc/pluginsignals.c | 2 +-
 doc/pluginsymbols.c | 2 +-
 src/build.c         | 4 ++--
 src/dialogs.c       | 4 ++--
 src/msgwindow.c     | 6 +++---
 src/tools.c         | 4 ++--
 src/utils.c         | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

commit 723f4302e0d7bbd938c789b9730366f7c7e03080
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Apr 17 15:11:00 2015 +0200

    autotools: Avoid building non-shared versions of the object files
    
    libtool apparently builds every object twice by default when shared and
    static objects need to be build differently.  As we never use the
    statically linked objects, avoid building them at all.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a98c9d50843911340f89b17db5bf707aa00557c2
Merge: 331a2bb db4bf54
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 15 14:01:40 2015 +0200

    Merge pull request #468 from techee/link_warning
    
    Compile prefix.c and osx.c only when needed to avoid warnings

commit 331a2bbab9aae45c7eef7abd9825c463f893798f
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Apr 15 00:56:46 2015 +0200

    Update of Portuguese translation

 po/pt.po | 5222 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 2860 insertions(+), 2362 deletions(-)

commit 83f261fd64b1a1e53782aee4b9ce9970696d3f81
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Apr 4 22:26:58 2015 +0200

    filebrowser: Add a flag to the tree model to indicate whether en entry is a directory
    
    Used by the subsequent patch which changes "stock-id" to GIcon and
    disables row type detection using FILEVIEW_COLUMN_ICON.

 plugins/filebrowser.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

commit db4bf54b2f963ce2259a0422e22d7e63aa43337b
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Apr 14 22:21:34 2015 +0200

    Compile prefix.c and osx.c only when needed to avoid warnings
    
    When mac integration or binary relocation are disabled, the compiled
    object file contains no symbols because the guards in the source files
    hide all code. On OS X there's a warning during compilation saying:
    
    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib:
    file: .libs/libgeany.a(libgeany_la-prefix.o) has no symbols
    
    If these features are disabled, don't compile the corresponding
    sources to avoid the warnings.
    
    Interestingly, waf compilation works without warnings - it appears
    linking is done through g++ which doesn't produce these warnings.

 m4/geany-binreloc.m4        |  6 ++++--
 m4/geany-mac-integration.m4 |  3 ++-
 src/Makefile.am             | 10 ++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

commit b0f7f2859ba46e908e84c75b68e72908ac20d06d
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Feb 14 14:20:45 2015 +0100

    Add a filter entry in the plugin manager dialog
    
    Let the user filter plugins by searching the plugin names and descriptions.
    While at it, group the plugin buttons into the dialog's action area to
    save some space.
    Rename OK button to Close in the plugin manager dialog
    Set the input focus to the filter entry and set initial plugin button state

 src/plugins.c | 204 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 150 insertions(+), 54 deletions(-)

commit 31ae06f7e59993c2a6d2ef7d96db1b48e9787fae
Merge: d97709f f6fbda7
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue Apr 14 20:01:45 2015 +0000

    Merge pull request #466 from techee/waf_build_tree
    
    waf: explicitly set the location of signallist.i and geany.html in the b...

commit f6fbda768e67ec7ac943dc5381eaf8b4aef7129c
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Apr 13 23:00:43 2015 +0200

    waf: explicitly set the location of signallist.i and geany.html in the build tree
    
    On OS X signallist.i is always rebuilt because waf looks for it in the build
    tree but generates it inside the source tree for some reason so it's
    always missing in the build tree. Set the target explicitly to the
    build tree to fix the problem.
    
    Similarly, set the target for geany.html to the build tree. Thanks to this
    waf also creates the 'doc' directory in the build tree which is otherwise
    missing and the cwd command fails for this reason (e.g. when the
    _build_ directory is removed).
    
    These two task generators are the only ones that don't use the 'features'
    parameter - the features in the other task generators should already
    handle the source/build tree problems for us (see the Waf Book section
    6.3.3. Nodes, tasks, and task generators).

 wscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d97709ff8662736520e53343409301b5bcc36100
Merge: ab6c145 ccfe8f2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 13 17:59:54 2015 +0200

    Merge pull request #462 from techee/waf_install
    
    waf: Disable build/install phase interleaving

commit ab6c145d45c96f9bff6add928c330faf82708366
Merge: d14ecd6 a7ada39
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 13 17:57:54 2015 +0200

    Merge pull request #457 from techee/icon2
    
    Two more Geany icon updates

commit d14ecd68c5de7055bfd5a6000c55650951ffb784
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 13 14:11:45 2015 +0200

    Add a missing accelerator in the French translation

 po/fr.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d0a431e071fa09165abacbde1dad33a24fac1cf1
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 27 04:53:01 2014 -0700

    Remove pre-GTK+ 2.24 preprocessor checks and related code

 src/dialogs.c   |  6 +-----
 src/gtkcompat.h | 25 -------------------------
 src/printing.c  |  2 --
 src/ui_utils.c  | 25 +------------------------
 4 files changed, 2 insertions(+), 56 deletions(-)

commit bdc082cb7782828bd3be5992ca2e6006f2330890
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 27 04:25:38 2014 -0700

    Bump min. version of GTK2 to 2.24 and GLib to 2.28
    
    Note: This is mostly search and replace. I've only tested with my
    GTK+ 2.24.20 and not at all the Waf build system.

 HACKING          | 10 +++++-----
 README           |  4 ++--
 configure.ac     |  4 ++--
 data/geany.glade |  2 +-
 doc/geany.txt    |  4 ++--
 wscript          |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

commit a23f4b2d39f8427eae024ad9a81f565baaa0b88a
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 12 23:11:28 2015 +0200

    Remove deprecated and unnecessary use of GeanyFunctions declaration

 plugins/classbuilder.c | 1 -
 plugins/demoplugin.c   | 1 -
 plugins/export.c       | 1 -
 plugins/filebrowser.c  | 1 -
 plugins/htmlchars.c    | 1 -
 plugins/saveactions.c  | 1 -
 plugins/splitwindow.c  | 1 -
 7 files changed, 7 deletions(-)

commit b9e090d2c84d7114a01537fad2968b93e978747e
Merge: f032067 d1a3ec1
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 12 22:54:22 2015 +0200

    Merge branch 'master' of github.com:geany/geany

commit f03206744361baac1c811db97f5d2816409d7787
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 12 22:54:16 2015 +0200

    Windows: Compile geany_private.rc into Geany.exe for version data and icon

 wscript | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 36f01551b2c4e2285c6541f24bb13010e8959605
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 12 22:53:24 2015 +0200

    Windows Installer: add geany-0.dll to the installer

 geany.nsi | 1 +
 1 file changed, 1 insertion(+)

commit a7ada396e262e347e4e1e1d1957fd1c947c8e32d
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Apr 12 22:44:50 2015 +0200

    icon: regenerate png/ico files based on the svg

 icons/16x16/geany.png | Bin 856 -> 857 bytes
 icons/32x32/geany.png | Bin 2368 -> 2369 bytes
 icons/48x48/geany.png | Bin 4240 -> 4233 bytes
 icons/geany.ico       | Bin 23558 -> 23558 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

commit ccfe8f23c154327ef2f033933f4f6e6a34cb67bf
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Apr 12 20:57:17 2015 +0200

    waf: Disable build/install phase interleaving
    
    When doing "./waf install" and some source files are modified
    so they need to be rebuilt, the build and install phase can be
    interleaved so one thread is still performing build while other
    thread is already performing install tasks.
    
    This appears to be a problem (at least on OS X) when some of
    the Geany plugins are still being built and libgeany is already
    being installed in parallel.
    
    Create a separate group for the install phase to eliminate the
    problem.

 wscript | 3 +++
 1 file changed, 3 insertions(+)

commit d1a3ec1849c3cd337c3eef9cd25374248da97bab
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 12 17:33:55 2015 +0200

    Small update of the French translation

 po/fr.po | 1335 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 670 insertions(+), 665 deletions(-)

commit 87ee835ef22c6a8658eb479b29981e7379fa5c83
Author: Matthew Brush <matt@geany.org>
Date:   Sat Apr 11 11:44:55 2015 -0700

    Export scintilla_get_type() from libgeany
    
    This is useful for plugins to be able to subclass the ScintillaObject
    and use its full GObject features. The Overview plugin is one known
    plugin that needs this.
    
    Also update scintilla_changes.patch by running update-scintilla.sh
    script with patch application commented-out and generating a reverse
    diff using `git -R`, and manually remove `a/` and `b/` prefixes from
    the resulting diff so it can be used with update-scintilla.sh script.

 scintilla/gtk/ScintillaGTK.cxx    |  1 +
 scintilla/scintilla_changes.patch | 33 +++++++++++++++++++++------------
 src/plugindata.h                  |  2 +-
 3 files changed, 23 insertions(+), 13 deletions(-)

commit 8bbe58cdf79b91aa1eb38d1ac933fafdf280dc6a
Author: Matthew Brush <matt@geany.org>
Date:   Fri Apr 10 18:52:46 2015 -0700

    Fix a compiler warning about const

 src/utils.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit f3078ebbc60b9747683029df0fa283d8f3e762a5
Merge: 4e6da78 5caf2b3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Apr 10 16:54:30 2015 +0200

    Merge branch 'kugel-/linkage-cleanup_rebase-for-merge'
    
    This merges PR#429 with only small history cleanup (no code changes),
    and ABI bump.
    
    Closes #355, #358 and #429.

commit 5caf2b3e77780daf52d59a4088efa5b8628e3f22
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Apr 10 16:52:30 2015 +0200

    Bump ABI version for new linkage mechanism

 src/plugindata.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 07dacb66d23b58b34eee51aac28a8ad2fcf5693c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 6 01:52:38 2015 +0200

    waf: Improve passing of export and visibility flags

 wscript | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

commit 7ac4bf3d24a08533e2557c30624aa961c3547c4e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 6 02:22:53 2015 +0200

    waf: Don't abuse static libraries
    
    Instead of abusing static libraries putting shared objects in them, and
    manually setting the flags required to build shared objects, use sets
    of objects and Waf's own cshlib/cxxshlib flags.
    
    Also explicitly call the appropriate build context method instead of
    only listing features in order to make it clear what is built.
    
    Some references:
    * http://docs.waf.googlecode.com/git/book_16/single.html#_predefined_task_generators
    * http://docs.waf.googlecode.com/git/book_16/single.html#_local_libraries
    * https://code.google.com/p/waf/issues/detail?id=1398

 wscript | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

commit 01db7f0cac907d283a84976ff3b542160c317a7a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 5 00:38:59 2015 +0000

    Add signallist.i to gitignore

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

commit 5b9bb1d7b20f61c092d31bff1dbfe89eda566d87
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 5 00:27:47 2015 +0000

    Include geanyplugin.h from geanyfunctions.h for compatibility
    
    geanyfunctions.h used to bring all function declarations, and some
    plugins depend on this side effect instead of properly including
    geanyplugin.h directly.  So, reintroduce the behavior for
    compatibility with those plugins.

 plugins/geanyfunctions.h | 1 +
 1 file changed, 1 insertion(+)

commit ede1faca54dcd96848047f4cde5fe989e9813e3a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 5 00:24:28 2015 +0000

    Move GeanyFunctions declaration back in plugindata.h
    
    This avoids breaking plugins that don't use geanyplugin.h as they
    should but include some random headers.

 plugins/geanyfunctions.h | 4 ----
 src/plugindata.h         | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

commit e4ab28058d1482b1b7383138dfee8cfc6f4c5d7f
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Apr 5 20:03:59 2015 +0200

    waf: set rpath for executable
    
    Whether rpath is liked or not, it allows geany to Just Work and is consistent
    with autotools

 wscript | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 7649a6921fc36a518a38d0c35006ed100ad5486b
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Apr 5 16:55:11 2015 +0200

    waf: Fix core plugins on Linux
    
    The -fvisibility=hidden flag for libgeany.so is also applied to plugins.
    This is not desirable.

 wscript | 2 ++
 1 file changed, 2 insertions(+)

commit a1f2d0b94a8b49ce656f217afcc288fe49ff9aef
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Apr 5 16:54:55 2015 +0200

    waf: Don't use temp variables

 wscript | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 11b5c0216fab87a743ffa9adba66c60811ec8626
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Apr 1 21:13:00 2015 +0200

    stash_group_add_boolean is an API function, misplaced within GEANY_PRIVATE

 src/stash.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 1c27e41bfa4bee44ef425f05bf3eabb8bd4ca2fe
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Apr 1 07:19:59 2015 +0200

    The mkstemps special case for windows is not necessary

 tagmanager/ctags/ctags.c | 4 ----
 1 file changed, 4 deletions(-)

commit a320609d5f3e25104f072c196484ef8072bb4ea1
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Apr 1 07:18:46 2015 +0200

    waf: Fixes for libgeany
    
    - libgeany install dir was wrong on win32
    - comdlg32 is required
    - more headers need to be installed
    - -fPIC is required on some platforms
    - LINKFLAGS_cprogram now have to be applied to libgeany.dll

 wscript | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 8 deletions(-)

commit 05f362b3bd5247dc9102c908d98b393cc0175242
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Apr 1 07:56:30 2015 +0200

    Have to include a few more headers for plugins

 plugins/geanyplugin.h | 3 +++
 1 file changed, 3 insertions(+)

commit b2ba6c84d51890ce9366c6620f5a48ba720d14a1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 15 23:54:17 2015 +0100

    autotools: Cleanup makefile a little

 src/Makefile.am | 4 ----
 1 file changed, 4 deletions(-)

commit 4e02f5884770726fdb6464ff8dcd0a469fae5549
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 15 20:39:52 2015 +0100

    autotools: Remove useless declaration
    
    There is no need for tricking Automake to use the C++ linker to link
    the main executable anymore, this is done for libgeany now.

 src/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

commit e61948adbda8597fdaf1ffeb7b92f3dbfed63c01
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 15 18:24:04 2015 +0100

    Fix or remove incorrect comments

 src/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 90b5e9b76f6650ea016f665613c660d54a089432
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 15 14:30:14 2015 +0100

    waf: Add rule to generate signallist.i
    
    Based on previous work from Matthew Brush.

 wscript | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

commit dbe910ca5e059cc67b53b1dac62147e1fcdd7e3c
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Mar 11 08:02:04 2015 +0100

    GEANY_API_SYMBOL for project_write_config()

 src/project.c | 1 +
 1 file changed, 1 insertion(+)

commit 56b9189a6cf42d877de5cbab64b22e722a0097ab
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 10 23:20:55 2015 +0100

    Fix generation of `signallist.i` with BSD sed
    
    4.2BSD sed doesn't understand the `+` quantifier, so use `{1,}`.

 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c85b846eeb08ff9c3260f35a51367736e8b87287
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 10 22:41:06 2015 +0100

    Simplify automated signal connection
    
    Instead of processing a template C source in the build system, generate
    a list to be included by the preprocessor.
    
    This simplifies the build system code as it now only generates the list
    and doesn't take care of processing the template.  It incidentally
    fixes build on systems with 4.2BSD sed (at least OSX and FreeBSD) as it
    removes some offending sed code.

 src/Makefile.am     | 16 ++++++----------
 src/callbacks.c     | 34 +++++++++++++++++++++++++++++++++-
 src/signalconn.c.in | 32 --------------------------------
 3 files changed, 39 insertions(+), 43 deletions(-)

commit 11d4bcf7c29b587b59a0bd1fbec754c7e1439c6f
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Tue Mar 10 22:41:09 2015 +0100

    Only use LIBGEANY_CFLAGS on libgeany.
    
    It includes stuff like -fvisibility which isn't appropriate for the main binary.

 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 43037b379b10637eca15dc5c2ce4de80abd73f0c
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Jan 18 16:44:57 2015 +0100

    waf: Implement check whether compiler supports -fvisibility=hidden
    
    This is a bit better than compiler == 'gcc'.
    Tested with gcc 4.9 (success) and gcc 3.4.5 (not supported).

 wscript | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 3d0bdbd6da48ea2000aff937b34baec57f98bb2b
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Jan 18 16:23:00 2015 +0100

    waf: The GEANY_*_SYMBOL flags also need to be defined for C++
    
    In Waf, we need to add the new flags to CFLAGS *and* CXXFLAGS otherwise
    the Scintilla build would break.
    To keep it more reabable, we first populate a temporary list
    geany_symbol_flags which is then added to CFLAGS and CXXFLAGS.
    
    Concerning the quote FIXME: no further qoting is necessary here.

 wscript | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit abc5f3239b45d6a3853276678f72de59ebf67c53
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Jan 18 15:53:01 2015 +0100

    waf: Adjust to build and use libgeany

 wscript | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

commit 616cbe3da9cfb69f6e9f265cdfd35715d7ab4e9d
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed Feb 25 17:01:02 2015 +0100

    src: Makefile.am cleanup

 src/Makefile.am | 163 ++++++++++++++++++++++++++------------------------------
 1 file changed, 76 insertions(+), 87 deletions(-)

commit 9eee68b71d322e7bbc74d48d4719e0713825d474
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 28 15:38:12 2014 +0100

    Fix exporting Scintilla symbols

 scintilla/gtk/ScintillaGTK.cxx    |  2 ++
 scintilla/scintilla_changes.patch | 20 ++++++++++++++++++++
 src/sciwrappers.c                 |  8 --------
 3 files changed, 22 insertions(+), 8 deletions(-)

commit 9644fb0ae21601b5acb6a5a5763a1e558a95c315
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 28 15:31:01 2014 +0100

    Define GEANY_{EXPORT,API}_SYMBOL from the build system
    
    This makes it easier to define it consistently to what the compiler
    and platform supports, and avoids having to include a special header
    everywhere, which is some kind of a problem for separate libraries
    like TagManager and especially Scintilla.
    
    As we only use these macros from the source and not the headers, it
    is fine for it to be defined to a configure-time check from the build
    system.
    
    Warning: Although Waf and Windows makefiles are updated they are not
             tested an will probably required tuning.

 m4/geany-lib.m4                 | 55 ++++++++++++++++++++++++++++-------------
 scintilla/gtk/makefile.win32    |  4 ++-
 src/Makefile.am                 |  1 -
 src/build.c                     |  1 -
 src/callbacks.c                 |  1 -
 src/dialogs.c                   |  1 -
 src/document.c                  |  1 -
 src/editor.c                    |  1 -
 src/encodings.c                 |  1 -
 src/filetypes.c                 |  1 -
 src/highlighting.c              |  1 -
 src/keybindings.c               |  1 -
 src/libmain.c                   |  1 -
 src/makefile.win32              |  4 ++-
 src/msgwindow.c                 |  1 -
 src/navqueue.c                  |  1 -
 src/pluginexport.h              | 34 -------------------------
 src/pluginutils.c               |  1 -
 src/project.c                   |  1 -
 src/sciwrappers.c               |  1 -
 src/search.c                    |  1 -
 src/stash.c                     |  1 -
 src/symbols.c                   |  1 -
 src/templates.c                 |  1 -
 src/ui_utils.c                  |  1 -
 src/utils.c                     |  1 -
 tagmanager/src/makefile.win32   |  4 ++-
 tagmanager/src/tm_source_file.c |  1 -
 tagmanager/src/tm_workspace.c   |  1 -
 wscript                         | 13 ++++++++++
 30 files changed, 60 insertions(+), 78 deletions(-)

commit 4e6da78f54e8734dc84386c2df1610985da91931
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Apr 10 00:24:20 2015 +0200

    PHP: Use the variable style for variable interpolated in strings
    
    Use the same variable style for simple interpolations ("$foo") than for
    complex ones ("${foo}") instead of using the string style itself.  This
    gives a visual feedback for simple interpolations.

 data/filetypes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1bed458ab9e9c9d3d37440a8c7543c27b073e556
Merge: 11e16ee 4e0193d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 9 01:06:57 2015 +0200

    Merge pull request #270 from b4n/zephir-filetype
    
    Zephir filetype

commit 5cf2511945f9598530401f31b62403a3a40bd8b6
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Apr 5 11:45:49 2015 +0200

    icon: Adjust the color of the inside of the bottleneck
    
    The (almost) black color of the inside of the bottleneck is a bit too high
    contrast and doesn't fit the rest of the icon (the only black part of it).
    Use the "lamp yellow" as the base and lower the L in HSL representation of
    the color so it just looks as darker lamp material.

 icons/scalable/geany.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cbd13b8f71bf788273f73e2e109fd3702d0c9be6
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Apr 5 11:32:24 2015 +0200

    icon: Adjust the left-bottom curve of the bottleneck
    
    After making the bottleneck wider (by shifting the curve to the left), the
    curve became flatter which looks strange. Make the curve a bit more round
    in the middle.

 icons/scalable/geany.svg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 942d4c6b7fbc10eaf984b4c6d51fcf4efd56f2fa
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Apr 6 19:19:55 2015 +0200

    Start bash as a login shell in VTE under OS X
    
    Graphical applications on OS X are started using launchd and don't inherit
    shell's environment variables so we don't get the PS1 value. Do the same
    as the OS X terminal emulator which runs the shell as a login shell (and yes,
    on OS X .bash_profile is read for shells started in the terminal application
    instead of .bashrc).

 src/keyfile.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit ed3142d0dfacded023fc78d4bd2f0a5b81fe588b
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Apr 6 19:12:34 2015 +0200

    Use editor's default font also for VTE
    
    On OS X Monospace 10 is too small (and using non-standard font).
    As we already have a special OS X font for the editor, use this value
    (having identical fonts both for the editor and VTE seems to be a
    good default).

 src/keyfile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bfa93af5cc3ee23cd049e5a144f2c393aba45e95
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Apr 5 18:49:28 2015 +0300

    Remove the includes of <sys/types.h> and <sys/wait.h> from *.c
    
    These are included from spawn.h under Unix now.
    Also fixes spawn.c including <sys/wait.h> without <sys/types.h>

 src/search.c | 5 -----
 src/spawn.c  | 3 ---
 src/tools.c  | 5 -----
 3 files changed, 13 deletions(-)

commit e838ef744b930695a913aabbc0a82a92b3378aa8
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Apr 5 18:43:11 2015 +0300

    Define the WIF* and WEXITSTATUS macros in spawn.h under all OS
    
    In particular, include <sys/types.h> and <sys/wait.h> under Unix.

 src/spawn.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit 2f0c9686e23b96544fef66073f4ff1e772a0e921
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sat Apr 4 19:46:45 2015 +0300

    Improved blanks handling in Windows command lines
    
    The argument quoting must be permissive (g_ascii_isspace() doesn't
    handle '\v'), the program name to arguments separator must be fixed
    to restrictive, and the leading spaces are somewhere between.
    
    Also fixed the test program to check for exactly 2 arguments.

 src/spawn.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

commit 11e16eed6fdb66e6a4046ea5cf6c718c6ce830cd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Mar 28 23:43:33 2015 +0100

    Remove an unused argument

 src/symbols.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ac00cc0ff6b8555cfe7142579ff6f82f7d6fde3d
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Wed Apr 1 21:45:25 2015 +0300

    Add working directory to the "execute" test

 src/spawn.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 8745ba58ae8e5582de7b3c828ac1eefa4e62e134
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Wed Apr 1 21:16:23 2015 +0300

    Fix Windows attempts to run 2+ unquoted tokens as a program
    
    When passed Foo Bar Qux as a command line, Windows will try to run
    Foo.exe Bar Qux, then "Foo Bar.exe" Qux, and last "Foo Bar Qux.exe",
    for maximum flexibility. Quoting Foo supresses this behaviour.

 src/spawn.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++-------------
 src/spawn.h |  2 ++
 2 files changed, 64 insertions(+), 17 deletions(-)

commit d4f707bb78d0dff94bf2f64d12dd6ca393dcfbef
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Mar 31 07:10:31 2015 +0200

    Small update of German translation

 po/de.po | 110 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 61 insertions(+), 49 deletions(-)

commit 47a7b507a7f0d4febf94d58368572b4db644856d
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Mar 30 20:33:55 2015 +0300

    Remove the unneeded win32_spawn() and win32_get_exit_status()
    
    These are not part of the plugin interface, and are not used in Geany
    any more after the spawn changes.

 src/win32.c | 493 ------------------------------------------------------------
 src/win32.h |   5 -
 2 files changed, 498 deletions(-)

commit 7bebf64f3da1fa3ae72e56c6ee4a9039701c8be5
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Mar 29 13:51:07 2015 +0300

    Fix SPAWN_UNBUFFERED description

 src/spawn.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit b3f3bfeee0d92509a2554463286a42ffbe1b0554
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sun Mar 29 13:47:13 2015 +0300

    Alter utils.c to use the new spawning module
    
    Also simplified the utils_open_browser() loop.

 src/utils.c | 80 +++++++++++++++++++------------------------------------------
 1 file changed, 24 insertions(+), 56 deletions(-)

commit 0aee6de04586bf56e40b8588f586259582f0055b
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sat Mar 28 13:35:20 2015 +0200

    Single-quote file name in the default printing command under Unix

 src/keyfile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 44dc8a1c2e850bd0c370bd2ddafc2ed5702c360a
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sat Mar 28 13:13:27 2015 +0200

    Fix a small leak and the checks for output/errors from the child
    
    In particular, if the child is executed successfully, and did not emit
    anything to stderr, an empty output is considered valid. The original
    tried to check, and leave the selection unchanged on empty output, but
    it did not always work.

 src/tools.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit ca02c593e732c27c91cbf072abd798246d867d30
Merge: 1cea0b6 3e6cea6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 27 14:44:55 2015 +0100

    Merge pull request #445 from bengtan/erlang-fishman-ctags
    
    Implement Erlang ctags

commit 3e6cea696a86fa54be9c9b2cc7947b9280147195
Author: Beng Tan <bengtan@users.noreply.github.com>
Date:   Fri Mar 27 11:03:17 2015 +0800

    Update Erlang ctags test.

 tests/ctags/test.erl.tags | 2 ++
 1 file changed, 2 insertions(+)

commit 36d1db4bc761cb666f2594dbf1a8f6380da60d43
Author: Beng Tan <bengtan@users.noreply.github.com>
Date:   Fri Mar 27 10:56:25 2015 +0800

    Change kind names for Erlang ctags parser
    
    ... so the tags will appear in Geany.

 tagmanager/ctags/erlang.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1cea0b6a79c020bc5c44558fa9509affaee956ec
Merge: f356147 1a36eea
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Mar 26 22:53:29 2015 +0100

    Merge pull request #411 from techee/shadows
    
    Use consistent shadows across Geany

commit f5cad4365aaa7a85c5ac8673ce6362c5bd10fec9
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Thu Mar 26 18:31:08 2015 +0200

    Fix a small leak and re-utf8 of grep cmd / extra options in Messages
    
    ixed a small memory leak (argv_prefix) introduced with the spawning
    change. Simplified the utf8_dir handling, there's no reason to re-
    convert it to utf-8. Restored the original grep command display in
    Messages (as entered in Tools vs. found by g_find_program_in_path),
    but fixed the re-utf8-izing of the command and extra options.
    Grouped in one commit, since these changes affect the same lines,
    and are actually small.

 src/search.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

commit a3af98cfc99884c8040f1de0b5fa8d3f57421ddb
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Mar 23 20:02:43 2015 +0200

    Altered keyfile.c to use the new spawning module
    
    In particular, changed the default printcmd not to "single quote paths
    on Win32 for g_spawn_command_line_async", but use the native double
    quotes. Also fixed it not to g_strconcat(NULL, ...) if lpr is missing
    under Unix. It works, but glib says the first string must not be NULL,
    and the command becomes wrong anyway.

 src/keyfile.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 6e92c5f64aa4bcf4434a8d2b191f7e85724d231e
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Mar 23 19:46:04 2015 +0200

    Altered tools.c to work with the new spawning module
    
    The tools (from Edit -> Format -> Send Selection to) are now spawned
    synchronously, which guarantees that both the document and it's
    selection will be unchanged when the tool completes.

 src/tools.c | 257 ++++++++----------------------------------------------------
 1 file changed, 34 insertions(+), 223 deletions(-)

commit 0f179331ef0760af7c5e7a61dbb9f70ba8c8e43f
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Jan 31 17:27:31 2015 +0100

    Add a popup menu to the plugin list in the plugin manager dialog
    
    This makes it easier to reach plugins' configure, keybindings and help
    functions.

 src/plugins.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 6 deletions(-)

commit 1a36eeaf4d6a5cab39d2cfd2c69a1a2f6e2bce70
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Mar 22 15:32:54 2015 +0100

    Use consistent shadows across Geany
    
    In principle, any scrolled window should have GTK_SHADOW_IN so the scrollbars
    are not above the surface and there is a frame around the scrolled area.
    
    The only exception are the elements of the main window where adding
    GTK_SHADOW_IN causes there are too many shadows (or lines in 2D themes)
    around the windows and the result isn't nice. So use GTK_SHADOW_NONE
    for all main editor scrolled windows. (One additional exception is the
    Help->Credits page which is gray and the extra frame doesn't look good.)
    
    Replace frame around VTE with GtkViewport to avoid the extra line around.
    
    Raise the second editor from the splitwindow plugin so it's at the same
    level as the main editor.

 data/geany.glade      | 4 ++--
 plugins/htmlchars.c   | 4 ++--
 plugins/splitwindow.c | 9 +++++++--
 src/gb.c              | 4 +---
 src/highlighting.c    | 2 +-
 src/keybindings.c     | 2 +-
 src/log.c             | 1 +
 src/sidebar.c         | 1 +
 src/toolbar.c         | 4 ++--
 src/vte.c             | 9 +++------
 10 files changed, 21 insertions(+), 19 deletions(-)

commit 3566baa60861933435dff39fadcb82693ea95a25
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sat Mar 21 19:58:11 2015 +0200

    Alter printing.c to use the new spawning module

 src/printing.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 353b748cf75b29d3d342757759d220d9f47aa563
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sat Mar 21 19:45:38 2015 +0200

    Alter callbacks.c to use the new spawning module

 src/callbacks.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a3f4170a4bd503e26208a5eb5dbab93b4761fbfe
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sat Mar 21 19:36:14 2015 +0200

    Alter templates.c to use the new spawning module

 src/templates.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

commit 74171cca5026e915e68b55f420b986b266ddcf7f
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Thu Mar 19 20:03:33 2015 +0200

    Alter search.c to use the new spawning module
    
    Also enabled the Grep tool setting to be used as a command line,
    instead of an executable name only, and fixed a small bug where the
    search text displayed in Messages was re-utf8-ed.

 src/search.c | 162 ++++++++++++++++++++++-------------------------------------
 1 file changed, 61 insertions(+), 101 deletions(-)

commit 4a0ea0ce1f8e0b85fe390d8aa1c7e967a9c92ce7
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Thu Mar 19 19:08:46 2015 +0200

    Do not reallocate the build output/error text received by spawn

 src/build.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

commit 3b723b8ce000ce5bd60a5dc41cb3c620bfaba381
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Thu Mar 19 19:03:59 2015 +0200

    Fix a memory leak when checking a spawn command line

 src/spawn.c | 1 +
 1 file changed, 1 insertion(+)

commit f35614757ba56cfb53d58fa506dbad1afee17059
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 17 14:09:31 2015 +0100

    Mark an argument const

 src/utils.c | 2 +-
 src/utils.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit faa6cd8614f59b16babbe0e48396659e0a411021
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Mar 16 22:25:54 2015 +0200

    Clarify that a spawn stdout/stderr cb may modify the passed string

 src/spawn.h | 2 ++
 1 file changed, 2 insertions(+)

commit dccd421a798d549b935e4dd674fa6a87e4b52ed5
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Mar 16 22:23:28 2015 +0200

    Don't check a spawned command line twice under Unix

 src/spawn.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 05415e53b63c89e104e93bc729bb8b3344d61525
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Mar 16 22:10:30 2015 +0200

    Unify the build command spawning
    
    Also, don't check build_spawn_cmd() cmd argument under Unix, since it
    may be valid shell command rejected by glib g_shell_parse_argv().

 src/build.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

commit 9c829aeb3c917deb028303bd51bc39a9e8fa758e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Mar 16 14:55:50 2015 +0100

    make: Fix parsing of empty continuation lines

 tagmanager/ctags/make.c           |  2 +-
 tests/ctags/Makefile.am           |  1 +
 tests/ctags/continuation.mak      | 11 +++++++++++
 tests/ctags/continuation.mak.tags |  3 +++
 4 files changed, 16 insertions(+), 1 deletion(-)

commit aae13ed26dc777ad159e8f974e25333cbe42fac8
Merge: 78a4580 243480b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Mar 16 02:01:58 2015 +0100

    Merge pull request #444 from techee/handle
    
    Geany icon improvements

commit 243480b83d031f52b3ecfe1fdaed9539c367ae65
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Mar 15 23:31:40 2015 +0100

    Regenerate png/ico icons from svg and add the 32x32 size
    
    The 32x32 size can be created by downsampling the 48x48
    icon by gtk at runtime but the result will be worse than
    doing the same directly from the svg icon (48->32
    conversion means downsampling by 1.5 which can introduce
    some moire artifacts and loss of information). Since
    32x32 are quite commonly used, it makes sense to ship
    this icon size with Geany.
    
    The png files have been optimized by pngoptim to remove
    metadata and compress the icon better.

 icons/16x16/geany.png   | Bin 897 -> 856 bytes
 icons/32x32/Makefile.am |   7 ++++++-
 icons/32x32/geany.png   | Bin 0 -> 2368 bytes
 icons/48x48/geany.png   | Bin 4314 -> 4240 bytes
 icons/geany.ico         | Bin 23558 -> 23558 bytes
 wscript                 |   1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

commit 34f911939c0d051b35322d6efc6252702ab62283
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Mar 15 21:09:13 2015 +0100

    Make the geany icon bottleneck a bit wider
    
    This way the non-highlighted part can still be shown.

 icons/scalable/geany.svg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 45a375caeb45f4bcca17462db7fe9179f3d4b665
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Mar 15 11:57:26 2015 +0100

    Fix geany icon handle
    
    The handle of the lamp icon looks strange. While
    the image of the lamp itself is taken from top,
    the handle looks it's taken from bottom.
    
    Fix this by moving the wide part of the handle
    down and moving the "shine" line to copy the
    outer edge. Also adjust the handle curves a bit
    to connect the lamp in a more natural way.

 icons/scalable/geany.svg | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 78a45805f1ce24b315ad1c99be4cc323d4c00959
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 15 15:31:31 2015 +0100

    autotools: Fix make dist after Scintilla makefile.win32 move
    
    8ebac60901c239a7dc36461a077139595bed12b8 moved the makefile.win32,
    so we need to use the new location.

 scintilla/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ae7ecde1dff2ea3a91ee14df0346f852007ab3ea
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 15 15:26:06 2015 +0100

    autotools: Fix generating geanyfunctions.h in out-of-tree builds

 plugins/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit fc766eda22fa3acc06245b2b20d10c45451aea41
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Mar 15 00:02:01 2015 +0100

    Fix visual problems around the bottle neck
    
    The Light sublayer of the Lamp layer covers the lamp border
    partly so it appears cut off. In addition, the Shine sublayer
    doesn't follow the border properly. Adjust the curves in both
    of these sublayers to fix the problem.

 icons/scalable/geany.svg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 2199158b153cb27fb5f48f00bd99636e9a9ba8bc
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Mar 14 23:43:10 2015 +0100

    Subdivide the icon into layers for better navigation
    
    No visual change.

 icons/scalable/geany.svg | 347 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 223 insertions(+), 124 deletions(-)

commit 9721faff62533c98e920e6e10bc87ab05255ef49
Author: Beng Tan <bengtan@users.noreply.github.com>
Date:   Sun Mar 15 15:55:45 2015 +0800

    Add (and fix) ctags unit tests for Erlang.

 tests/ctags/Makefile.am   |  1 +
 tests/ctags/maze.erl.tags | 15 ++++++++++-----
 tests/ctags/test.erl      | 16 ++++++++++++++++
 tests/ctags/test.erl.tags |  4 ++++
 4 files changed, 31 insertions(+), 5 deletions(-)

commit b0c5d221a5ef2f52a485b1d686f9c65a01efe533
Author: Beng Tan <bengtan@users.noreply.github.com>
Date:   Sun Mar 15 13:41:23 2015 +0800

    Implement Erlang ctags.
    
    Using erlang.c from fishman/ctags.

 src/filetypes.c                 |   2 +-
 tagmanager/ctags/Makefile.am    |   1 +
 tagmanager/ctags/erlang.c       | 194 ++++++++++++++++++++++++++++++++++++++++
 tagmanager/ctags/makefile.win32 |   2 +-
 tagmanager/ctags/parsers.h      |   1 +
 tagmanager/src/tm_parser.h      |   1 +
 wscript                         |   1 +
 7 files changed, 200 insertions(+), 2 deletions(-)

commit 690cb922be902f023881d455ae0c0a87d1c62170
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Sat Mar 14 21:36:05 2015 +0200

    Alter build.c to use the new spawning module
    
    The wrong and misleading "Failed to change the working directory" is
    changed to a generic "Invalid working directory".
    
    Under Windows, the build commands are run directly as command lines,
    while under Unix, /bin/sh is used - for compatibility, and because
    that's probably what a *nix user expects.
    
    The run script is always run as a command line, since it contains it's
    own shell, and because that lets us specify %c under Windows. In fact,
    %c (or "%c") should probably be the default, since CreateProcess()
    runs batch files with the default shell, instead of some our value.
    
    Also changed build_spawn_cmd() and build_run_cmd() to void, since
    their return values are not used anywhere.

 src/build.c | 279 ++++++++++--------------------------------------------------
 1 file changed, 45 insertions(+), 234 deletions(-)

commit 07aeafab81b00365406488b71f8b3a8cf9659048
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Mar 11 02:39:45 2015 +0100

    autotools: Fix installation directory of plugins on Windows
    
    For some reason we expect the plugins directly inside `$(libdir)` on
    Windows instead of `$(libdir)/geany`, so install the plugins there on
    Windows.

 plugins/Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

commit 2bfd394803cba185b3836d9c25b3d126f750ac13
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 28 16:13:10 2014 +0100

    Don't export on_motion_event() callback unnecessarily

 src/callbacks.c | 1 -
 1 file changed, 1 deletion(-)

commit bc013ae9fea0d312a12b89098aa135f2ff9850a4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 28 15:27:41 2014 +0100

    Rename LIBGEANY_LIBS to LIBGEANY_LDFLAGS and only use it on libgeany.la
    
    The flags in this variables are used to tune the linker behavior on the
    final libgeany (currently set the version information), so should only
    used on really linked libraries, not Libtool helper libraries.

 m4/geany-lib.m4              | 4 ++--
 scintilla/Makefile.am        | 1 -
 src/Makefile.am              | 8 ++++----
 tagmanager/ctags/Makefile.am | 2 --
 tagmanager/mio/Makefile.am   | 1 -
 tagmanager/src/Makefile.am   | 2 --
 6 files changed, 6 insertions(+), 12 deletions(-)

commit 361bf702e0b9ebf8052c39b15cba434ad4d85692
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 27 00:48:24 2014 +0100

    Explicitly cast string literals to non-constant pointers

 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a264b7ab77ba13f9c4268c237a8b9051a3d77915
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 27 00:47:23 2014 +0100

    Properly initialize Libtool

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit bcc7a35c062b947b244b0e9136c55201ef14a23f
Author: Matthew Brush <matt@geany.org>
Date:   Sun Oct 19 16:01:55 2014 -0700

    Don't export GtkBuilder callbacks anymore
    
    They are connected inside the library now rather than using GModule to
    find the symbols. Mark local callback handlers as static since they
    aren't global or exported anymore, they should be static. Since they're
    static now, all of the forward-declarations of the functions local to
    callbacks.c are pointless, so just remove them.

 src/callbacks.c | 350 ++++++++++++++++++++++----------------------------------
 src/project.c   |   3 +-
 2 files changed, 137 insertions(+), 216 deletions(-)

commit 1d64d5211fc7c660d9facbc5c927bbce32029863
Author: Matthew Brush <matt@geany.org>
Date:   Sun Oct 19 13:49:58 2014 -0700

    Replace dynamic exports with codegen for GtkBuilder callbacks
    
    This prevents having to export those callbacks and put them in the
    global namespace. Also, use inline shell script in Makefile.am instead
    of a Python script which should be more portable (by default) and gets
    rid of the helper script.

 m4/geany-lib.m4           |  23 ++-----
 scripts/dynamicsymbols.py |  73 ---------------------
 src/Makefile.am           |  24 +++++--
 src/callbacks.c           |   2 +
 src/callbacks.h           |   3 +
 src/dynamicsymbols.list   | 161 ----------------------------------------------
 src/signalconn.c.in       |  32 +++++++++
 src/ui_utils.c            |   2 +-
 8 files changed, 61 insertions(+), 259 deletions(-)

commit eb36500ac425c2b4f038bbcb1d3e38f353f0402c
Author: Matthew Brush <matt@geany.org>
Date:   Mon Oct 13 23:07:11 2014 -0700

    Improve Autotools build system for libgeany
    
    Checks if the compiler supports -fvisibility and the linker supports
    -dynamic-list arguments and use them instead of hardcoding. The new
    geany-lib.m4 also accomodates future use of Libtool versioning.

 configure.ac                 |  3 +++
 m4/geany-lib.m4              | 48 ++++++++++++++++++++++++++++++++++++++++++++
 scintilla/Makefile.am        |  5 +++--
 src/Makefile.am              | 21 +++++++++----------
 tagmanager/ctags/Makefile.am |  3 ++-
 tagmanager/mio/Makefile.am   |  3 ++-
 tagmanager/src/Makefile.am   |  4 +++-
 7 files changed, 71 insertions(+), 16 deletions(-)

commit d33758da926ca124db674240c431b8b07bb0e683
Author: Matthew Brush <matt@geany.org>
Date:   Mon Oct 13 19:29:36 2014 -0700

    Move Geany's core into a library (libgeany)
    
    This will allow plugins to link against the core when accessing API
    functions, now that the macro/struct/funcptr stuff is gone.
    
    Also convert the helper libraries into Libtool helper libraries as
    linking a shared library against static libraries is (apparently) not
    portable.

 configure.ac                 |    3 -
 geany.pc.in                  |    2 +-
 plugins/Makefile.am          |   15 +-
 po/POTFILES.in               |    2 +-
 scintilla/Makefile.am        |    7 +-
 src/Makefile.am              |   45 +-
 src/libmain.c                | 1406 ++++++++++++++++++++++++++++++++++++++++++
 src/main.c                   | 1385 +----------------------------------------
 src/main.h                   |    2 +
 tagmanager/ctags/Makefile.am |    7 +-
 tagmanager/mio/Makefile.am   |    6 +-
 tagmanager/src/Makefile.am   |    7 +-
 12 files changed, 1462 insertions(+), 1425 deletions(-)

commit 860df27696de75ab41765ed5700eb8e9991bccab
Author: Matthew Brush <matt@geany.org>
Date:   Mon Oct 13 19:08:57 2014 -0700

    Remove struct/macro/funcptr linkage control for plugin API
    
    Add rest of headers needed for declarations of all public API
    functions. Add HAVE_PLUGINS define to geanyplugins.h since some headers
    need this and it should always be valid for this header.
    geanyfunctions.h left for source-level backwards compatibility for
    plugins which might `#include` this header directly. I don't know why
    they do it, but some Geany-Plugins do this.

 doc/Doxyfile.in          |   1 -
 doc/Makefile.am          |   1 -
 doc/plugins.dox          |   7 +-
 plugins/Makefile.am      |  14 +-
 plugins/geanyfunctions.h | 463 +++-----------------------------------------
 plugins/geanyplugin.h    |  15 +-
 plugins/genapi.py        |  98 ----------
 src/Makefile.am          |   6 +
 src/plugindata.h         | 490 -----------------------------------------------
 src/plugins.c            | 326 +------------------------------
 10 files changed, 47 insertions(+), 1374 deletions(-)

commit 1e630e6f12c211a1b046d94421a8282682152eb6
Author: Matthew Brush <matt@geany.org>
Date:   Mon Oct 13 18:07:48 2014 -0700

    Remove redundant GEANY_EXPORT_SYMBOL usage in callbacks.h
    
    It only needs to be specified in one place for each function.

 src/callbacks.c |   1 +
 src/callbacks.h | 121 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 61 insertions(+), 61 deletions(-)

commit 056e7cb4c8bd193e85f1c834a3c9f0beb06b8828
Author: Matthew Brush <matt@geany.org>
Date:   Mon Oct 13 18:04:16 2014 -0700

    Change to GEANY_EXPORT_SYMBOL for callback functions
    
    This allows them to be dynamically exported when -fvisibility=hidden
    is applied.
    
    TODO: remove the CFLAGS hack in configure.ac

 configure.ac    |   3 +
 src/callbacks.c | 422 ++++++++++++++++++++++++++++----------------------------
 src/callbacks.h | 121 ++++++++--------
 src/project.c   |   3 +-
 4 files changed, 277 insertions(+), 272 deletions(-)

commit 2f0867076368fdd0333cfe61805f4fdebce34fe9
Author: Matthew Brush <matt@geany.org>
Date:   Mon Oct 13 16:36:36 2014 -0700

    Mark all plugin API functions to have "default" (public) visibility
    
    Adds a new header `pluginexport.h` to put the macros in, could be
    moved into an existing header (support.h?) by I didn't want to drag
    a bunch of existing stuff into the source files for this one macro.
    
    TagManager has relative include, this could be fixed by changing the
    include directories for it if it's a problem. Mark the Scintilla
    functions exported by re-declaring them in sciwrappers.c with the
    attribute to avoid changing upstream Scintilla code.

 src/Makefile.am                 |  2 +-
 src/build.c                     |  9 ++++--
 src/dialogs.c                   |  6 ++++
 src/document.c                  | 25 +++++++++++++++++
 src/editor.c                    | 16 +++++++++++
 src/encodings.c                 |  4 +++
 src/filetypes.c                 |  6 ++++
 src/highlighting.c              |  6 ++++
 src/keybindings.c               |  5 ++++
 src/main.c                      |  4 +++
 src/msgwindow.c                 |  7 +++++
 src/navqueue.c                  |  2 ++
 src/pluginexport.h              | 34 ++++++++++++++++++++++
 src/pluginutils.c               | 10 +++++++
 src/sciwrappers.c               | 62 +++++++++++++++++++++++++++++++++++++++++
 src/search.c                    |  2 ++
 src/stash.c                     | 21 ++++++++++++++
 src/symbols.c                   |  2 ++
 src/templates.c                 |  2 ++
 src/ui_utils.c                  | 22 +++++++++++++++
 src/utils.c                     | 24 ++++++++++++++++
 tagmanager/src/tm_source_file.c |  4 +++
 tagmanager/src/tm_workspace.c   |  5 ++++
 23 files changed, 276 insertions(+), 4 deletions(-)

commit a40ab0a4d9715b5f2c334f777e46ecb0fb6c5530
Author: Matthew Brush <matt@geany.org>
Date:   Mon Oct 13 14:00:41 2014 -0700

    Explicitly list symbols to dynamically export
    
    Uses a Python script to generate a listing used by the linker to
    determine which symbols to dynamically export. This provides finer
    grained control of which symbols are dynamically exported, limiting
    only to the ones needed for GtkBuilder signal connections.
    
    The build system integration could probably be done a little cleaner.

 configure.ac              |   2 +-
 scripts/dynamicsymbols.py |  73 +++++++++++++++++++++
 src/Makefile.am           |  11 +++-
 src/dynamicsymbols.list   | 161 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 245 insertions(+), 2 deletions(-)

commit ce0fa6ffa17befa0969653a0312b38a5429f1d6e
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Mar 10 21:24:42 2015 +0200

    Add a spawn module for Geany
    
    g_spawn_async_with_pipes() under Windows has various drawbacks:
    
    - There is no g_shell_parse_argv() for windows. It's not hard to write
      one, but the command line recreated by mscvrt may be wrong.
    - GLib converts the argument vector to UNICODE. For non-UTF8 arguments,
      the result is often "Invalid string in argument vector at %d: %s:
      Invalid byte sequence in conversion input" (YMMV). Our tools (make,
      grep, gcc, ...) are "ANSI", so converting to UNICODE and then back
      only causes problems.
    - For various reasons, GLib uses an intermediate program to start
      children (see gspawn-win32.c), with the side effect that the
      grandchildren output (such as make -> gcc) is not captured.
    - With non-blocking pipes, the g_io_add_watch() callbacks are never
      invoked, while with blocking pipes, g_io_channel_read_line() blocks.
    - Some smaller problems, explained in spawn.c as inline comments.
    
    The spawn module tries to fix these problems, and to provide easier
    APIs, which guarantee that the callbacks will synchronized as expected,
    and g_io_channel_read_line() will not be required, since even under
    Unix, it may buffer lines of unlimited length.
    
    This initial commit only adds the module source and header files, and
    includes it in the various build systems.
    
    You can see PR 274 for a long discussion about the module.

 src/Makefile.am    |    1 +
 src/makefile.win32 |    2 +-
 src/spawn.c        | 1247 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/spawn.h        |  102 +++++
 wscript            |    2 +-
 5 files changed, 1352 insertions(+), 2 deletions(-)

commit 7254bf96644058afa84b0aabd603f87d611615d0
Merge: e64cb97 3cf8c3a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 8 14:34:04 2015 +0100

    Merge branch 'scintilla-update-354'

commit 3cf8c3a6bef74b985a08a965f832f691f906b5c0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 8 14:31:26 2015 +0100

    objectivec: Enable escapes in verbatim strings
    
    Enable new Scintlla lexer.cpp.verbatim.strings.allow.escapes lexer
    property for ObjectiveC.

 data/filetypes.objectivec | 1 +
 1 file changed, 1 insertion(+)

commit 8ac86ce42377ee99eacd91ab8737347c0badb12e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 8 14:30:34 2015 +0100

    Update Scintilla to version 3.5.4

 scintilla/gtk/ScintillaGTK.cxx    |   8 +-
 scintilla/include/Scintilla.h     |  14 +
 scintilla/include/Scintilla.iface |  33 ++
 scintilla/lexers/LexCPP.cxx       |   9 +-
 scintilla/lexers/LexRuby.cxx      | 805 ++++++++++++++++++++------------------
 scintilla/lexers/LexRust.cxx      |   4 +-
 scintilla/lexers/LexSQL.cxx       |  50 +--
 scintilla/lexers/LexTCL.cxx       | 370 +++++++++---------
 scintilla/lexers/LexVHDL.cxx      |   7 +-
 scintilla/lexers/LexVerilog.cxx   |  95 ++++-
 scintilla/src/CellBuffer.cxx      |   5 +
 scintilla/src/Document.cxx        |  45 ++-
 scintilla/src/Document.h          |   2 +
 scintilla/src/EditModel.cxx       |   1 +
 scintilla/src/EditModel.h         |   1 +
 scintilla/src/EditView.cxx        |  58 ++-
 scintilla/src/Editor.cxx          | 163 +++++---
 scintilla/src/Editor.h            |   2 +
 scintilla/src/Indicator.cxx       |  69 ++--
 scintilla/src/Indicator.h         |  34 +-
 scintilla/src/PositionCache.cxx   |  14 +-
 scintilla/src/PositionCache.h     |   2 +-
 scintilla/src/RESearch.cxx        |   4 +-
 scintilla/src/ScintillaBase.cxx   |  22 +-
 scintilla/src/UniConversion.cxx   |   8 +-
 scintilla/src/UniConversion.h     |   6 +
 scintilla/src/ViewStyle.cxx       |  16 +
 scintilla/src/ViewStyle.h         |   2 +
 scintilla/version.txt             |   2 +-
 29 files changed, 1127 insertions(+), 724 deletions(-)

commit e64cb973329fde122fc8fad8900d81f45a7b1d6e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 6 17:36:15 2015 +0100

    Make the editor tab close buttons smaller on GTK3
    
    Also remove extra padding around the button's image to reduce its size
    and try and avoid it expanding the tab's height.
    
    This at least fixes the editor tabs height on Adwaita theme, where they
    were 1px taller than normal.

 data/geany.css | 3 +++
 1 file changed, 3 insertions(+)

commit c3d7acfe812f2c750d810a746dc3bdf7af1c7865
Merge: 93c217a 888d3dc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 6 02:45:39 2015 +0100

    Merge pull request #433 from b4n/statusbar-eol-short-name
    
    Use the short name for EOL mode in the statusbar

commit 93c217aae9b01a5448ff965b2fdda2a17629f95d
Merge: e1c35d2 8d19ea4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 6 01:47:42 2015 +0100

    Merge pull request #412 from techee/rules_hint
    
    Disable "rules hint" for the Documents tab

commit 8d19ea4c9fa7f74a3cf29db479ec5b7be11463db
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Mar 5 10:21:11 2015 +0100

    Disable "rules hint" for the Documents tab
    
    The "rules hint" property is used to tell the theme for which TreeView
    even/odd rows should have a different color. This is typically used for
    long rows or rows which need to be visually separated for some reason.
    
    Currently the Documents sidebar view uses it which doesn't make much
    sense because the row is short and neither of the other tabs in the sidebar
    use it.

 data/geany.glade | 1 -
 1 file changed, 1 deletion(-)

commit e1c35d2dc170bd62e0d88bede88c8718df63fdc5
Merge: a40acf5 709cbd5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Mar 4 22:57:02 2015 +0100

    Merge branch 'techee/leaks'
    
    Merges PR #417.

commit a40acf52b4f3687cb931b8bb7142f9b6bccfee6d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Mar 4 19:05:05 2015 +0100

    Update of German translation

 po/de.po | 386 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 193 insertions(+), 193 deletions(-)

commit 709cbd512b26ce42134dcf9460f7ed570eb5afac
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Mar 4 16:39:36 2015 +0100

    Explicitly initialize some variables for which we use the default value
    
    This does not change anything in practice because static variables are
    initialized implicitly as we need them anyway, but this makes things
    clearer and more explicit.

 src/highlighting.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e0116ccd9c58996bc7adecfc99efefe7d03c6bd2
Merge: 96e2635 b2e5d08
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Mar 4 15:58:47 2015 +0100

    Merge pull request #418 from b4n/spell-windows-windows
    
    Spell "Windows" as "Windows", not "Win".

commit 888d3dc9dc06b5c6ac5211460dead1b06b1721be
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Mar 4 15:57:26 2015 +0100

    Use the short name for EOL mode in the statusbar
    
    See discussion in https://github.com/geany/geany/pull/418

 src/ui_utils.c |  2 +-
 src/utils.c    | 11 +++++++++++
 src/utils.h    |  2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

commit 96e2635abe86f855c8173eba57e7701a120807b9
Merge: 05e19be 51ce101
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Mar 4 15:04:34 2015 +0100

    Merge pull request #431 from techee/absolute_prjname
    
    Always use absolute path when opening projects from command-line

commit 51ce1018cccbc6a6c0c3614d1d4e29daea9ab606
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Mar 4 14:34:55 2015 +0100

    Always use absolute path when opening projects from command-line
    
    At the moment when geany project is loaded from commandline using
    e.g. "geany myproject.geany", the relative path is used by geany
    so e.g. Project->Recent Projects shows the relative path instead of
    the absolute one (also if the project is already in the list with an absolute
    path, additional entry with relative path is created).
    
    Use main_get_argv_filename(), which is already used for ordinary files,
    also for opening .geany files.

 src/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 05e19be0a3c83d169217ad6708e56eeed286e30c
Merge: b032f2e 7fa8b3a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Mar 4 14:08:11 2015 +0100

    Merge pull request #419 from techee/osx-integration
    
    OS X integration

commit b032f2e214eb52fb79803532fb2b7a7f581be362
Merge: 185d4ff 7b5df86
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Mar 4 13:58:02 2015 +0100

    Merge pull request #426 from techee/run_script_tmp
    
    Create geany_run_script.sh in the temporary directory instead of the
    working directory.

commit 185d4fff933ec5cc7837ef69ab3eae8d0cee3ea3
Merge: 87af959 9df204a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Mar 4 12:40:15 2015 +0000

    Merge pull request #430 from techee/fix_warning
    
    Fix compiler warning

commit 9df204ab78551fd8988b660325d78fd3330a3bb0
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Mar 4 12:47:20 2015 +0100

    Fix compiler warning

 src/document.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7fa8b3a6953f734593e027a7ef7a8f93064be04c
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Mar 3 16:49:24 2015 +0100

    Backport adaptive scrolling patch from scintilla

 scintilla/gtk/ScintillaGTK.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit a9912c3c35dd231d8232e88564a664a8d91e4bf0
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Feb 24 19:11:51 2015 +0100

    Don't use single menu for "New with template" shared by toolbar and menubar
    
    The current implementation uses single menu for the toolbar and
    menubar and reparents it when file menu is shown/hidden.
    Connectiong "show"/"hide" signals doesn't work for menu items
    on OS X (and I suppose Ubuntu either) so the template submenu is
    never shown in the File menu.
    
    The easiest fix seems to be having two identical menus the same
    way we have them for recent files.

 src/templates.c | 81 +++++++++++++++++++--------------------------------------
 1 file changed, 27 insertions(+), 54 deletions(-)

commit 3031ac7e410b346950d2651f8fa53e96d6a7e173
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Feb 23 19:47:26 2015 +0100

    Check disk status when Geany enters foreground
    
    Since we have a simple way to check Geany has entered foreground
    on OS X, use it to check the current document's disk status.

 src/osx.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 2e1dc7aebac720f58c71bb2decee9421713cf883
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Feb 18 21:25:23 2015 +0100

    Don't use expose-event/draw signals of the menu
    
    The expose-event/draw signals were used to reenable the menu
    after it has been disabled when VTE overrides the given keybinding.
    This doesn't work on OS X where GtkMenuBar isn't displayed
    (there may be a similar problem with the global menubar on
    Ubuntu).
    
    The reason why these signals were used was probably slight
    flickering of the menubar when using ordinary g_idle_add() to
    reenable the menu (the dimmed menu gets drawn after which
    it gets reenabled and redrawn non-dimmed). It is however possible
    to use idle function with higher than redraw priority in which case
    the menu is enabled before the redraw so the dimmed menu
    isn't drawn at all.
    
    Fixes https://sourceforge.net/p/geany/bugs/1081/

 src/keybindings.c | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

commit 232d4dacded6d98a827414d62fa9879f618fb4f1
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Feb 18 17:19:57 2015 +0100

    Add right-click launcher icon entry creating a new window
    
    Normal clicking the launcher icon just brings the application to
    the foreground so there must be a way users can create a new
    instance of Geany.
    
    Add an entry "New Window" to the context menu which is shown
    when right-clicking the Geany icon in the launcher (most applications
    have the "New Window" entry there).
    
    In addition, fix "Open in new window" when using app bundle.
    
    Since both of these functionalities create a new Geany instance,
    factor-out the instance creation code into a new utility function
    and use it in both cases.

 src/notebook.c | 23 ++++-------------------
 src/osx.c      | 15 ++++++++++++++-
 src/utils.c    | 33 +++++++++++++++++++++++++++++++++
 src/utils.h    |  2 ++
 4 files changed, 53 insertions(+), 20 deletions(-)

commit 562885765dbd600626558372a409832cb4cda77e
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Feb 18 17:06:01 2015 +0100

    React to various useful gtk-mac-integration signals
    
    NSApplicationBlockTermination signal is emitted when clicking
    the Quit menu to check whether the application permits
    quitting - react accordingly.
    
    ---
    
    NSApplicationOpenFile signal is emitted when
    
    * file is dragged on the application icon
    * application is selected from "Open with" menu after right-clicking
    the file
    * when double-clicking a file for which the application is default
    editor/viewer
    * when file is opened from command-line
    
    When the application isn't running, it is first started and then this
    signal is emitted.
    
    Use the signal to open files. In addition, when the opened file
    has the ".geany" suffix, open it (but only if the project isn't already
    open). The project has to be opened in idle function because blocking
    the signal handler for a long time by the project-close confirmation
    dialog causes problems.

 src/osx.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

commit ada4595264def0f96d40e223f41243b46580fc1b
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Feb 4 01:01:13 2015 +0100

    Use global menubar on OS X
    
    We have to disable quartz accelerator handling because otherwise
    accelerators are performed also from other windows than the main
    Geany editor (e.g. Ctrl+V with find dialog open performs the keybinding
    Ctrl+V and inserts the text to the editor).
    
    OS X applications have an extra menu entry to the left of the File menu -
    an "application menu". This menu usually contains About, Preferences,
    Quit. Many users, however, may be used to Geany from other platforms
    and expect Preferences to be under the Edit menu so leave them there.
    Quit and About are rarely used and the application menu is the place where
    they are supposed to be - move these entries from other Geany menus there
    and hide them in the affected menus (the quit entry is inserted automatically,
    we just need to hide it from File).
    
    Also tell OS X the Help menu is dedicated to help (we get search in
    menu entries by name for free thanks to this).
    
    The global menu should refresh automatically based on user actions.
    Unfortunately this is not the case when gtk_menu_reorder_child()
    is used because it does not emit any signals so the gtk-mac-integration
    library doesn't see this call. Refresh the menu manually after calling
    this function.

 src/Makefile.am |  2 +-
 src/main.c      |  3 +++
 src/osx.c       | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/osx.h       |  6 ++++++
 src/ui_utils.c  | 20 +++++++++++++++++---
 wscript         |  2 +-
 6 files changed, 77 insertions(+), 5 deletions(-)

commit 18d517bd95ea29cb04e7652631c56a0376e6f098
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Feb 4 00:27:34 2015 +0100

    Use gtk-mac-integration so app bundle can be created on OS X
    
    This patch adds the gtk-mac-integration library and uses it to
    adjust various paths in Geany to point it inside the app bundle
    if Geany runs from inside the bundle.
    
    It adds the utils_resource_dir() utility function to return
    correct directories for various kinds of resources for all supported
    operating systems. Using this function the patch adjusts all Geany
    resource, plugin, icon, doc, and locale paths.

 configure.ac                |  1 +
 m4/geany-mac-integration.m4 | 18 +++++++++++++
 src/Makefile.am             |  4 ++-
 src/main.c                  | 64 ++++++++++++---------------------------------
 src/osx.h                   | 30 +++++++++++++++++++++
 src/plugins.c               | 12 +--------
 src/utils.c                 | 59 +++++++++++++++++++++++++++++++++++++++++
 src/utils.h                 | 14 ++++++++++
 wscript                     |  9 ++++++-
 9 files changed, 151 insertions(+), 60 deletions(-)

commit 7b5df86bd14dac77e1d66ede4b8240cd99e8ba48
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Feb 22 22:46:25 2015 +0100

    Create geany_run_script.sh in the temporary directory instead of the working directory
    
    Under some conditions, geany_run_script.sh is not deleted and we
    have no means to detect this in Geany (e.g. when the terminal emulator
    is started correctly but it fails to execute the script for some reason).
    In this case it is better to keep the garbage in /tmp than the working
    directory. Apart from that, it eliminates potential transfer of the run script
    over a NFS and eliminates the visibility of the script in working directory
    on Windows.
    
    Apart from that this patch fixes some locale/utf8 conversion problems
    and other subtle problems with the previous implementation.

 doc/geany.txt |   5 +-
 src/build.c   | 167 +++++++++++++++++++++++++---------------------------------
 2 files changed, 74 insertions(+), 98 deletions(-)

commit 87af9597fc66dc87e7a5aea21d9dec91f6d4b684
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 3 20:10:41 2015 +0100

    Make sci_get_cursor_virtual_space() GEANY_PRIVATE

 src/sciwrappers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a5b99dc96dfed95bb08940e33b8ce5153f5069d5
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Mar 3 16:09:19 2015 +0200

    Add virtual column and selected chars to the statusbar
    
    Closes https://sourceforge.net/p/geany/patches/10/

 doc/geany.txt     |  8 ++++++--
 src/sciwrappers.c | 11 +++++++++++
 src/sciwrappers.h |  1 +
 src/ui_utils.c    | 19 ++++++++++++-------
 4 files changed, 30 insertions(+), 9 deletions(-)

commit 9694338e71bdfabd0700980252dbde7095606f57
Merge: 1a6adc0 cc6602c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 3 17:05:44 2015 +0100

    Merge pull request #428 from kugel-/mingw-datadir
    
    Fix installation of data files on Windows with the Autotools build
    system.

commit 1a6adc0d6363e5c52a328c64b4edc03d97723b53
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 3 15:12:52 2015 +0100

    Fix build with GLib < 2.30 (oops)

 src/ui_utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1c1d76721dddf56bb9b5aa07f4513ea7e64554b4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Feb 28 19:15:00 2015 +0100

    Fix several tooltips to properly use plain text instead of markup
    
    Most of our tree view tooltips were set from plain text values but
    parsed as markup by GTK, which sometimes lead to markup errors, when
    the tooltip value contained markup control characters.
    
    This also adds ui_tree_view_set_tooltip_text_column() to the plugin
    API so plugins can easily set plain text tooltips from tree views
    columns.
    
    Fixes https://sourceforge.net/p/geany/bugs/1091/

 plugins/filebrowser.c    |  2 +-
 plugins/geanyfunctions.h |  2 ++
 src/plugindata.h         |  3 ++-
 src/plugins.c            |  3 ++-
 src/sidebar.c            |  4 ++--
 src/symbols.c            |  3 ---
 src/tools.c              |  2 +-
 src/ui_utils.c           | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ui_utils.h           |  2 ++
 9 files changed, 73 insertions(+), 9 deletions(-)

commit cc6602c2b6096739c8a3d5dad51b35885e31b895
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Tue Feb 24 23:59:46 2015 +0100

    autotools: Install to $prefix/data on win32
    
    setup_paths() sets app->datadir to $prefix/win32. With mingw-via-autotools,
    it installed data to $prefix/share/geany (like on Linux). With this change
    data is installed to $prefix/data ($datarootdir is not changed).
    
    This fixes geany startup after make install with autotools.
    
    Linux:
    pkgdatadir = ${datarootdir}/geany
    GEANY_DATA_DIR = /path/to/prefix/share/geany
    
    Win32:
    pkgdatadir = ${prefix}/data
    GEANY_DATA_DIR = /path/to/prefix/data

 configure.ac | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit a8a2d14711cd983f3ae094237c33dedb1821d72e
Merge: 8aa4f11 e454b89
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Feb 24 18:08:46 2015 +0100

    Merge pull request #415 from b4n/json
    
    Add JSON filetype (with tag parser)

commit 5a8e89ce8a268055d2af56e1a1ccb6b2278ce798
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Feb 21 19:18:58 2015 +0100

    sciwrappers: Remove a few unused functions

 src/sciwrappers.c | 24 ------------------------
 src/sciwrappers.h |  5 -----
 2 files changed, 29 deletions(-)

commit 8aa4f11cad2cf8404bc58f93464fdcd2140a2f69
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Feb 21 18:56:51 2015 +0100

    Optimize notebook page -> document lookup and remove dead code
    
    This actually fixes a theoretical bug introduced when notebook pages
    stopped being ScintillaWidgets, but this bug had no effect because it
    was in a dead code path -- because no, `page_num` never is -1 nor
    `page` NULL.

 src/callbacks.c |  5 +----
 src/document.c  | 21 +++++++++++++++------
 src/document.h  |  2 ++
 3 files changed, 18 insertions(+), 10 deletions(-)

commit 1a8de8fb09959ef22281328f25a6b03ede1fbafe
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Feb 21 18:53:59 2015 +0100

    Optimize document -> notebook page lookup

 src/document.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 99552dbe1256e5051a96623db4f0c68bbf591fbc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Feb 21 18:00:52 2015 +0100

    Fix emission of the ::document-activate signal
    
    The ::document-activate signal was not emitted when opening the first
    tab of the notebook, e.g. when the tab count changed from 0 to 1.
    
    This is because the ::document-activate signal is emitted in response
    to the GtkNotebook::switch-page signal, which is emitted whenever the
    currently displayed page changes.  When there already is a current page
    (when there is one or more pages), adding a new page does not trigger
    the signal, as this new page doesn't become the current one (we will
    switch to it later).  However, when there are none, the newly added one
    becomes current, and so the signal is emitted right away.
    
    This is problematic because when we add the page to the notebook, the
    document associated with it is not yet ready (only partly initialized),
    and so we can't emit the signal on a valid document, and we discard it.
    
    Not emitting this signal leads to inconsistent behavior introducing
    subtle bugs in plugins relying on it.
    
    To work this around, only show the page widget (the child added to the
    notebook) after we finished initializing everything.  This is the
    simplest fix, because a lot of the code around document creation and
    opening depend on the fact the page is already added, so while delaying
    the page addition sounds like the more sensible fix, it has non-trivial
    consequences that would require a large amount of work to overcome.
    
    Note that interestingly, in addition to our problem, GtkNotebook seems
    to have a bug as it emits the ::switch-page right when adding the first
    page even if that page is not visible.  However, it properly emits it
    again when the child becomes visible, so we just still discard the
    first emission like we used to.

 src/document.c | 25 ++++++++++++++++++++-----
 src/notebook.c | 10 ++++++++--
 2 files changed, 28 insertions(+), 7 deletions(-)

commit 91630a85a2f6c25b0101efa0ab6d3e436455966a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Feb 20 22:30:58 2015 +0100

    autotools: Check for docutils tools with a `.py` suffix too
    
    Docutils tools are apparently installed with an extension suffix by
    default, so check for this too.
    
    Closes #424.

 m4/geany-docutils.m4 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit ea79be32f23c1d6a9687da2da15746f8f8e08784
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Feb 20 22:28:26 2015 +0100

    autotools: Remove useless code
    
    AC_PATH_PROG supports overrides of its variable, so there is no need
    for manual handling.

 m4/geany-docutils.m4 | 6 ++----
 m4/geany-doxygen.m4  | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

commit b87254e1b39a26ecb13a2312df849e36a771e7f8
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Feb 18 00:40:19 2015 +0100

    Fix lost <> inside thanks

 THANKS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a6885865bb08af407ca67c87a31bd1ffc935b3a6
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Feb 18 00:35:44 2015 +0100

    Change contact data for brahmann

 THANKS      | 2 +-
 src/about.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit a65cecd59e82e1e9cc802d5eb429705c78707202
Merge: 15f75ca b0786ef
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Feb 15 16:32:03 2015 +0100

    Merge pull request #422 from strepon/master
    
    update Czech translation

commit b0786efc66b2d2e91b1b013199755466d32a95f1
Author: Stanislav Horacek <stanislav.horacek@gmail.com>
Date:   Sun Feb 15 14:33:10 2015 +0100

    update Czech translation

 po/cs.po | 153 +++++++++++++++++++++++----------------------------------------
 1 file changed, 55 insertions(+), 98 deletions(-)

commit 15f75ca2ac1e57a8e2fe375d3be8b605182e0f7d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Feb 13 14:11:30 2015 +0100

    Fix a few indentation style issues

 src/gtkcompat.h   | 16 ++++++++--------
 src/keybindings.c | 22 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

commit 0c1edb113cf8c45f022ca309af3a636f416c51b4
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Feb 13 12:47:04 2015 +0100

    Bump API to reflect the addition of keybindings_get_modifiers() and GEANY_PRIMARY_MOD_MASK

 src/plugindata.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ba0d364f64bea634610e92cfffad9457a77bf953
Merge: 308041d e613d93
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Feb 13 01:01:17 2015 +0100

    Merge pull request #420 from techee/vte_keybindings
    
    Revert some OS X keybinding changes for VTE

commit e613d931878a98118f39c8f2f92fe4ec23508c4c
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Feb 13 00:37:21 2015 +0100

    Revert some OS X keybinding changes for VTE
    
    While all normal keybindings use the Command key instead of
    control key on OS X, all the command-line applications and
    terminal emulators use the Ctrl key like on Linux. This includes
    Ctrl+C (SIGINT) and Ctrl+D (EOF) for which there is some
    special handling in the VTE support in Geany and which should
    use GDK_CONTROL_MASK instead of GEANY_PRIMARY_MOD_MASK.

 src/vte.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 308041da8d0f7ee938a075cae5d84d90da91c5eb
Merge: 7b17db6 be2b280
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Feb 11 18:33:19 2015 +0100

    Merge branch 'ctags/python'
    
    Import Python changes from https://github.com/fishman/ctags/

commit be2b280377b0479db749cfcf573ff7b35d70693b
Author: Markus Heidelberg <markus.heidelberg@web.de>
Date:   Tue Feb 10 04:07:39 2015 +0100

    python: do not ignore the character after a skipped string
    
    Regression for the triple start string issue has been introduced in SVN
    revision 669 (fishman git a314e11158307db84c0dadb758846b2302fe69cd) on
    2008-06-11. In ctags 5.7 it did work, in 5.8 not anymore.
    See also http://sourceforge.net/p/ctags/bugs/229/ for the original bug,
    which led to the old fix.
    
    The other issue with normal strings in skipEverything() is even older.

 tagmanager/ctags/python.c             |  3 +++
 tests/ctags/Makefile.am               |  1 +
 tests/ctags/py-skipped-string.py      | 30 ++++++++++++++++++++++++++++++
 tests/ctags/py-skipped-string.py.tags |  4 ++++
 4 files changed, 38 insertions(+)

commit 99a509de7e6dce381e8bc23c5d080f8c8e5c5e12
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 2 17:40:03 2015 +0100

    python: Fix out of bounds access on unmatched Cython array declaration

 tagmanager/ctags/python.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 0a97439701466011cf4231b838860c543d442e17
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jan 29 16:14:12 2015 +0100

    python: Improve and generalize access reporting
    
    Anything at the module/file level:
     * _... is protected
     * rest is public
    Anything at the class level:
     * __...__ is public (magic method)
     * __... is private
     * _... is protected
     * rest is public
    Anything at the function/method level:
     * everything is private
    
    Closes https://github.com/fishman/ctags/issues/216.

 tagmanager/ctags/python.c | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

commit 7b17db666eb7a17fcfd33ebe6dba5bf528c3485a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Feb 10 18:56:42 2015 +0100

    Small update of German translation

 po/de.po | 550 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 275 insertions(+), 275 deletions(-)

commit ae68b10b04aad477efb29acc1d547dac0ff30c1e
Merge: 642fede e9c9e9a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Feb 10 18:55:00 2015 +0100

    Merge branch 'master' of github.com:geany/geany

commit b2e5d08dad61b725f8cb89fc753497123d5570ec
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Feb 10 17:15:38 2015 +0100

    Spell "Windows" as "Windows", not "Win"
    
    This makes the labels more clear using the canonical name, and avoids
    any confusion with the English word "win".

 data/geany.glade | 2 +-
 src/utils.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit e9c9e9a2fa021e22ab3235b089c3e651f0094016
Merge: 1640471 1ab9eac
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Feb 10 17:12:30 2015 +0100

    Merge pull request #396 from techee/osx
    
    OS X improvements

commit 1ab9eac7047d60e89345694134626fcd1f3a67ac
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Feb 10 11:56:04 2015 +0100

    Use the .dylib extension when loading VTE on OS X

 src/vte.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6a132ef3fa4a01f7e05a0b8d673407429e3e6c8a
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Feb 6 11:23:10 2015 +0100

    CR line endings are used on old Mac OS systems only - make it more explicit in labels
    
    Also don't default to CR if OS is neither Windows nor Unix (including OS X).
    There's no other GTK backend right now so it doesn't matter much but
    still if something else appears, it will most probably not have CR line
    endings.

 data/geany.glade | 2 +-
 src/document.h   | 4 +---
 src/utils.c      | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

commit 16404717522c3594cc5fdfc6eca5ba9e2c0f9f0e
Merge: d5cca37 7229aa9
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Feb 8 10:42:32 2015 +0000

    Merge pull request #413 from eht16/backup_copy_file_perm
    
    SaveActions: Set file permissions of backup copies to 0600 (SF #125)

commit ca21a8759aada71a8f083ef8fc528bfb8988bc89
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Feb 6 00:32:10 2015 +0100

    Don't use "echo -n" in shell scripts
    
    The standard says:
    
    If the first operand is -n, or if any of the operands contain a
    backslash ( '\' ) character, the results are implementation-defined.
    
    On OS X it simply prints the "-n" string and everything which follows,
    including the newline.
    
    Use printf instead.

 m4/geany-status.m4 | 2 +-
 po/intl_stats.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit f2cab560c64d15e8568a64d0f02f0a6b76d82a9c
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Feb 6 15:18:43 2015 +0100

    Eliminate some minor leaks
    
    Found using the Instruments XCode tool on OS X.

 src/highlighting.c | 2 ++
 src/keyfile.c      | 4 ++++
 src/project.c      | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

commit 642fedef98a1792ab5873b0b8e34b39a19a14f8a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Feb 1 22:07:53 2015 +0100

    Small update of German translation

 po/de.po | 835 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 417 insertions(+), 418 deletions(-)

commit e454b8962cdb68cf8d41813ffc55a1a620925845
Merge: b0cf3b4 270e323
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jan 31 22:17:26 2015 +0100

    Merge branch 'json-tag-parser' into json
    
    Import JSON tag parser from CTags:
    https://github.com/fishman/ctags/blob/master/json.c

commit 270e32327f4d9776afb2047108da8550afbf3f83
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jan 31 22:14:10 2015 +0100

    json: Enable tag parser and adapt test case for Geany

 data/filetypes.JSON.conf     |  1 +
 tagmanager/ctags/json.c      | 12 ++++++------
 tests/ctags/Makefile.am      |  1 +
 tests/ctags/simple.json.tags | 39 ++++++++++++++++++++-------------------
 4 files changed, 28 insertions(+), 25 deletions(-)

commit 0bd95857041091a3d17d2c728ac0a69c8ea04c52
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Nov 28 16:46:39 2014 +0100

    json: Optimize memory usage by not collecting string values
    
    When a string is not used as an object property the parser doesn't
    need to know its value.  Not collecting it into memory lowers memory
    consumption and avoids high memory consumption with huge string values.

 tagmanager/ctags/json.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 2ff1386d9690147af9d5089d319dd57aca044151
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Nov 28 16:22:33 2014 +0100

    Add new parser for JSON

 tagmanager/ctags/Makefile.am    |   1 +
 tagmanager/ctags/json.c         | 396 ++++++++++++++++++++++++++++++++++++++++
 tagmanager/ctags/makefile.win32 |   2 +-
 tagmanager/ctags/parsers.h      |   3 +-
 tagmanager/src/tm_parser.h      |   1 +
 tests/ctags/simple.json         |  25 +++
 tests/ctags/simple.json.tags    |  19 ++
 wscript                         |   1 +
 8 files changed, 446 insertions(+), 2 deletions(-)

commit b0cf3b4e2ddaacc952c1683375965c9ff2e0d51e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jan 31 20:27:07 2015 +0100

    Add JSON custom filetype
    
    Closes #384.

 data/Makefile.am              |  1 +
 data/filetype_extensions.conf |  3 ++-
 data/filetypes.JSON.conf      | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

commit d5cca3792269160d19530b3af1c63c880adef2d4
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Jan 31 18:44:10 2015 +0100

    Change donate link to our own redirection
    
    As discussed in #410, the previous SF redirect is better replaced by
    a redirect on www.geany.org which we can control.
    This way we can also quickly change the target URL if it changes at
    Paypal.

 src/geany.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7229aa9cff84b6d42f75edba5b26babd2f6b8b64
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Jan 31 16:11:48 2015 +0100

    SaveActions: Set file permissions of backup copies to 0600
    
    As discussed in SF bug #125, it might be dangerous to store backup
    copies in a publicly accessable directory like /tmp with default
    permissions, especially on multi-user systems.
    So set the file permissions on non-Windows systems to 0600 by default.
    Also improve the documentation of the save Actions plugin to reflect this
    change.

 doc/geany.txt         | 19 +++++++++++++++++--
 plugins/saveactions.c | 14 ++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

commit d33a23c40c4297c9ea8c2b53a4033a34db0cd10e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jan 28 15:55:33 2015 +0100

    Add missing documentation for message window orientation setting

 doc/geany.txt | 6 ++++++
 1 file changed, 6 insertions(+)

commit 7fba0317d05effab1f1c3cc1a4c40163669631af
Author: Thomas Martitz <thomas.martitz@student.htw-berlin.de>
Date:   Sat Nov 2 14:20:20 2013 +0100

    document: Remove duplicated code.
    
    Since document_compare_by_tab_order_reverse does the exact reverse of
    document_compare_by_tab_order the code need not to be duplicated. Instead
    document_compare_by_tab_order can be called and the return value be reversed.

 src/document.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

commit f403e7e8c26a100534017f8ca2c5c1f1f9bac81f
Merge: 44eecc2 660c441
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jan 28 15:05:30 2015 +0100

    Merge pull request #188 from artros/feature/keep-edit-history-on-reload
    
    Maintain edit history on document reload
    
    Conflicts:
     * src/callbacks.c: document_reload_prompt().
    
    Amendments:
     * src/document.c: document_redo(), document_undo(): for loop style.

commit 44eecc25c3352d0197b94f1458d8496bc48668ae
Merge: 526294d 1b1a1da
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jan 28 14:30:43 2015 +0100

    Merge pull request #187 from artros/bug/clear-redo-on-edit
    
    Clear redo stack on edit

commit 526294d72c2a2de94c4bc7712dd7d3e7e3c8f233
Merge: bb41cb2 d48859d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jan 26 17:24:19 2015 +0100

    Merge pull request #399 from b4n/ui/message-window-hierarchy
    
    Drop useless scrolled window around the message window notebook

commit bb41cb2275757b1ad5ce3d20cf0aa40260388df7
Merge: 14f1468 9506c7a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sat Jan 24 16:39:20 2015 +0000

    Merge pull request #408 from ntrel/sci-make
    
    Fix strangely undefined GTK for PlatGtk.cxx by moving build dir (#1001)

commit 9506c7ae59d22ed68af0c00a3922e05aec142be7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jan 22 16:50:39 2015 +0000

    Remove unneeded -liberty flag

 src/makefile.win32 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8ebac60901c239a7dc36461a077139595bed12b8
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jan 22 16:45:14 2015 +0000

    Fix strangely undefined GTK for PlatGtk.cxx by moving build dir (#1001)

 makefile.win32               |  4 +--
 scintilla/gtk/makefile.win32 | 82 ++++++++++++++++++++++++++++++++++++++++++
 scintilla/makefile.win32     | 84 --------------------------------------------
 3 files changed, 84 insertions(+), 86 deletions(-)

commit 6cad08ae1eebe76c1ebb24fb415834438b8566c4
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jan 22 16:27:57 2015 +0000

    Port scintilla/gtk/makefile differences (Windows makefiles)

 scintilla/makefile.win32 | 142 +++++++++++------------------------------------
 1 file changed, 33 insertions(+), 109 deletions(-)

commit 47a5b9fc5fdbd5060671413565f354247f678f75
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Jan 8 12:49:03 2015 +0100

    Use better default fonts on OS X
    
    Fonts are rendered much smaller on OS X so use bigger sizes
    by default. Also, by default they use the Light style which is
    extremely thin - use Medium instead. Finally, use better monospace
    font than the default Courier (Menlo is derived from Dejavu Sans
    Mono and is used by XCode and other editors).

 src/keyfile.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit daecf69c9cd29891c661d3c52dd0fa7ba451d972
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Jan 8 12:01:30 2015 +0100

    Make keybindings_get_modifiers() part of plugin API

 plugins/geanyfunctions.h | 2 ++
 src/keybindings.c        | 9 +++++++++
 src/keybindings.h        | 5 +++++
 src/plugindata.h         | 2 +-
 src/plugins.c            | 3 ++-
 5 files changed, 19 insertions(+), 2 deletions(-)

commit 508216b7b47fba88c35c3b4af25a4a1e245f222d
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Jan 8 22:34:14 2015 +0100

    Use the open command to open a directory in Finder on OS X

 plugins/filebrowser.c | 2 ++
 1 file changed, 2 insertions(+)

commit 98ae34f1dcc671bc691c40fa9896ab5624818e7f
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Jan 8 22:32:17 2015 +0100

    Perform execute using the default terminal application on OS X
    
    In order to execute the runner script using the terminal application,
    the script has to be executable, otherwise it's not executed.
    
    In addition, when the terminal application starts, it sets $HOME
    as the working directory. For this reason the working directory
    has to be set in the runner script (to avoid additional ifdefs,
    this part is shared with other unix systems where the additional
    "cd" shouldn't matter).

 src/build.c   | 22 +++++++++++++++++-----
 src/keyfile.c |  2 ++
 2 files changed, 19 insertions(+), 5 deletions(-)

commit 82b413e5062b46b3237ede6b764f40aa8bb22ab2
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Jan 2 19:51:44 2015 +0100

    Fix keybindings on OS X
    
    On OS X the Command key is used for common keybindings instead
    of Ctrl. Introduce a new macro, GEANY_PRIMARY_MOD_MASK that
    represents the Command key on OS X and Ctrl on other platforms.
    
    For some events, such as mouse key press, GDK_MOD2_MASK is returned
    for the Command key by GTK instead of GDK_META_MASK (which is returned
    when Command is pressed together with some other key). To hide this
    behavior from users, introduce keybindings_get_modifiers() which can be
    used instead of gtk_accelerator_get_default_mod_mask() and which
    inserts GDK_META_MASK when GDK_MOD2_MASK is found in the mask
    on OS X.

 src/callbacks.c   |   2 +-
 src/editor.c      |   4 +-
 src/keybindings.c | 138 +++++++++++++++++++++++++++++-------------------------
 src/keybindings.h |   7 +++
 src/notebook.c    |   4 +-
 src/prefs.c       |   2 +-
 src/sidebar.c     |   4 +-
 src/vte.c         |   9 ++--
 8 files changed, 95 insertions(+), 75 deletions(-)

commit ac76c84fdcf0f9bc2551ec4453df316531c81a9a
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Dec 30 12:15:54 2014 +0100

    Use Safari as the default browser on OS X
    
    Since Safari isn't on PATH, the open command has to be used

 src/keyfile.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 558d21f2f29bf6f70655afebf8e10b55f523c864
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Dec 29 17:43:12 2014 +0100

    Fix clang warning regarding mismatching types
    
    The Option initialization didn't match the struct - there was
    an extra initialization of -e parameter and missing initialization
    of --etags-include a bit later. This means the initializations of
    the fields were shifted by one between these two.

 tagmanager/ctags/options.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9767f79e50408911508577cb68906658872afe3b
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Dec 29 17:14:36 2014 +0100

    Improve ui_get_mime_icon()
    
    It may happen that even though we get GIcon, the actual icon
    dosen't exist (typically on Windows and OS X). Check if we
    can find the actual icon.
    
    In addition, use "icon name" instead of "stock id" - the latter
    doesn't work on OS X / Windows for some reason.

 src/ui_utils.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

commit 3c01fae8d95f51340e16247f51d0e654500d43f5
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Dec 27 15:24:41 2014 +0100

    Disable scintilla buffer draw on OS X (with Quartz backend)
    
    This delagates font rendering to Quartz so it can be rendered
    in 2x resolution on "retina" displays.

 src/editor.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 5356c4549ace052b2e3be5451c9c6410ab3d9e41
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Dec 27 14:40:57 2014 +0100

    Fix infinite loop on OS X when using find in files
    
    The GIOCondition is always set to G_IO_IN even when input end
    is reached (and no other flags are set) so the read_fif_io()
    function never returns FALSE which causes an infinite loop.
    It is necessary to check also the return value of
    g_io_channel_read_line() and return FALSE on EOF or error.

 src/search.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 14f1468f7889b6ebc61f32dfa3e3111fc69fdc15
Merge: 6584cc5 e6fa2c2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 20 16:09:49 2015 +0100

    Merge pull request #377 from b4n/autotools-mingw-cross
    
    Autotools: Fix MinGW cross-compilation

commit e6fa2c2ac74bf8b7ba282565edf3ed0ff81acbe2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 30 02:33:03 2014 +0100

    Autotools: Improve the rule to compile Windows resource file

 src/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 700c05e413189479259a399878ba2383acbbcceb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 29 15:27:51 2014 +0100

    Autotools: Build plugins with Libtool on MinGW too

 plugins/Makefile.am | 72 +++++++++++++++++++----------------------------------
 1 file changed, 26 insertions(+), 46 deletions(-)

commit 6584cc5936eb282aa827c6451cd453329809715c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 20 15:06:17 2015 +0100

    verilog: Add code style categorization
    
    Implement code style categorization (comment/string/code) for Verilog.

 src/highlighting.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit d80fa8f72a8595de2916effa26709d7c864e2e66
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 20 15:05:24 2015 +0100

    Fix reference to a renamed function in some comments

 src/highlightingmappings.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 3996ae9268bc433c4b3c73c0c422fd6e75053dee
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 20 15:05:04 2015 +0100

    Update Scintilla to version 3.5.3
    
    Closes [bugs:#1041].

 data/filetypes.verilog            |   6 +
 scintilla/gtk/ScintillaGTK.cxx    | 395 +++++++++++------
 scintilla/include/Platform.h      |   5 +
 scintilla/include/SciLexer.h      |  27 ++
 scintilla/include/Scintilla.iface |  33 ++
 scintilla/lexers/LexBash.cxx      |  14 +-
 scintilla/lexers/LexCPP.cxx       |   4 +-
 scintilla/lexers/LexVerilog.cxx   | 876 +++++++++++++++++++++++++++++++-------
 scintilla/lexlib/LexAccessor.h    |   3 +
 scintilla/lexlib/WordList.cxx     |   2 +
 scintilla/scintilla_changes.patch |   5 +-
 scintilla/src/Document.cxx        |  18 +-
 scintilla/src/Editor.cxx          |  26 +-
 scintilla/src/Editor.h            |   1 +
 scintilla/src/MarginView.cxx      |  18 +-
 scintilla/src/ScintillaBase.cxx   |   4 +-
 scintilla/src/UniConversion.cxx   |  14 +-
 scintilla/src/UniConversion.h     |   4 +-
 scintilla/version.txt             |   2 +-
 src/highlightingmappings.h        |  14 +-
 20 files changed, 1142 insertions(+), 329 deletions(-)

commit 9c4f1081ebbe71003567dc0c86603b9152905fa3
Merge: 8eccb07 657c7e7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jan 14 18:58:24 2015 +0100

    Merge pull request #404 from ntrel/enum-base
    
    Parse D enum base type & refactor

commit 657c7e73bed9c025bfb404e0e319a67269e8bce5
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Jan 13 16:27:53 2015 +0000

    Parse D enum base type & refactor
    
    Merge and extend fishman/ctags enum inheritance parsing for C++, D,
    and add simple.d.t/input.d test.

 tagmanager/ctags/c.c      | 28 +++++++---------
 tests/ctags/Makefile.am   |  1 +
 tests/ctags/runner.sh     |  2 +-
 tests/ctags/simple.d      | 82 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/ctags/simple.d.tags | 24 ++++++++++++++
 5 files changed, 120 insertions(+), 17 deletions(-)

commit 8eccb079ab8e9bbaa6b49f29c45f94cae67014dc
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Jan 13 21:29:38 2015 +0100

    Update SQL keywords based on a list by the Drupal project

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 91d5079c8d56c69d78cad6d4cb9600b89a86d085
Merge: 627c0aa 740c12c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jan 11 17:33:40 2015 +0100

    Merge pull request #378 from b4n/remove-macro-list
    
    Remove "Show macro list" keybinding and feature

commit 740c12c0caed4e464480ea6458a77a7fb8b6bdfc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 9 19:05:51 2014 +0100

    Remove "Show macro list" keybinding and feature
    
    This feature looks like a poorly implemented subset of "Complete word",
    but lacks some important features like prefix filtering.  It is also
    misnamed as it shows not only macros, but also variables and enums.
    
    It also only shows `editor_prefs.autocompletion_max_entries`, but does
    so from *each* file, not as a whole.
    
    So drop it altogether, as this feature doesn't really look useful and
    the current implementation seem to suffer of too many shortcomings for
    it to realistically be actually used.

 doc/geany.txt     |  3 ---
 src/editor.c      | 16 ----------------
 src/editor.h      |  2 --
 src/keybindings.c |  5 -----
 src/keybindings.h |  3 ++-
 src/symbols.c     | 54 ------------------------------------------------------
 src/symbols.h     |  2 --
 7 files changed, 2 insertions(+), 83 deletions(-)

commit 627c0aa10e9ea62b440c21040180086b56a01079
Merge: f32b6f3 df03bca
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Jan 10 11:07:18 2015 +0000

    Merge pull request #401 from techee/waf
    
    waf: Don't relink scintilla and geany on every build

commit df03bcace008b8dcc77f595d2441790e77f4e707
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Jan 9 01:35:43 2015 +0100

    waf: Don't relink scintilla and geany on every build
    
    The ant_glob() function doesn't return a list of strings but rather
    a list of waflib.Node.Nod3 objects. These print as paths so build
    works but apparently confuse waf which thinks the files have
    changed every time the waf command is performed.
    
    Relinking scintilla and geany on every waf invocation is especially
    problemmatic during "sudo waf install" where scintilla and geany
    binaries get owned by the root user. This isn't a big problem on Linux
    but on OS X this prevents subsequent waf calls to update the
    binaries and the build fails.
    
    To fix the issue, just convert the waflib.Node.Nod3 objects
    to relative (string) paths.

 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f32b6f3b93df96026fc9ff233458949e97a5a7b9
Author: landroni <landroni@users.noreply.github.com>
Date:   Tue May 20 02:56:14 2014 +0200

    R: Fix keywords and wordchars
    
    Currently the R filetype has a rather random collection of keywords.
    
    This commit fixes the primary keywords (as used in RStudio, an IDE
    specialized for R), and also adds the appropriate list of built-in
    constants.
    See https://github.com/rstudio/rstudio/blob/master/src/gwt/acesupport/acemode/r_highlight_rules.js
    for the list of keywords used in RStudio.
    
    Furthermore, the commit adds the `.` (dot) to `wordchars`.  In R the
    set of symbols which can be used in object names is `[A-Za-z0-9_.]`
    (with code portability and platform compatibility in mind).  For more
    gruesome details see:
    http://cran.r-project.org/doc/manuals/r-release/R-intro.html#R-commands_003b-case-sensitivity-etc
    RStudio also treats the dot as part of the "word".
    
    For some background see:
    http://landroni.wordpress.com/2013/07/27/using-geany-for-programming-in-r/
    
    Closes #273.

 data/filetypes.r | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit e06f47d774bd296ed406378c6748ff12d3bd0fb6
Merge: fb7d9fa fd5ac72
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jan 5 16:26:03 2015 +0100

    Merge pull request #289 from mspacek/build_line_num
    
    Add %l current line number substitution to build commands

commit d48859db8e5e91fd1dbfb1951917087dc781a1ef
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jan 2 19:48:06 2015 +0100

    Drop useless scrolled window around the message window notebook

 data/geany.glade | 231 ++++++++++++++++++++++++++-----------------------------
 src/main.c       |   2 +-
 src/msgwindow.c  |   2 +-
 3 files changed, 110 insertions(+), 125 deletions(-)

commit fb7d9fa25f361b823f289cbb2c83201496c711b9
Merge: b864733 b7338da
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Jan 2 19:34:24 2015 +0100

    Merge pull request #388 from peter-scholtens/master
    
    Update of dutch translation for geany

commit b864733cdb31a2366eb878f0382e338369c200ae
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Dec 30 19:30:07 2014 +0100

    Avoid double-shadow around message window
    
    Message window should be at the same level as the sidebar and editor.
    Instead, it is 2 shadows deeper. Fix that.

 data/geany.glade | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit b7338da5e688c3ca2d3ceb318723cf5b99e678b1
Author: Peter C. S. Scholtens <peter.scholtens@xs4all.nl>
Date:   Fri Jan 2 17:28:09 2015 +0100

    Updated Dutch translations.

 po/nl.po | 3053 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1550 insertions(+), 1503 deletions(-)

commit f1a1d8c234eaae51e9ec6987d0d4eccf6b32a980
Merge: 08568b1 c131466
Author: Colomban Wendling <lists.ban@herbesfolles.org>
Date:   Tue Dec 30 22:50:54 2014 +0100

    Merge pull request #397 from techee/revert
    
    Remove useless TM micro-optimization from a profile misread.

commit c131466a0035b0421e40661d50181db1ca8de3f6
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Dec 30 17:09:18 2014 +0100

    Revert "Microoptimization in merge"
    
    This reverts commit cb9e4bbf7446e45365cad2242087f2a766662f20.

 tagmanager/src/tm_tag.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 08568b11f587000e7226694a22300aa79db473de
Merge: 3b8ea98 29cc8b4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 25 19:54:12 2014 +0100

    Merge PR#393 from 'c/keyword-types'
    
    Fix parsing typedefs to size_t (C/C++/D) and wchar_t (C/D).

commit 29cc8b4d28a8abb2cbde6503b5b910baf8688fa3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 25 16:46:55 2014 +0100

    d: size_t and wchar_t aren't keywords in D

 tagmanager/ctags/c.c                    | 4 ++--
 tests/ctags/Makefile.am                 | 1 +
 tests/ctags/size_t_wchar_t_alias.d      | 3 +++
 tests/ctags/size_t_wchar_t_alias.d.tags | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

commit 43a8986d2cd8f40e2daff2fc31f8677669514d6f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 25 16:45:35 2014 +0100

    c: Add a test case for size_t and wchar_t handling

 tests/ctags/Makefile.am                   | 1 +
 tests/ctags/size_t_wchar_t_typedef.c      | 3 +++
 tests/ctags/size_t_wchar_t_typedef.c.tags | 3 +++
 3 files changed, 7 insertions(+)

commit 371301a84da81fdcd894715eb58af0efccd3a523
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 25 01:36:27 2014 +0100

    c: Don't parse wchar_t as a keyword

 tagmanager/ctags/c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e091a56a18ef20f65e088d78fc78fcdb310526b2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 25 01:35:28 2014 +0100

    c, c++: Don't parse size_t as a keyword
    
    This fixes handling of typedefs defining this name.

 tagmanager/ctags/c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b8ea98f00cdacd84217adf049dbb5d10c6057c9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 25 00:53:03 2014 +0100

    c: Fix C11 keywords (oops)
    
    List keywords from ISO/IEC 9899:201x N1570 (2011-04-12), not N1425
    (2009-11-24).

 data/filetypes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ef6f8a0c6595fba0e267860cac3145e264dca633
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Dec 24 19:02:23 2014 +0100

    c++: Remove non-keyword types from keywords list
    
    Closes #391.

 data/filetypes.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 20be6c9bb464d958f336cf229f841c9ef7622e97
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Dec 24 19:01:14 2014 +0100

    c: Add missing size_t type to the C99 tag file
    
    Closes #392.

 data/c99.tags | 1 +
 1 file changed, 1 insertion(+)

commit f4045fb3369adbaf01321532e2f9c3bda3a44dcd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Dec 24 18:48:45 2014 +0100

    c: Add missing C11 keywords

 data/filetypes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d80ee82072a188297c4a3d1bd304e65741f7a4f0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 18 02:42:05 2014 +0100

    Select the default scheme in the Color Scheme dialog by default
    
    Always select the default scheme by default in the Color Scheme dialog
    not to end up selecting none in case of broken or nonexistent
    configuration.  This matches which scheme is actually used, and fixes
    use of an uninitialized iter when no scheme would be selected.

 src/highlighting.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit d6601cbafa57841acf7303dfb019e2bcfbb933a3
Merge: 8733109 fc73fab
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Dec 12 13:11:29 2014 +0000

    Merge pull request #387 from philippwiesemann/fix-typos-doc
    
    Fix typos in documentation

commit fc73fabe4bf6b0416750472ab82e7a9f8e04177c
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Thu Dec 11 22:58:57 2014 +0100

    Fix typos in documentation

 doc/geany.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 87331093a93cd64bb47b8bdcc3c17459dcca9d7f
Merge: 89c3218 233ca08
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 11 00:07:41 2014 +0100

    Merge pull request #361 from techee/prj_write
    
    Add project_write_config() to force project file rewrite

commit 89c321883c631f57eebe269aa2d58a5218530513
Merge: 7c22cea 1f9f230
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Dec 8 19:15:36 2014 +0100

    Merge pull request #386 from b4n/po/fr
    
    Small French translation update

commit 1f9f23004578f8a9c45f4e09dc4aa4e6b2fbabc3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 8 16:09:58 2014 +0100

    Use French quotes in the French translation

 po/fr.po | 144 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 73 insertions(+), 71 deletions(-)

commit 469a345f180e451a23def0e5701b2712af0153c2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 8 15:53:45 2014 +0100

    Small update of the French translation

 po/fr.po | 3201 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1657 insertions(+), 1544 deletions(-)

commit 7c22ceacf996ea0ac773349afca39eed6af4b9ea
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Dec 7 22:25:13 2014 +0100

    Update the go parser to the latest version from ctags

 tagmanager/ctags/go.c | 78 ++++++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 44 deletions(-)

commit 0184083a7e1216169d0879d66b67799e9bf638c9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 4 14:38:57 2014 +0100

    Fix an assertion failure when trying to scope-complete in a 2-characters C++ file

 src/editor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f08af8046f8cbbd7d48fc767155d1fe805c1c45d
Merge: 0a58f50 02bc3b3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 2 15:03:20 2014 +0100

    Merge branch 'js-update'
    
    Import back JavaScript parser changes from fishman/ctags.

commit 02bc3b36387671061ed61dba4cdd31f843c44ed3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 2 01:32:09 2014 +0100

    javascript: Improve string literals handling
    
    1. Don't include the newline itself in a line continuation construct.
       This fixes generation of e.g. properties with embedded line
       continuations.
    2. Don't continue parsing strings past an unescaped newline (as naked
       newlines are invalid inside strings).  This avoids parsing the whole
       remaining file as a string in case of broken input.  It is both
       useful to better support partly written files and to avoid loading a
       whole malformed file in memory while reading it as a string.
    
    See section 7.8.4 "String Literals" of ECMA-262:
    http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf

 tagmanager/ctags/js.c                      | 25 +++++++++++++++++++++++--
 tests/ctags/Makefile.am                    |  2 ++
 tests/ctags/js-broken-strings.js           | 10 ++++++++++
 tests/ctags/js-broken-strings.js.tags      |  5 +++++
 tests/ctags/js-string-continuation.js      | 19 +++++++++++++++++++
 tests/ctags/js-string-continuation.js.tags |  6 ++++++
 6 files changed, 65 insertions(+), 2 deletions(-)

commit 69a15cf2c1c8def91ffd7bc51ca8a1bfd2df563d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 1 23:43:20 2014 +0100

    javascript: Stop using longjmp() and friends
    
    Fixes some memory leaks with malformed or partial files.

 tagmanager/ctags/js.c | 77 +++++++++++++++++++--------------------------------
 1 file changed, 28 insertions(+), 49 deletions(-)

commit 0a58f5012ba8e379f92c2f6751b16b9bea363db6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 2 13:50:11 2014 +0100

    Update Scintilla to version 3.5.2

 scintilla/gtk/PlatGTK.cxx            |   4 +-
 scintilla/gtk/ScintillaGTK.cxx       |  37 ++-
 scintilla/include/Scintilla.h        |   9 +-
 scintilla/include/Scintilla.iface    |   9 +-
 scintilla/lexers/LexCoffeeScript.cxx |   2 +-
 scintilla/lexers/LexVHDL.cxx         |   3 +-
 scintilla/src/Catalogue.cxx          |   2 +-
 scintilla/src/CellBuffer.cxx         |   2 +-
 scintilla/src/Decoration.cxx         |   4 +-
 scintilla/src/Document.cxx           | 504 ++++++++++++++++++++++++++++++++---
 scintilla/src/Document.h             |  19 +-
 scintilla/src/EditModel.cxx          |   1 +
 scintilla/src/EditView.cxx           |  45 +++-
 scintilla/src/EditView.h             |  10 +
 scintilla/src/Editor.cxx             | 105 +++++---
 scintilla/src/Editor.h               |   1 +
 scintilla/src/LineMarker.cxx         |   5 +
 scintilla/src/LineMarker.h           |  10 +
 scintilla/src/MarginView.cxx         |  11 +-
 scintilla/src/MarginView.h           |   9 +
 scintilla/src/PositionCache.cxx      |   1 +
 scintilla/src/RESearch.h             |   2 +-
 scintilla/src/ScintillaBase.cxx      |   1 +
 scintilla/src/UniConversion.cxx      |  46 ++++
 scintilla/src/UniConversion.h        |   4 +
 scintilla/version.txt                |   2 +-
 26 files changed, 724 insertions(+), 124 deletions(-)

commit 69096276414b1532618f354950896db45e0e9256
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Dec 1 13:05:19 2014 +0100

    Update of Portuguese (Brazilian) translation

 po/pt_BR.po | 3045 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1560 insertions(+), 1485 deletions(-)

commit 94aa892c8177e93d0dff3edf853854e872f19d20
Merge: af7d63c ccb15a3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 30 02:03:00 2014 +0100

    Merge pull request #373 from techee/go_ctags
    
    Add a Go ctags parser.

commit ccb15a31be106273a19a6c3d4dfa29f3adbb17a8
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Nov 7 17:09:53 2014 +0100

    Add the go ctags parser
    
    Make go one of the builtin filetypes, add the parser and update the related
    source and config files. While there, remove Rust from [Groups] in
    filetype_extensions.conf because it's already a builtin filetype as well.
    
    The parser itself is stolen from the fishman/ctags repo.

 data/Makefile.am                |   2 +-
 data/filetype_extensions.conf   |   2 +-
 data/filetypes.Go.conf          |  58 ----
 data/filetypes.go               |  57 ++++
 src/filetypes.c                 |   1 +
 src/filetypes.h                 |   1 +
 src/highlighting.c              |   2 +
 src/highlightingmappings.h      |   7 +
 src/symbols.c                   |  12 +
 tagmanager/ctags/Makefile.am    |   1 +
 tagmanager/ctags/go.c           | 687 ++++++++++++++++++++++++++++++++++++++++
 tagmanager/ctags/makefile.win32 |   2 +-
 tagmanager/ctags/parsers.h      |   3 +-
 tagmanager/src/tm_parser.h      |   1 +
 tests/ctags/Makefile.am         |   1 +
 tests/ctags/test.go             |  47 +++
 tests/ctags/test.go.tags        |  34 ++
 wscript                         |   1 +
 18 files changed, 857 insertions(+), 62 deletions(-)

commit af7d63cdf28945d2d177149a11565b24eaf4ee13
Merge: b78d833 72897ba
Author: Colomban Wendling <lists.ban@herbesfolles.org>
Date:   Sat Nov 29 23:40:58 2014 +0100

    Merge pull request #319 from b4n/better-txt2tags-parser
    
    Better txt2tags parser

commit b78d833d5c1ebe6bbd1f239da84b296a67bea30d
Merge: 6e1c278 24bf1d3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 29 23:21:09 2014 +0100

    Merge branch 'css3-flex'
    
    Closes PR#333.

commit 24bf1d3e930bb54191eac1f0e6d19e81dcb3abf4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 29 23:19:00 2014 +0100

    CSS: Add missing and remove obsolete flex properties
    
    See http://www.w3.org/TR/css3-flexbox/#property-index

 data/filetypes.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 50787dfafe9f20694cdaf66377539b919b6ec390
Author: Hannes Heute <haheute@gmail.com>
Date:   Wed Sep 17 20:02:42 2014 +0200

    CSS: Add some flex-properties to css3-properties

 data/filetypes.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6e1c2787c1ecf7d6a178d5c3cbaaa93240ca79cf
Merge: 173c09e 8da955e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 29 22:49:57 2014 +0100

    Merge branch 'recent-list-cleanup'

commit 173c09eab2afcd9549b75cd779bedca54fc9f718
Merge: e6b74d9 961ccf3
Author: Colomban Wendling <lists.ban@herbesfolles.org>
Date:   Sat Nov 29 22:48:01 2014 +0100

    Merge pull request #302 from kernc/common_linters
    
    Common linters by default in the Build menu

commit 961ccf38c5a50fbdfa9eea0ca481ac8a3a04f694
Author: Kernc <kerncece@gmail.com>
Date:   Thu Jul 17 22:03:43 2014 +0200

    Migrated some old-style build_settings to new-style build-menu

 data/filetypes.c       | 17 +++++++++--------
 data/filetypes.cpp     | 17 +++++++++--------
 data/filetypes.haskell | 13 ++++++-------
 data/filetypes.python  | 13 ++++++-------
 data/filetypes.ruby    | 10 +++++++---
 data/filetypes.sh      |  9 +++------
 6 files changed, 40 insertions(+), 39 deletions(-)

commit 7a0285eef857bf99361eedae3cfe125254b99f4c
Author: Kernc <kerncece@gmail.com>
Date:   Thu Jul 17 21:35:27 2014 +0200

    Added some default common linters in the Build menu

 data/filetypes.c          |  8 +++++++-
 data/filetypes.cpp        |  7 +++++++
 data/filetypes.haskell    |  8 ++++++++
 data/filetypes.javascript | 10 +++++-----
 data/filetypes.python     |  9 +++++++++
 data/filetypes.sh         |  8 ++++++++
 data/filetypes.xml        |  9 +++++++++
 doc/geany.txt             | 15 +++++++++++++++
 8 files changed, 68 insertions(+), 6 deletions(-)

commit e6b74d9d85149b687c4acd99ffd45f38554d178f
Merge: d0986dd 7ce2494
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 26 20:06:15 2014 +0100

    Merge branch nullEuro/coffeescript-ft
    
    Add CoffeScript syntax highlighting.
    
    Closes #230.

commit 7ce24941421a8305b37a372f1bcda4038ff539fa
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 26 19:42:26 2014 +0100

    coffeescript: Import last lexer version from Scintilla HG
    
    This fixes handling of "/*" and removes dead code.

 scintilla/lexers/LexCoffeeScript.cxx | 180 +++--------------------------------
 1 file changed, 13 insertions(+), 167 deletions(-)

commit 21e5c0e0e9bf6c28f83af3936836f9fca3e27cc9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 26 19:40:22 2014 +0100

    Fix Scintilla patch for CoffeeScript inclusion

 scintilla/scintilla_changes.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4074843b42218f59e7b1696f27e8306fd9b6c4ad
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 26 19:36:41 2014 +0100

    coffeescript: Recognize string and comment styles

 src/highlighting.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 07002d252a36b77d150536ffe0c860fa91f4f61d
Author: Mark Dresselhaus <m@rk-dresselhaus.de>
Date:   Mon Mar 24 00:55:59 2014 +0100

    Add coffescript syntax highlighting
    
    imported lexer from Scintilla and added coffeescript filetype

 data/Makefile.am                     |   1 +
 data/filetype_extensions.conf        |   1 +
 data/filetypes.coffeescript          |  48 +++
 scintilla/Makefile.am                |   1 +
 scintilla/lexers/LexCoffeeScript.cxx | 569 +++++++++++++++++++++++++++++++++++
 scintilla/makefile.win32             |   1 +
 scintilla/src/Catalogue.cxx          |   1 +
 src/filetypes.c                      |   1 +
 src/filetypes.h                      |   1 +
 src/highlighting.c                   |   2 +
 src/highlightingmappings.h           |  28 ++
 11 files changed, 654 insertions(+)

commit d0986dd3f606dcd564bc99829ff993a94737fd22
Merge: 846335b 55b4b86
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 24 03:55:55 2014 +0100

    Merge branch 'js-update'
    
    Import back JavaScript parser changes from CTags and fishman/ctags.

commit 55b4b867f31203ae13e651d65c57f94d6a0aa0cb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 24 03:50:00 2014 +0100

    javascript: Don't use invalid syntax in a test case
    
    A regex is not a valid JavaScript property name, and the test case was
    not meant to specifically check for handling of invalid syntax but
    rather valid regex syntax with embedded quotes.

 tests/ctags/1878155.js      | 2 +-
 tests/ctags/1878155.js.tags | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 5793694134f21652d4191dc56e087fa32c413ffb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 23 20:32:50 2014 +0100

    javascript: Add support for the `let` keyword
    
    `let` is not yet part of the current ECMAScript standard but is part of
    the ECMAScript 6 draft and is supported by Mozilla, and people already
    use it in some contexts.
    
    Also, the current ECMAScript standard marks `let` as a "considered
    reserved word" (7.6.1.2), so it is already a reserved keyword in strict
    mode.
    
    See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/let

 tagmanager/ctags/js.c      | 4 ++++
 tests/ctags/Makefile.am    | 1 +
 tests/ctags/js-let.js      | 8 ++++++++
 tests/ctags/js-let.js.tags | 8 ++++++++
 4 files changed, 21 insertions(+)

commit ef8c40f1e44e03059f34f7dc00ff82a8a089b10a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 23 19:31:09 2014 +0100

    javascript: Add support for the `const` keyword
    
    `const` is not yet part of the current ECMAScript standard but is
    part of the ECMAScript 6 draft and is supported by popular engines
    including Mozilla and WebKit, and people already use it.
    
    See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/const

 tagmanager/ctags/js.c        | 20 ++++++++++++++------
 tests/ctags/Makefile.am      |  1 +
 tests/ctags/js-const.js      | 10 ++++++++++
 tests/ctags/js-const.js.tags |  8 ++++++++
 4 files changed, 33 insertions(+), 6 deletions(-)

commit b85d7546102cdbe368cf130a37e67689f317fc81
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 23 17:09:02 2014 +0100

    javascript: Improve support for unterminated statements
    
    Add support for implicit semicolons so many unterminated statements'
    end are properly recognized.
    
    The implementation doesn't follow the ECMAScript standard because doing
    so requires to recognize precise grammar of all constructs, and the
    parser doesn't currently work this way.  So instead it uses some
    heuristics that should work most of the time and only consider implicit
    semicolons where they would be explicitly relevant to avoid most false-
    positives.  See the extensive comment in `readTokenFull()` for details.
    
    In practice, this mostly fixes handling of files using unterminated
    variable assignations like the following:
    
        var v1 = 0
        var v2 = 1
        // ...
        function f1() {
            // ...
        }
    
    In such situations the parser used not to be able to really tell where
    the variable assignation would end and would not recognize any
    statement before the next semicolon or closing curly brace at the same
    level.  In practice, it wouldn't have emitted any tag for this example,
    not even `v1` as it generates tags when reaching the statement's end.

 tagmanager/ctags/js.c                      | 133 +++++++++++++++++++++--------
 tests/ctags/Makefile.am                    |   1 +
 tests/ctags/js-implicit-semicolons.js      |  16 ++++
 tests/ctags/js-implicit-semicolons.js.tags |  15 ++++
 4 files changed, 131 insertions(+), 34 deletions(-)

commit f2b368e2cc507f9b074ff12f412ea222d273bb84
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Nov 21 02:06:14 2014 +0100

    javascript: Report function signature

 tagmanager/ctags/js.c                             | 147 +++++++++++++++-------
 tests/ctags/1795612.js.tags                       |   4 +-
 tests/ctags/1850914.js.tags                       |   2 +-
 tests/ctags/1878155.js.tags                       |   2 +-
 tests/ctags/1880687.js.tags                       |  80 ++++++------
 tests/ctags/2023624.js.tags                       |   4 +-
 tests/ctags/3470609.js.tags                       |   6 +-
 tests/ctags/Makefile.am                           |   1 +
 tests/ctags/arraylist.js.tags                     |   4 +-
 tests/ctags/bracematch.js.tags                    |  10 +-
 tests/ctags/bug1950327.js.tags                    |  12 +-
 tests/ctags/bug2888482.js.tags                    |   4 +-
 tests/ctags/bug3036476.js.tags                    |   6 +-
 tests/ctags/bug3571233.js.tags                    |  18 +--
 tests/ctags/complex-return.js.tags                |  34 ++---
 tests/ctags/js-class-related-unterminated.js.tags |  24 ++--
 tests/ctags/js-scope.js.tags                      |   6 +-
 tests/ctags/js-signature.js                       |  38 ++++++
 tests/ctags/js-signature.js.tags                  |  10 ++
 tests/ctags/js-sub-block-scope.js.tags            |  14 +--
 tests/ctags/js-unknown-construct-nesting.js.tags  |   6 +-
 tests/ctags/jsFunc_tutorial.js.tags               |  88 ++++++-------
 tests/ctags/no_terminator.js.tags                 |  10 +-
 tests/ctags/parenthesis-rvalue.js.tags            |  24 ++--
 tests/ctags/regexp.js.tags                        |   4 +-
 tests/ctags/secondary_fcn_name.js.tags            |   8 +-
 tests/ctags/shebang.js.tags                       |   2 +-
 tests/ctags/simple.js.tags                        |  34 ++---
 tests/ctags/ui5.controller.js.tags                |  10 +-
 29 files changed, 360 insertions(+), 252 deletions(-)

commit f65dec49e796fa7770d9ee1b56a570b7987a7aad
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 24 02:48:55 2014 +0100

    javascript: Fix more handling of class-related unterminated statements

 tagmanager/ctags/js.c                             |  5 ++++-
 tests/ctags/js-class-related-unterminated.js      | 12 ++++++++++++
 tests/ctags/js-class-related-unterminated.js.tags |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)

commit 9c84a91bb360653e96c38e8e1a31cce7b02696d8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 20 16:38:37 2014 +0100

    javascript: Fix scope inside nested blocks (if/else/while/for/etc.)

 tagmanager/ctags/js.c                  | 38 +++++++++++++++++-----------------
 tests/ctags/Makefile.am                |  1 +
 tests/ctags/js-sub-block-scope.js      | 17 +++++++++++++++
 tests/ctags/js-sub-block-scope.js.tags |  8 +++++++
 4 files changed, 45 insertions(+), 19 deletions(-)

commit e01ae923a15a01245dbe52d5023f9a8db5d17758
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 20 15:30:28 2014 +0100

    javascript: Cleanup `findCmdTerm()` callers a bit
    
    Move the check for unterminated inside `findCmdTerm()` itself and
    return it rather than having each caller do it itself.

 tagmanager/ctags/js.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

commit 7e6215661e64475a891921848149bd12a57c8a65
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 20 15:28:27 2014 +0100

    javascript: Fix handling some class-related unterminated statements

 tagmanager/ctags/js.c                             | 11 +++--
 tests/ctags/Makefile.am                           |  1 +
 tests/ctags/js-class-related-unterminated.js      | 50 +++++++++++++++++++++++
 tests/ctags/js-class-related-unterminated.js.tags | 13 ++++++
 4 files changed, 71 insertions(+), 4 deletions(-)

commit 5a1a22d9306fdf0e4352127b12cafd8555ea55b8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 19 23:39:15 2014 +0100

    javascript: Properly handle nested unknown blocks
    
    Properly match open curly braces when parsing a statement not to
    possibly get fooled by unexpected nested blocks, e.g. after a
    `switch`'s `case` or a label.
    
    This mostly reverts c54c3ad5e815d16e3b48f3c477465627808aadee and
    replaces it with a more correct and complete solution.

 tagmanager/ctags/js.c                            | 40 +++++++-----------------
 tests/ctags/Makefile.am                          |  1 +
 tests/ctags/js-unknown-construct-nesting.js      | 23 ++++++++++++++
 tests/ctags/js-unknown-construct-nesting.js.tags |  5 +++
 4 files changed, 40 insertions(+), 29 deletions(-)

commit f158f5d362404a3bec09c8841537e981ade5de2f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Nov 21 00:26:04 2014 +0100

    javascript: Fix scope after some constructs

 tagmanager/ctags/js.c              |  1 -
 tests/ctags/Makefile.am            |  1 +
 tests/ctags/js-scope.js            | 18 ++++++++++++++++++
 tests/ctags/js-scope.js.tags       |  4 ++++
 tests/ctags/ui5.controller.js.tags |  6 +++---
 5 files changed, 26 insertions(+), 4 deletions(-)

commit f886f7084a007feda682051fbdbbd533f2127460
Author: dfishburn <dfishburn@c5d04d22-be80-434c-894e-aa346cc9e8e8>
Date:   Fri Sep 19 19:03:59 2014 +0000

    Javascript parser: Removed warning of unused variable is_inside_class and cleanUp
    
    git-svn-id: https://svn.code.sf.net/p/ctags/code/trunk@815 c5d04d22-be80-434c-894e-aa346cc9e8e8

 tagmanager/ctags/js.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit c54c3ad5e815d16e3b48f3c477465627808aadee
Author: dfishburn <dfishburn@c5d04d22-be80-434c-894e-aa346cc9e8e8>
Date:   Wed May 7 20:37:00 2014 +0000

    Added new method findMatchingToken() to skip over blocks of code. Updated parseSwitch() to use the new method.
    
    Updated tests/ctags/ui5.ui.controller.js with code that broke the switch statement.
    
    git-svn-id: https://svn.code.sf.net/p/ctags/code/trunk@809 c5d04d22-be80-434c-894e-aa346cc9e8e8

 tagmanager/ctags/js.c              | 35 +++++++++++++++++++++++++++--------
 tests/ctags/ui5.controller.js      |  8 ++++++++
 tests/ctags/ui5.controller.js.tags |  1 +
 3 files changed, 36 insertions(+), 8 deletions(-)

commit 52d2d735272b2d9298aedbf202ed1853b840ada9
Author: dfishburn <dfishburn@c5d04d22-be80-434c-894e-aa346cc9e8e8>
Date:   Mon May 5 19:03:04 2014 +0000

    Udated jscript to be able to parse SAPUI5 controller and view files.
    
    Added test case tests/ctags/ui5.controller.js
    
    git-svn-id: https://svn.code.sf.net/p/ctags/code/trunk@808 c5d04d22-be80-434c-894e-aa346cc9e8e8

 tagmanager/ctags/js.c              | 55 ++++++++++++++++++++++++++++++++++++++
 tests/ctags/Makefile.am            |  1 +
 tests/ctags/ui5.controller.js      | 23 ++++++++++++++++
 tests/ctags/ui5.controller.js.tags |  5 ++++
 4 files changed, 84 insertions(+)

commit 846335b3f03c4d522a6e5ff99c08645c2faf9c7e
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Nov 18 17:28:28 2014 +0100

    Update of Japanese translation

 po/ja.po | 2897 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1469 insertions(+), 1428 deletions(-)

commit 50cbe660fa91fa10ac72229a945269368b3261eb
Merge: 299f624 58e01b2
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Nov 18 14:54:37 2014 +0100

    Merge pull request #382 from cousteaulecommandant/patch-3
    
    Update es.po

commit 58e01b2d248706fc22939cbed22a22d9c8c0d60d
Author: cousteaulecommandant <cousteaulecommandant@users.noreply.github.com>
Date:   Tue Nov 18 13:12:11 2014 +0100

    Update es.po
    
    Use same text in Split Window menu as in Keybindings dialog.
    Also, translate "Side by side" as "Izquierda y derecha" ("left and right") rather than "Yuxtapuestos" ("juxtaposed") which is a rather weird (and inaccurate) word.

 po/es.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 299f624f65cc5c5a1ee4be6f38053a2f7ebc2a4b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 11 18:55:54 2014 +0100

    Autotools: Fix checking for Git revision
    
    Fix check when building out of tree, and properly handle errors.

 m4/geany-revision.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c40263709f2143494dad939d510407ddd1fe26f6
Merge: 67cc8fa f765463
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 11 18:38:42 2014 +0100

    Merge branch 'css-update'

commit 8da955ec949b3d60a68402847703c2a16f617f70
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 11 17:28:57 2014 +0100

    Make the currently open project insensitive in the recent menu

 src/project.c  |  1 +
 src/ui_utils.c | 29 +++++++++++++++++++++++++++++
 src/ui_utils.h |  2 ++
 3 files changed, 32 insertions(+)

commit 3fa41cc0dadb3470a64f4511d394670d10712e5f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 11 17:01:34 2014 +0100

    Cleanup code for updating recent file menus

 src/ui_utils.c | 112 ++++++++++++++++++++++++---------------------------------
 1 file changed, 47 insertions(+), 65 deletions(-)

commit f765463af0aa8dad6d39399da2c138e8b5041bc4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 11 02:01:41 2014 +0100

    Import new CSS parser from fishman-ctags
    
    Some highlights:
    * Fixes handling of comments
    * Adds support for attribute and namespace selectors
    * Adds support for @supports blocks
    * Fixes tag type for many selectors
    * Adds support for pseudo-classes with arguments

 tagmanager/ctags/css.c                             | 388 +++++++++++----------
 tests/ctags/css-at-rules.css.tags                  |   4 +-
 tests/ctags/css-at-supports.css.tags               |   5 +-
 tests/ctags/css-attribute-selectors.css.tags       |  16 +-
 tests/ctags/css-namespace-selectors.css.tags       |   7 +-
 tests/ctags/css-pseudo-classes.css.tags            |  33 +-
 tests/ctags/css-simple.css.tags                    |  18 +-
 .../css-singlequote-in-comment-issue2.css.tags     |   1 +
 tests/ctags/css-tag-types.css.tags                 |  40 +--
 9 files changed, 264 insertions(+), 248 deletions(-)

commit 207279728317082bac040e7f32c50697919090b0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 11 01:59:12 2014 +0100

    Import CSS test cases from fishman-ctags

 tests/ctags/Makefile.am                            | 10 ++++++
 tests/ctags/css-at-rules.css                       | 27 +++++++++++++++
 tests/ctags/css-at-rules.css.tags                  |  3 ++
 tests/ctags/css-at-supports.css                    |  6 ++++
 tests/ctags/css-at-supports.css.tags               |  5 +++
 tests/ctags/css-attribute-selectors.css            |  6 ++++
 tests/ctags/css-attribute-selectors.css.tags       | 12 +++++++
 tests/ctags/css-comma-no-space.css                 |  1 +
 tests/ctags/css-comma-no-space.css.tags            |  3 ++
 tests/ctags/css-namespace-selectors.css            |  4 +++
 tests/ctags/css-namespace-selectors.css.tags       |  5 +++
 tests/ctags/css-pseudo-classes.css                 | 15 +++++++++
 tests/ctags/css-pseudo-classes.css.tags            | 23 +++++++++++++
 tests/ctags/css-simple.css                         | 27 +++++++++++++++
 tests/ctags/css-simple.css.tags                    | 11 +++++++
 tests/ctags/css-singlequote-in-comment-issue2.css  |  2 ++
 .../css-singlequote-in-comment-issue2.css.tags     |  2 ++
 tests/ctags/css-tag-types.css                      | 38 ++++++++++++++++++++++
 tests/ctags/css-tag-types.css.tags                 | 37 +++++++++++++++++++++
 tests/ctags/css-trivial.css                        |  5 +++
 tests/ctags/css-trivial.css.tags                   |  6 ++++
 21 files changed, 248 insertions(+)

commit 67cc8faf4be7778cda8c2901785b038319c1f01a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 9 22:14:12 2014 +0100

    Fix closing of the "missing file" infobar
    
    The issue was introduced in b646424ddb715382a937d233a75bc684c22e18ec as
    it removed the default handler that used to destroy the infobar.
    
    Now, the infobar is properly closed, but only if the action succeeded.
    
    Closes #375.

 src/document.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 4cc943666fae526ea3f0098ad0c34e5996872547
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 29 14:10:34 2014 +0100

    Autotools: MinGW: Fix building .res file in VPATH builds
    
    From a patch by Valentin Kunz, thanks!
    Part of https://sourceforge.net/p/geany/patches/17/

 geany_private.rc | 2 +-
 src/Makefile.am  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 1dc09597b24d19683abc597d45d7c28d37c199f0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 9 17:11:31 2014 +0100

    Fix check for fnmatch and remove strict dependency on it for Windows
    
    Strict dependency on fnmatch was removed in 52076d19e8fe7ab41ebc92928e.
    
    We still have an optional dependency on it from CTags, but I don't
    think we use this code, and anyways the checks we had for the optional
    path to be taken were incorrect, so it was never actually used.
    
    So, drop the dependency on libibrety for Windows builds, and fix the
    remaining checks for an optional fnmatch so if it is found it can
    actually be used.

 configure.ac      | 2 +-
 m4/geany-mingw.m4 | 2 --
 src/Makefile.am   | 2 +-
 wscript           | 3 ++-
 4 files changed, 4 insertions(+), 5 deletions(-)

commit fea71a282fe91629335167f2c05ff2239c8e02e4
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 9 11:22:16 2014 +0100

    Allow MRU file list length to be set to 0 to disable it
    
    Since the rest of the code is already prepared for it, setting mru_length
    to 0 just disables the recent files menu.

 data/geany.glade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aa06427c71ef337f0a80e8d3eb001771a226fece
Merge: 8c77acc d4135c9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 9 00:19:14 2014 +0100

    Merge branch 'plugin-symbols-protoypes'

commit 8c77accfd090c794e8eb1366772f417596052eb1
Merge: ba8ff71 fd4f31c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 8 19:37:20 2014 +0100

    Merge PR#356 from 'b4n/techee/tm'
    
    Huge TagManager improvements

commit ba8ff712b0b5d4cc08f0f6a89f5738e43a9ce3e9
Merge: 202ecf8 53101dd
Author: Colomban Wendling <lists.ban@herbesfolles.org>
Date:   Sat Nov 8 19:04:20 2014 +0100

    Merge pull request #374 from kugel-/for-upstream
    
    project: Remove unecessary calls after loading project files

commit fd4f31cc07fa86cc5287f493e7c2fad925b9868f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 8 18:34:15 2014 +0100

    Bump Geany API and ABI for TagManager API changes

 src/plugindata.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6a0673f4ae8d18ada42afb7f3df46929f540cc3f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 8 18:32:41 2014 +0100

    TM: Don't allow passing NULL to tm_workspace API

 src/dialogs.c                 | 11 +++++++----
 src/document.c                |  7 +++++--
 tagmanager/src/tm_workspace.c | 13 ++++++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

commit 0ed236db307d0bf76520bd8841a43b7d89dc8d8d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 8 18:10:48 2014 +0100

    TM: Fix some test results after sort changes from 90944c77

 tests/ctags/debian_432872.f90.tags   | 2 +-
 tests/ctags/keyword_explicit.cs.tags | 2 +-
 tests/ctags/keyword_implicit.cs.tags | 2 +-
 tests/ctags/keyword_names.f90.tags   | 2 +-
 tests/ctags/keyword_struct.cs.tags   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

commit b38f1f99d54d0f8a95d1485f38bc8bb10467a17c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 8 17:09:14 2014 +0100

    TM: Use gsize everywhere for the memory buffer size

 tagmanager/ctags/read.c         | 2 +-
 tagmanager/ctags/read.h         | 2 +-
 tagmanager/src/tm_source_file.c | 2 +-
 tagmanager/src/tm_source_file.h | 2 +-
 tagmanager/src/tm_workspace.c   | 4 ++--
 tagmanager/src/tm_workspace.h   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

commit 53101dd5fa3c622b60be2e99163f0469246e0bc9
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sat Nov 8 17:59:05 2014 +0100

    project: Remove unecessary calls after loading project files
    
    document_new_file_if_non_open() and ui_focus_current_document() only make sense
    when files where actually opened, but the preceeding
    configuration_load_session_files() only loads the file names into the global
    session_files variable, from which the files are actually opened by a later
    call to configuration_open_files(). These two calls should be done after that
    one and the callers generally do this already.

 src/project.c | 2 --
 1 file changed, 2 deletions(-)

commit 202ecf8bcbe0add75e242739fc47961bc98bcae1
Merge: 4e5ed01 e67f63d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Nov 7 16:31:23 2014 +0100

    Merge pull request #372 from cousteaulecommandant/patch-1
    
    "Execute commands" -> "Comandos de ejecución"

commit e67f63dd0b69b3c04d1d43e0b19cc0e0844fd726
Author: cousteaulecommandant <cousteaulecommandant@gmail.com>
Date:   Fri Nov 7 12:48:04 2014 +0100

    "Execute commands" -> "Comandos de ejecución"
    
    "Execute commands" (from the Set Build Commands dialog) is translated to Spanish as if it were a sentence (like "Execute these commands"), but it's actually a name ("<language> commands", "Independent commands", and "Execute commands"; so it means "Commands for 'execute'").  Therefore, +"Comandos de ejecución" is a better translation than -"Ejecutar comandos".

 po/es.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f441a121d3b13207467566b953dd6d18e1831db2
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Nov 6 11:38:40 2014 +0100

    Parse file from buffer only if the file isn't too big
    
    By loading e.g. a huge DB dump into memory we could run out of memory.
    Check the size of the file and determine whether to use file parsing
    or buffer parsing.
    
    Give up early if LANG_IGNORE set - there's no need to read the file in
    this case.

 tagmanager/src/tm_source_file.c | 45 +++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

commit 0ad85aee04a03ca395bff0b1426575beda1ecd46
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Nov 5 20:58:52 2014 +0100

    Fix comment wording

 tagmanager/src/tm_workspace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a95fc1a994a90e4bf3d1a27a4dc4accdc14fa91c
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Nov 5 20:52:03 2014 +0100

    Don't expose the source file update function to plugins

 plugins/geanyfunctions.h      |  2 --
 src/document.c                |  2 +-
 src/plugindata.h              |  1 -
 src/plugins.c                 |  1 -
 tagmanager/src/tm_workspace.c | 16 +++++++---------
 tagmanager/src/tm_workspace.h |  4 ++--
 6 files changed, 10 insertions(+), 16 deletions(-)

commit 90944c77b0c304de28d26297687c12383d76ef39
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Nov 5 20:21:33 2014 +0100

    Unify tag sorting and simplify tag comparison function
    
    Use the same (or compatible) sorting criteria everywhere.
    
    Add tm_tag_attr_line_t to sort options so even after merging file tags
    into workspace tags, the same tags defined at different lines are preserved
    and not removed as duplicates.
    
    Sort type before scope because it's cheaper to compare (string vs int comparison).
    
    For some reason, the above changes make the sorting performance worse.
    Simplify the tag comparison function a bit and reorder the case statements
    in the switch to match the sort order. This (again not sure why), makes the
    performance like before.

 tagmanager/src/tm_tag.c       | 32 +++++++++++++-------------------
 tagmanager/src/tm_workspace.c | 41 ++++++++++++++++++++++++++---------------
 2 files changed, 39 insertions(+), 34 deletions(-)

commit 29000cf10465ab739e688eee711ba14ecfbfba7f
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Nov 3 11:29:39 2014 +0100

    Always parse buffer instead of file
    
    This brings the linux kernel parsing time from about 20s to 12s on my machine.

 tagmanager/src/tm_source_file.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

commit 448f1fd20ef8b640a4702e3d47da1fc086cad0b6
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Nov 3 10:57:58 2014 +0100

    Make sure gboolean tm_source_file_parse() returns the right value
    
    Previously, after finishing the while loop TRUE was returned - this is
    wrong because the while was running because parsing was unsuccessful.
    Make it work the same way as in ctags (parser() always succeeds,
    parser2() returns whether to retry or not).
    
    (The return value actually isn't used, it's just to make sure we know
    what we are doing.)

 tagmanager/src/tm_source_file.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit f35d0b9c0c8f54b75eff4f12bc762cc5ced0d390
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Nov 2 11:34:44 2014 +0100

    Move tm_get_current_tag() from tm_workspace to tm_tag
    
    This function has nothing to do with the workspace so it rather belongs
    to tm_tag.

 tagmanager/src/tm_tag.c       | 41 +++++++++++++++++++++++++++++++++++++++++
 tagmanager/src/tm_tag.h       |  2 ++
 tagmanager/src/tm_workspace.c | 40 ----------------------------------------
 tagmanager/src/tm_workspace.h |  2 --
 4 files changed, 43 insertions(+), 42 deletions(-)

commit 71cc1ecb2084deb9e3c7dd8ba1e88946a1767280
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Oct 31 23:26:16 2014 +0100

    Cleaner and safer TMWorkspace API
    
    With the previous TMWorkspace API it was possible to make the workspace
    inconsistent by e.g. removing source files and forgetting to update
    workspace. This could lead to non-obvious and not immediately visible
    crashes.
    
    The new set of the public (but also Geany private) API calls always
    updates the workspace accordingly and neither of the calls can lead
    to an inconsistent state of the workspace.
    
    In addition, perform some minor cleanups and simplifications - unify
    parsing from buffer and from file, support "parsing" of 0-sized buffers
    and improve documentation.

 plugins/geanyfunctions.h        |  10 +-
 src/dialogs.c                   |   2 +-
 src/document.c                  |  17 +-
 src/plugindata.h                |   9 +-
 src/plugins.c                   |   5 +-
 tagmanager/src/tm_source_file.c |  96 ++++-------
 tagmanager/src/tm_source_file.h |   7 +-
 tagmanager/src/tm_workspace.c   | 366 ++++++++++++++++++++++------------------
 tagmanager/src/tm_workspace.h   |  13 +-
 9 files changed, 259 insertions(+), 266 deletions(-)

commit 48718f4b792914ce206e5b423d4dfbf240bba4de
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Oct 31 20:25:59 2014 +0100

    Remove an unused parameter

 tagmanager/src/tm_tag.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 013c47c6e3edf5ed556e5cc1ebe2bf28c3600f42
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Oct 31 20:25:13 2014 +0100

    TM: Fix various integer signedness issues

 tagmanager/src/tm_source_file.c |  4 ++--
 tagmanager/src/tm_tag.c         | 12 ++++++------
 tagmanager/src/tm_workspace.c   | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

commit 61ee7de86ecd5e10cf077b9c519d818013f52b8b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Oct 31 20:19:47 2014 +0100

    Return an unisgned tag count in tm_tags_find()
    
    There is no reason to return a signed value an it help unifying
    caller's types.

 tagmanager/src/tm_source_file.c | 2 +-
 tagmanager/src/tm_tag.c         | 6 +++---
 tagmanager/src/tm_tag.h         | 2 +-
 tagmanager/src/tm_workspace.c   | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)

commit 42a9603f4a1e5ec4a0dc7b74c6964fdf7bb7c10d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Oct 31 20:07:27 2014 +0100

    Use TMTagType everywhere to hold tag types

 src/editor.c                  |  2 +-
 src/symbols.c                 | 12 ++++++------
 tagmanager/src/tm_tag.c       |  8 ++++----
 tagmanager/src/tm_tag.h       |  2 +-
 tagmanager/src/tm_workspace.c | 22 ++++++++++++----------
 tagmanager/src/tm_workspace.h |  6 +++---
 6 files changed, 27 insertions(+), 25 deletions(-)

commit 4e5ed012f29f57f1e82c0bca23ea621f8504a7f5
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 30 17:12:14 2014 +0000

    Recommend Glade 3.8.5, add link for fishman ctags fork

 HACKING | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit d7ed48f86be3957afb155edcb5a9c16afdc4054f
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Oct 31 02:03:13 2014 +0100

    Fix a problem in tm_tags_remove_file_tags() when more tags of the same name exist

 tagmanager/src/tm_tag.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit cb9e4bbf7446e45365cad2242087f2a766662f20
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Oct 30 19:36:10 2014 +0100

    Microoptimization in merge
    
    Improves performance by about 10%.

 tagmanager/src/tm_tag.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit bdee1336aa11d2064c6f71661697cfe84bc0d658
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Oct 30 18:46:46 2014 +0100

    Keep a separate list of typenames for Scintilla syntax highlighting
    
    Manage the list the same way as workspace tags_array by the fast tag removal
    and merge. Thanks to this, typename tags don't have to be extracted from
    tags_array periodically, which speeds up editing.

 src/document.c                |  3 +--
 src/highlighting.c            | 19 +------------------
 src/symbols.c                 | 16 ++++++----------
 src/symbols.h                 |  4 +---
 tagmanager/src/tm_tag.c       |  5 +++++
 tagmanager/src/tm_tag.h       |  3 +++
 tagmanager/src/tm_workspace.c | 33 ++++++++++++++++++++++++++-------
 tagmanager/src/tm_workspace.h |  1 +
 8 files changed, 44 insertions(+), 40 deletions(-)

commit 32a3dfab7f6e75f102a2cac79c6ce3eac7c2a216
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Oct 30 16:57:33 2014 +0100

    Use binary search when removing file tags
    
    Even though the binary search requires expensive string comparisons,
    there are just log(n) of them to find the tag in the workspace array
    and the result is much faster than scanning the array linearly (this
    of course works only under the condition that
    
    len(source_file->tags_array) << len(workspace_array)
    
    This is however satisfied for big projects (and doesn't matter for small
    projects).
    
    Also make the tm_tags_find() function more user friendly by returning
    tagCount 0 when no tags found.

 tagmanager/src/tm_tag.c | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

commit be131b00f9822309089c61a053125378bdefa005
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 29 16:13:02 2014 +0100

    Extend dedup() and  merge() to unref the duplicate tag when needed

 src/editor.c                  |  2 +-
 src/symbols.c                 |  2 +-
 tagmanager/src/tm_tag.c       | 21 +++++++++++++++------
 tagmanager/src/tm_tag.h       |  8 +++++---
 tagmanager/src/tm_workspace.c | 18 +++++++++---------
 5 files changed, 31 insertions(+), 20 deletions(-)

commit 6ba3bb46a455040a8780fd494a99d080913800d9
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 29 15:28:12 2014 +0100

    Don't pass arguments to search/sort functions using static variables
    
    Instead of qsort() it's possible to use g_ptr_array_sort_with_data() with
    similar performance. Unfortunately it seems there's no bsearch_with_data()
    anywhere so the patch uses a modified bsearch() implementation from libc
    (still probably cleaner than passing arguments using static variables).

 tagmanager/src/tm_tag.c | 99 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 34 deletions(-)

commit 15c90b63c9b6e21ac7485f06023ea3b92724d6ba
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 29 13:53:16 2014 +0100

    Get rid of lazy initialization in TM
    
    Lazy initializing various member pointers doesn't bring any real performance
    improvement but it requires lots of additional NULL checks - get rid of
    this.
    
    Make some more cleanups on the way.
    
    In addition, remove success/failure return values from tm_workspace_add_source_file()
    and tm_workspace_remove_source_file() which have no real use.

 src/document.c                  |   7 +-
 src/plugindata.h                |   4 +-
 tagmanager/src/tm_source_file.c |  24 ++----
 tagmanager/src/tm_tag.c         |  62 +++++++--------
 tagmanager/src/tm_workspace.c   | 162 ++++++++++++----------------------------
 tagmanager/src/tm_workspace.h   |   4 +-
 6 files changed, 92 insertions(+), 171 deletions(-)

commit 43b8ab8d236850bec929d981d05122dfabca99c7
Author: Jiří Techet <techet@gmail.com>
Date:   Tue Oct 28 00:07:24 2014 +0100

    Only keep the minimal set of parameter in the TM API calls
    
    Avoid "utility" parameters like do_free for which we already have API calls
    and which actually don't perform any free if the source file isn't
    in TM. Clarify when to set the update_workspace parameter.

 src/dialogs.c                 |  3 ++-
 src/document.c                |  6 ++++--
 src/plugindata.h              |  2 +-
 tagmanager/src/tm_workspace.c | 26 +++++++++++++-------------
 tagmanager/src/tm_workspace.h |  2 +-
 5 files changed, 21 insertions(+), 18 deletions(-)

commit 0285ec28a5c813cd5c82b1ad390b584e122c1873
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Oct 27 23:44:20 2014 +0100

    Move tm_source_file_update() to tm_workspace.c
    
    The placement of this function in tm_source_file is not right - by moving
    it to the workspace we can make the source file unaware of the existence
    of the workspace (no inclusion of tm_workspace.h in tm_source_file any
    more). Also change tm_source_file_new() so it doesn't offer the source file
    update.
    
    After this change
    * TMWorkspace knows TMSourceFile and TMTag
    * TMSourceFile knows TMTag
    * TMTag knows TMSourceFile

 plugins/geanyfunctions.h        |   4 +-
 src/document.c                  |   4 +-
 src/plugindata.h                |   4 +-
 src/plugins.c                   |   2 +-
 tagmanager/src/tm_source_file.c | 102 +++-------------------------------------
 tagmanager/src/tm_source_file.h |  11 ++---
 tagmanager/src/tm_workspace.c   | 102 ++++++++++++++++++++++++++++++++++++----
 tagmanager/src/tm_workspace.h   |   9 ++--
 8 files changed, 117 insertions(+), 121 deletions(-)

commit cfcbc6a2056100c741514b6df8d02438854d26cd
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 30 12:50:55 2014 +0000

    Make Next/Previous Message keybindings work without a document open

 src/keybindings.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 4546b6f7a660f0aa81d115baa06a75bd1b608505
Merge: fc5d8d1 41dcde6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 27 21:19:57 2014 +0100

    Merge pull request #363 from techee/prj_dialog
    
    Always set project description and file patterns in the dialog

commit 41dcde623db0c785e6bf7fc64a7117f7f8774aea
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Oct 27 20:58:59 2014 +0100

    Always set project description and file patterns in the dialog
    
    Set them also when they are NULL in the project (which happens when new
    project is created) because otherwise there are left-over values from
    the previous project.

 src/project.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

commit fc5d8d145a7b14e8e3a82fa55e9b489c1a2285c6
Merge: a7a893a 36c155c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 27 19:24:09 2014 +0100

    Merge pull request #362 from ntrel/fb-cmd
    
    Make File Browser use explorer as default open command on Windows

commit a7a893a22f15078d498ea6c61ba0a3c79aa8b85b
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Oct 26 23:44:19 2014 +0100

    Set -O2 compiler flag by default for gcc
    
    But only if no other optimization flags could be found.

 wscript | 2 ++
 1 file changed, 2 insertions(+)

commit 36c155cbe855f4c05425d868fa4194ee165ca362
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Oct 26 15:06:16 2014 +0000

    Make File Browser use explorer as default open command on Windows

 plugins/filebrowser.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 233ca08e886f6a1d543aa87fc454057e61a20e0c
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Oct 25 22:29:21 2014 +0200

    Add project_write_config() to force project file rewrite
    
    Since plugins don't have direct access to the project file,
    only through the project-save signal, they need some way to emit this
    signal when saving their preferences outside the project dialog,
    which is what this function does.

 plugins/geanyfunctions.h |  2 ++
 src/plugindata.h         |  8 ++++++++
 src/plugins.c            |  7 ++++++-
 src/project.c            | 12 ++++++++++++
 src/project.h            |  3 +++
 5 files changed, 31 insertions(+), 1 deletion(-)

commit a183d9cb97c3adde33e6a7dfd08591d802bc2316
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 22 16:58:38 2014 +0200

    Move the refcount TMTag member up in the structure and don't document it for plugins

 tagmanager/src/tm_tag.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 11866938ccbc77cec7b1e600c65efb175d1bca96
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 22 16:23:07 2014 +0200

    Remove unused return value

 tagmanager/src/tm_tag.c | 2 +-
 tagmanager/src/tm_tag.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6ef41c65a9504f54bab17253359edaafb9d771fa
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 22 16:14:59 2014 +0200

    Various cleanups in the merge algorithm
    
    Remove the continue statement and use if/else instead. Initialize the
    val1 variable only with the value used for the chosen path (normal/fast).

 tagmanager/src/tm_tag.c | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

commit 9a2a55a252a0c456b8a18a79da1d55eb1393329c
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 22 16:04:06 2014 +0200

    Reinclude tm_tag.h in tm_workspace.c
    
    To make Colomban happy.

 tagmanager/src/tm_workspace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d8b178e4cbf4c0569a4b5c67e8c48f566d58a5b1
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 22 15:59:36 2014 +0200

    Whitespace changes

 tagmanager/src/tm_source_file.c | 48 ++++++++++++++++++++---------------------
 tagmanager/src/tm_workspace.c   |  4 ++--
 tagmanager/src/tm_workspace.h   | 12 +++++------
 3 files changed, 32 insertions(+), 32 deletions(-)

commit 11ea0ed637efc299b129aebc3d7ead71303a884f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 22 15:06:14 2014 +0200

    Remove some dead code

 tagmanager/src/tm_tag.c       | 1 -
 tagmanager/src/tm_workspace.c | 2 --
 2 files changed, 3 deletions(-)

commit a671c1e26d94bccf68120b327ea2002b9d10ab0c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 22 15:05:35 2014 +0200

    Fix signed vs unsigned comparisons

 tagmanager/src/tm_tag.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit d4135c9842bb7fc0c8701fc47a1ab148bed5e992
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 20 17:55:32 2014 +0200

    Add prototypes for all plugin symbols
    
    This allows the compilers to check that the plugin's symbols have the
    proper prototype.  Doing so can avoid subtle and hard-to-find bugs in
    case a plugin's symbol has incorrect signature as dlsym() can't check
    if the signature is actually the one we expect.
    
    As a bonus, it helps when using -Wmissing-prototypes as it provides the
    prototypes.

 src/plugindata.h | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

commit c35dedf35f95511d0e4f9fd204ddee5dddd1a409
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 20 16:17:19 2014 +0200

    Rename internal plugin_init() to avoid confusion with plugins entry point

 src/plugins.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 62332e19aa9182593dccea5f21fcd1c34b99f144
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Oct 18 13:46:01 2014 +0200

    Since lang is now always part of TMTag, always set its value
    
    This makes it less confusing for code accessing TMTag so it can always
    find the language in tag->lang and there is no need to access it through
    tag->file.lang.

 src/symbols.c                 | 5 +----
 tagmanager/src/tm_tag.c       | 1 +
 tagmanager/src/tm_tag.h       | 4 +---
 tagmanager/src/tm_workspace.c | 6 +-----
 4 files changed, 4 insertions(+), 12 deletions(-)

commit 54a9fd83ea0c98b6ba34fe7cd75f1e3a73daa0be
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Oct 18 12:34:05 2014 +0200

    Get rid of the nested members in TMTag
    
    The only real change is the removal of struct and union in TMTag, the
    rest is purely mechanical removal of "atts.entry." everywhere.

 src/editor.c                    |  26 +++----
 src/sidebar.c                   |   2 +-
 src/symbols.c                   |  64 ++++++++--------
 tagmanager/src/tm_source_file.c |   4 +-
 tagmanager/src/tm_tag.c         | 160 ++++++++++++++++++++--------------------
 tagmanager/src/tm_tag.h         |  36 ++++-----
 tagmanager/src/tm_workspace.c   | 108 +++++++++++++--------------
 7 files changed, 198 insertions(+), 202 deletions(-)

commit 48725e4188764b71b97f4e68291f89a222d91a5d
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Oct 18 12:24:21 2014 +0200

    Get rid of the file struct in TMTag, preparation for the union removal
    
    The union on TMTag is very confusing and rather dangerous. The fields
    file/timestamp and line/lang overlap. Some implicit assumptions are made
    in the code - timestamp is never set so when file is NULL, the file
    struct should be used to get the lang member. Rather avoid using unions
    and move the lang member to the entry struct together with the other
    attributes.

 src/symbols.c                 |  9 +++++----
 tagmanager/src/tm_tag.c       |  2 +-
 tagmanager/src/tm_tag.h       | 11 ++++-------
 tagmanager/src/tm_workspace.c |  4 ++--
 4 files changed, 12 insertions(+), 14 deletions(-)

commit a7c6e0733fab4a236bdc0b0bba756b2b522391a8
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Oct 18 12:04:12 2014 +0200

    Remove tm_tag_file_t and all its uses
    
    File tags aren't used for anything in geany and neither the existing
    global tag files seem to use them - remove this concept from geany.

 tagmanager/src/tm_tag.c | 109 ++++++++++++++----------------------------------
 tagmanager/src/tm_tag.h |   2 +-
 2 files changed, 33 insertions(+), 78 deletions(-)

commit 0f9b778ae55b74c688970a532baf5ac99d607980
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Oct 17 22:37:17 2014 +0200

    Fix division by 0

 tagmanager/src/tm_tag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9eefdb0efcdc22d3d65e6f1d4e975f225eb18569
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Oct 17 00:43:33 2014 +0200

    Where possible, convert functions to static in TM

 tagmanager/src/tm_source_file.c | 90 ++++++++++++++++++++---------------------
 tagmanager/src/tm_source_file.h | 13 ------
 tagmanager/src/tm_tag.c         | 10 ++---
 tagmanager/src/tm_tag.h         | 10 -----
 tagmanager/src/tm_workspace.c   |  2 +-
 tagmanager/src/tm_workspace.h   |  2 -
 6 files changed, 51 insertions(+), 76 deletions(-)

commit 034ef6d79de3bf61907894674cc8efadfadd5bde
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Oct 17 00:15:07 2014 +0200

    Remove the unused (and misleading) tm_tag_free()
    
    It just calls unref() which might not actually free the tag if the refnum
    is more than 1.

 tagmanager/src/tm_tag.c | 10 ----------
 tagmanager/src/tm_tag.h |  6 ------
 2 files changed, 16 deletions(-)

commit 344eca020474fb3ce948af529c318bd719f09ba9
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Oct 17 00:12:54 2014 +0200

    Add #if 0 around unused TM functions and move them to the end of the file
    
    Similarly, add #if TM_DEBUG around various unused debugging functions.
    
    The #if 0 surrounded functions are good candidate for future removal
    if decided they are not needed any more.

 tagmanager/src/tm_source_file.c |  69 ++++-----
 tagmanager/src/tm_source_file.h |   2 -
 tagmanager/src/tm_tag.c         |   4 +
 tagmanager/src/tm_tag.h         |   5 +
 tagmanager/src/tm_workspace.c   | 318 ++++++++++++++++++++--------------------
 tagmanager/src/tm_workspace.h   |  16 +-
 6 files changed, 212 insertions(+), 202 deletions(-)

commit 2c09333b6a3deb4f38a0b70888122829cc6e3818
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Oct 16 23:26:52 2014 +0200

    Remove unused tm_tags_custom_sort() and tm_tags_custom_dedup() and friends

 tagmanager/src/tm_tag.c | 49 ++-----------------------------------------------
 tagmanager/src/tm_tag.h | 18 +++---------------
 2 files changed, 5 insertions(+), 62 deletions(-)

commit 4e98021689fbc744b75a773f5095d4f7472f4430
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Oct 16 23:14:09 2014 +0200

    Swap the merge arguments if len(small_array) > len(big_array)

 tagmanager/src/tm_tag.c       | 30 +++++++++++++++++++++---------
 tagmanager/src/tm_tag.h       |  2 +-
 tagmanager/src/tm_workspace.c |  4 ++--
 3 files changed, 24 insertions(+), 12 deletions(-)

commit fe98ea61564d4195f9d7619f48b4983f5417eece
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Oct 16 23:06:40 2014 +0200

    Use the new merge implementation also for global tags

 tagmanager/src/tm_tag.c       | 46 -------------------------------------------
 tagmanager/src/tm_tag.h       |  3 ---
 tagmanager/src/tm_workspace.c | 14 +++++++++++--
 3 files changed, 12 insertions(+), 51 deletions(-)

commit 0470f45e0cac539efed63e3f01d519ac01623f74
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 15 15:05:19 2014 +0200

    TM: move function descriptions from headers to sources
    
    To make it consistent with the rest of Geany.

 tagmanager/src/tm_source_file.c |  78 ++++++++++++++++++++
 tagmanager/src/tm_source_file.h |  79 --------------------
 tagmanager/src/tm_tag.c         | 154 ++++++++++++++++++++++++++++++++++++++-
 tagmanager/src/tm_tag.h         | 156 ----------------------------------------
 tagmanager/src/tm_workspace.c   |  80 ++++++++++++++++++++-
 tagmanager/src/tm_workspace.h   |  83 +--------------------
 6 files changed, 311 insertions(+), 319 deletions(-)

commit 4903d79dcc7ed1e8e0d54f85f00d07dbb62e33dc
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 15 14:20:06 2014 +0200

    TM: use the same format of docstrings as in the rest of Geany

 tagmanager/src/tm_source_file.h |  78 ++++++-------
 tagmanager/src/tm_tag.h         | 248 ++++++++++++++++++++--------------------
 tagmanager/src/tm_tagmanager.h  |   8 +-
 tagmanager/src/tm_workspace.c   |   2 +-
 tagmanager/src/tm_workspace.h   |  92 +++++++--------
 5 files changed, 214 insertions(+), 214 deletions(-)

commit 74706374eb1afcf8e3db422365f722e33dd1715a
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Oct 15 13:49:10 2014 +0200

    Remove the unused inactive flag in TM
    
    It is set only when read from a file but it never gets written to the file
    with the TRUE value.

 tagmanager/src/tm_source_file.c |  1 -
 tagmanager/src/tm_source_file.h |  1 -
 tagmanager/src/tm_tag.c         | 14 ++------------
 tagmanager/src/tm_tag.h         |  3 +--
 4 files changed, 3 insertions(+), 16 deletions(-)

commit d686674ecae5e6c5dc889741d6a96c783b5678e4
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Oct 12 22:36:03 2014 +0200

    On single file update only merge the file's tags into workspace tags
    
    Since both the file tags and workspace tags are sorted, it is unnecessary
    to completely resort the tags for the workspace - instead, remove the
    tags belonging to the file from the workspace tags and merge the updated
    file's tags into the workspace tags.
    
    The merge is optimized for merging small number of tags into a large array.
    For instance, the total number of tags in linux kernel is about 2300000
    while the average number of tags per file is about 65 (35000 source files).
    Most of the time merge won't be performed so we can avoid expensive
    string comparisons and try to make bigger jumps to see if some merge is
    needed or not (more details in the source file comments).

 tagmanager/src/tm_source_file.c |  16 +++++-
 tagmanager/src/tm_tag.c         | 113 ++++++++++++++++++++++++++++++++++++++++
 tagmanager/src/tm_tag.h         |   4 ++
 tagmanager/src/tm_workspace.c   |  28 +++++++++-
 tagmanager/src/tm_workspace.h   |   3 ++
 5 files changed, 160 insertions(+), 4 deletions(-)

commit 8c25ff871c2770fe5a53974f8e0ed6f482dee1ab
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Oct 12 21:26:44 2014 +0200

    Make tm_workspace_update() public

 plugins/geanyfunctions.h      |  2 ++
 src/plugindata.h              |  1 +
 src/plugins.c                 |  3 ++-
 tagmanager/src/tm_workspace.h | 10 +++++-----
 4 files changed, 10 insertions(+), 6 deletions(-)

commit 52076d19e8fe7ab41ebc92928ef7832c248a51f2
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Oct 10 23:04:45 2014 +0200

    Remove unused tm_file_entry.[ch]

 tagmanager/src/Makefile.am     |   2 -
 tagmanager/src/makefile.win32  |   3 +-
 tagmanager/src/tm_file_entry.c | 281 -----------------------------------------
 tagmanager/src/tm_file_entry.h | 124 ------------------
 tagmanager/src/tm_tagmanager.h |   1 -
 wscript                        |   1 -
 6 files changed, 1 insertion(+), 411 deletions(-)

commit 26587454b043971d3f1557a5bace257a51125eba
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Oct 10 16:18:06 2014 +0200

    Remove TmWorkObject and all the OO related stuff
    
    In addition, rename all functions, parameters, comments etc. mentioning
    work_object and remove unnecessary parameters of various functions.
    Delete dead code paths.
    
    Also move common functions like tm_get_real_path() from tm_work_object to
    tm_source_file.

 doc/Doxyfile.in                 |   2 -
 doc/Makefile.am                 |   1 -
 plugins/geanyfunctions.h        |  12 +-
 src/dialogs.c                   |   2 +-
 src/document.c                  |  16 +--
 src/document.h                  |   4 +-
 src/editor.c                    |   2 +-
 src/main.c                      |   2 +-
 src/plugindata.h                |  11 +-
 src/plugins.c                   |   6 +-
 src/symbols.c                   |  41 +++---
 tagmanager/src/Makefile.am      |   3 -
 tagmanager/src/makefile.win32   |   2 +-
 tagmanager/src/tm_file_entry.c  |   3 +-
 tagmanager/src/tm_source_file.c | 195 ++++++++++++++++++--------
 tagmanager/src/tm_source_file.h |  61 ++++----
 tagmanager/src/tm_tag.c         |   5 +-
 tagmanager/src/tm_tagmanager.h  |   1 -
 tagmanager/src/tm_work_object.c | 298 ----------------------------------------
 tagmanager/src/tm_work_object.h | 191 -------------------------
 tagmanager/src/tm_workspace.c   | 157 +++++++--------------
 tagmanager/src/tm_workspace.h   |  60 +++-----
 wscript                         |   3 +-
 23 files changed, 287 insertions(+), 791 deletions(-)

commit 94a7762f9136b7a0a31a6547f4b15d2925546e77
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Oct 18 19:52:38 2014 +0200

    Small update of German translation

 po/de.po | 88 +++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 46 insertions(+), 42 deletions(-)

commit d42837f021105c1060f7b31ff527478fca2acb70
Merge: 5a243fd 6242d19
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Oct 18 18:13:45 2014 +0200

    Merge pull request #351 from techee/guards
    
    Protect private definitions by the GEANY_PRIVATE macro in headers

commit 5a243fd2241059da111f5078bade141d0b0711bc
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Oct 15 17:33:57 2014 +0200

    Explicitly define Windows version for older Mingw environments

 wscript | 3 +++
 1 file changed, 3 insertions(+)

commit 608ab0f60c4475da960686841a6dee761998fefe
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 14 23:18:38 2014 +0200

    Document the fact utils_spawn_sync() accepts NULL for all output arguments

 src/utils.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit c38f59bbc422e2e39eeb1e5bdae2258214a0e86a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 13 23:53:00 2014 +0200

    autotools: Only uninstall what we actually installed
    
    Only manually uninstall the files we manually installed, as
    uninstall-local might be run in parallel to Automake's own uninstall
    targets.
    
    We don't uninstall the directories as some docs seems to suggest
    `rmdir` isn't really portable.  Anyway, Automake don't uninstall
    directories either so it's not a real problem.
    
    An alternative solution would be to keep the recursive removal of
    `$(DOCDIR)` but move it to `uninstall-hook`, which is guaranteed to be
    run after other uninstall rules.  However, recursive deletion is not
    always sensible as it might remove files we didn't install, e.g. if the
    user added them manually.

 doc/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 16716e498d133a627f593007b96d8b5d83e0f1d5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 13 23:52:22 2014 +0200

    autotools: Remove new Doxygen temporary files

 doc/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0650e707f14096ca224790da97d1cde0c483c78f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 13 23:50:50 2014 +0200

    autotools: Properly clean up hacking.html
    
    We don't distribute it, so we need to clean it.

 doc/Makefile.am | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 75af73875f9b03eaca657991bebdd5be63415968
Author: elextr <elextr@gmail.com>
Date:   Mon Oct 13 12:41:05 2014 +1100

    Add note about -D_FILE_OFFSET_BITS=64

 README.Packagers | 3 +++
 1 file changed, 3 insertions(+)

commit 6242d1947195b322573bf6c8246d9b7561a271c2
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Oct 12 23:49:52 2014 +0200

    Add all headers to libtagmanager_a_SOURCES in tag manager makefile
    
    So they become part of tarball.

 tagmanager/src/Makefile.am | 7 +++++++
 1 file changed, 7 insertions(+)

commit dbcf67d449542007b0a8e8ffe276c8bf7f3a11a0
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Oct 12 23:37:00 2014 +0200

    Define the GEANY_PRIVATE macro for tag manager in makefile.win32

 tagmanager/src/makefile.win32 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6d6dd7444b57b41cf657f61f6c514afead12e598
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Oct 12 23:33:51 2014 +0200

    Fix doxygen warnings
    
    Make documents_array public and accessible by doxygen and describe all
    parameters of tm_source_file_new().

 src/document.h                  | 3 +--
 tagmanager/src/tm_source_file.h | 7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

commit f5230f334e28248c91fa6f58f3557f0b40f40233
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 12 17:58:26 2014 +0200

    Fix moving editor tabs through keybindings

 src/keybindings.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit 9caa0046bd9956cdc36a36dd3e6b63a747e1f3ea
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Oct 12 16:40:12 2014 +0200

    Prepare Windows installer for embedded GTK 2.24

 geany.nsi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 3966ba8c4b2656c12bed7a5bf96a39eadc49d5a7
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Oct 12 16:35:46 2014 +0200

    Query GdkWindow reference only if available
    
    On startup, the Geany main window doesn't have a GdkWindow yet
    (probably because it is not yet mapped). This causes many
    'gdkdrawable-win32.c:2013 drawable is not a pixmap or window'
    warnings when resolving shortcuts on Windows.
    Since we pass the SLR_NO_UI to the Windows API, we probably
    don't need the parent hWnd reference at all.

 src/win32.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 75ab7103f1b8d5e48a07474a09e0542d2a449f04
Merge: 2d59f11 f1da4b9
Author: Colomban Wendling <lists.ban@herbesfolles.org>
Date:   Sun Oct 12 16:02:40 2014 +0200

    Merge pull request #353 from b4n/tm-no-update-on-quit
    
    Don't rebuild TagManager workspace tags when quitting

commit 2d59f110df184516305aa4c98a12a4bf736652d9
Merge: 8298501 ab7a001
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Oct 12 13:27:00 2014 +0100

    Merge pull request #350 from ntrel/reload-prompt
    
    Don't prompt for reload from infobar when there are no unsaved changes

commit 82985017179d295121b3fd8e45eee07c85ed1f83
Merge: eb7fd06 700e0b9
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Oct 12 10:27:31 2014 +0200

    Merge pull request #344 from marcelocamargobr/master
    
    Changed wrong translation of identation

commit eb7fd066b12aa505614d0f8c51a9c191d17808cc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Oct 11 14:52:14 2014 +0200

    Don't alter GeanyEditor internal state in editor_create_widget()
    
    When editor_create_widget() is used on an editor with already existing
    widget, don't reset the internal indentation settings of that editor.

 src/editor.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 41c66e0eb06358b9ab07ae5564370331ea452b52
Author: Matthew Brush <matt@geany.org>
Date:   Fri Oct 10 18:40:54 2014 -0700

    Change "replace_and_find_by_default" default to true

 doc/geany.txt | 2 +-
 src/keyfile.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit bae420a768975aa1d4818121eec80098d9e0064a
Merge: 0362a22 3df962a
Author: Matthew Brush <matt@geany.org>
Date:   Fri Oct 10 18:02:29 2014 -0700

    Merge branch 'rpalli/replace1'
    
    Closes #189

commit f1da4b99146d261ec2e640bfb64ef5eee548f035
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Oct 11 01:40:10 2014 +0200

    Don't rebuild TagManager workspace tags when quitting
    
    Updating the workspace is useless as the application will be shut down,
    and not doing it can save a lot of time (almost 50% speedup quitting an
    instance with all Geany source from `src/` open).

 src/document.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ab7a0018b2518793f26af2fe20a06a8a1886e031
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Oct 7 14:43:33 2014 +0100

    Don't prompt for reload from infobar when there are no unsaved changes
    
    Also warn about losing undo history when there are no changes.

 src/document.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit 0362a2281b1d558b42992a82a988f09a9d631425
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Oct 10 16:41:01 2014 +0100

    Define _WIN32_IE for SHGFP_TYPE

 win32-config.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 3df962a37152d697b1258aae7267c2a8b845f1b9
Author: Roland Pallai <rpallai@magex.hu>
Date:   Fri Oct 10 00:26:25 2014 +0200

    A small styling of the documentation

 doc/geany.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9b2ccb9965266f1dcda93e3fa17c64389201ad59
Author: Roland Pallai <rpallai@magex.hu>
Date:   Thu Oct 9 23:57:03 2014 +0200

    Turn "replace and find by default" boolean pref into a "various" preference.

 data/geany.glade | 17 -----------------
 doc/geany.txt    |  8 +++++---
 src/keyfile.c    |  2 ++
 src/search.c     |  5 +----
 src/search.h     |  2 +-
 5 files changed, 9 insertions(+), 25 deletions(-)

commit 10a28b4191f1c7343d80b249f707e23147a6d320
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Oct 9 20:51:32 2014 +0200

    Protect private definitions by the GEANY_PRIVATE macro in headers
    
    In addition, this patch defines the GEANY_PRIVATE macro for the tag
    manager library where it wasn't defined before, removes 2 tag manager
    headers from distribution as they are not needed by plugins and
    in the tag manager changes the docstrings to ordinary comments for
    private definitions.

 src/app.h                       |   5 ++
 src/build.h                     |  89 ++++++++++++++--------------
 src/dialogs.h                   |  29 ++++++----
 src/document.h                  |  93 ++++++++++++++++--------------
 src/editor.h                    | 113 ++++++++++++++++++------------------
 src/encodings.h                 | 105 ++++++++++++++++++----------------
 src/filetypes.h                 |  24 +++++---
 src/geany.h                     |  13 +++--
 src/highlighting.h              |  15 +++--
 src/keybindings.h               |  27 +++++----
 src/main.h                      |  17 ++++--
 src/msgwindow.h                 |  30 +++++-----
 src/navqueue.h                  |   9 ++-
 src/prefs.h                     |  11 ++--
 src/project.h                   |   4 ++
 src/sciwrappers.h               | 124 +++++++++++++++++++++++-----------------
 src/search.h                    |  56 +++++++++---------
 src/stash.h                     |  30 ++++++----
 src/symbols.h                   |   9 ++-
 src/templates.h                 |  38 ++++++------
 src/toolbar.h                   |   5 ++
 src/ui_utils.h                  | 105 ++++++++++++++++++----------------
 src/utils.h                     |  97 ++++++++++++++++---------------
 tagmanager/src/Makefile.am      |   3 +-
 tagmanager/src/tm_file_entry.h  |  42 +++++++-------
 tagmanager/src/tm_source_file.h |  36 ++++++------
 tagmanager/src/tm_tag.h         |  63 ++++++++++----------
 tagmanager/src/tm_tagmanager.h  |   4 +-
 tagmanager/src/tm_work_object.h |  59 ++++++++++---------
 tagmanager/src/tm_workspace.h   |  34 ++++++-----
 wscript                         |   5 +-
 31 files changed, 717 insertions(+), 577 deletions(-)

commit 985829afe06a9b07832669a7be4f7a06d96008f6
Author: Roland Pallai <rpallai@magex.hu>
Date:   Thu Oct 9 02:07:58 2014 +0200

    Documentation change for the "Replace&Find by default" behaviour.

 doc/geany.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2cae5f337b98ab7318c8b2ec3ca7a3165a390ef7
Author: Roland Pallai <rpallai@magex.hu>
Date:   Thu Oct 9 02:00:30 2014 +0200

    Better preferences sentence for the "Replace&Find by default" behaviour.

 data/geany.glade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 245ae6696cfd8ec391531cd7057f29772d40726d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Oct 7 15:30:19 2014 +0100

    Require WINVER=WindowsXP for SHGetFolderPathAndSubDirW

 win32-config.h | 2 ++
 1 file changed, 2 insertions(+)

commit c0a8a1a9434a5d2b47e9cabcda19b3f2fceaf023
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Oct 7 14:50:07 2014 +0100

    Fix Windows build

 tagmanager/src/makefile.win32 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 63266a1254e9cf7fbce30d4588f611437a3a0810
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Mon Oct 6 17:28:10 2014 +0200

    Remove unused variable

 src/win32.c | 1 -
 1 file changed, 1 deletion(-)

commit b1b9e6d19a3983de02aebebd49496407ca722a91
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 6 16:24:26 2014 +0200

    Fix configuration directory location on non-Windows
    
    3e089e4c2c914a4b8885daa65e784a227bd2d6b0 accidentally switched from
    `g_get_user_config_dir()` to `g_get_user_data_dir()` as the location
    for the user's configuration directory.

 src/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e69bbe25fd49d8a31a06bed395bcc9c65efa0563
Merge: fa20ec4 541cb8d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Oct 6 12:20:54 2014 +0100

    Merge pull request #342 from ntrel/save-disk-check
    
    Force disk check before save to prevent accidental overwriting

commit fa20ec4ffb89a8f5e9e0a4506565dbd144af2835
Merge: 1737579 7a8c091
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Oct 6 12:20:15 2014 +0100

    Merge pull request #343 from ntrel/more-project-prefs
    
    Add project prefs for line breaking column & multiline comment completion

commit 17375793ad84fa18631cefa9792c01ad92d26e92
Merge: 3e089e4 ce46f8f
Author: Colomban Wendling <lists.ban@herbesfolles.org>
Date:   Sun Oct 5 23:50:08 2014 +0200

    Merge pull request #347 from techee/master
    
    Remove unused tag manager files

commit ce46f8f0b4f67cc76971ae2d4b0e8afc578fbba5
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Oct 5 22:28:54 2014 +0200

    Remove unused tm_tagmanager.c

 tagmanager/src/Makefile.am     |  1 -
 tagmanager/src/tm_tagmanager.c | 11 -----------
 wscript                        |  1 -
 3 files changed, 13 deletions(-)

commit 464632387837ef0ebe237b79fbf7debef25a2860
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Oct 5 19:26:37 2014 +0200

    Remove unused tm_symbol

 tagmanager/src/Makefile.am     |   2 -
 tagmanager/src/tm_symbol.c     | 319 -----------------------------------------
 tagmanager/src/tm_symbol.h     |  80 -----------
 tagmanager/src/tm_tagmanager.h |   1 -
 wscript                        |   3 +-
 5 files changed, 1 insertion(+), 404 deletions(-)

commit b512aa0368b3431852e11a9ba93f5b9fdb5353f8
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Oct 5 19:19:35 2014 +0200

    Remove unused tm_project and all its references in docstrings

 tagmanager/src/Makefile.am      |   2 -
 tagmanager/src/tm_project.c     | 568 ----------------------------------------
 tagmanager/src/tm_project.h     | 207 ---------------
 tagmanager/src/tm_source_file.c |   2 +-
 tagmanager/src/tm_source_file.h |   4 +-
 tagmanager/src/tm_tagmanager.h  |   3 +-
 tagmanager/src/tm_work_object.c |   2 +-
 tagmanager/src/tm_work_object.h |  12 +-
 tagmanager/src/tm_workspace.c   |  10 +-
 tagmanager/src/tm_workspace.h   |  15 +-
 wscript                         |   3 +-
 11 files changed, 22 insertions(+), 806 deletions(-)

commit 3e089e4c2c914a4b8885daa65e784a227bd2d6b0
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Oct 5 12:55:33 2014 +0200

    Reading the config directory from the Windows API instead of GLib
    
    Before we used g_get_user_config_dir() but GLib changed the returned
    location in newer versions, so use the Windows API directly
    to get the old location, at least for now.
    Also add utils_get_user_config_dir() wrapper.
    
    Code is based almost completely on a patch from Matthew.

 src/main.c  |  2 +-
 src/utils.c | 10 ++++++++++
 src/utils.h |  2 ++
 src/win32.c | 27 +++++++++++++++++++++++++++
 src/win32.h |  2 ++
 5 files changed, 42 insertions(+), 1 deletion(-)

commit 700e0b906fc84bcb3149c84c660da82e46032243
Author: Marcelo Camargo <marcelocamargo@linuxmail.org>
Date:   Sat Oct 4 00:13:47 2014 -0300

    Updated last translator

 po/pt_BR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5e01664777cc4fc3bd7237a8d60d21f2b6c69b12
Author: Marcelo Camargo <marcelocamargo@linuxmail.org>
Date:   Fri Oct 3 23:53:03 2014 -0300

    Changed wrong translation of identantion
    
    In portuguese, there is no "endentação", but "indentação".

 po/pt_BR.po | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

commit 7a8c091af09e5cc0ea8ead68007901905f262cc6
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Oct 3 17:42:23 2014 +0100

    Reformat g_signal_connect calls

 src/project.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit e566aae6b2218eb1d3689340c3d9eebc0b96cbf4
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 2 17:50:39 2014 +0100

    Add project prefs for line breaking column & multiline comments

 data/geany.glade     | 152 +++++++++++++++++++++++++++++++++++++++++++++------
 src/editor.c         |  19 +++----
 src/editor.h         |   7 +--
 src/project.c        |   5 ++
 src/projectprivate.h |  14 +++--
 5 files changed, 161 insertions(+), 36 deletions(-)

commit f262f5986da5e04a1761daa2ef9212e26d68d99b
Merge: 5df59ce 6d2d2ff
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Thu Oct 2 11:48:01 2014 -0700

    Merge pull request #341 from philippwiesemann/fix-typo-readme
    
    Fix typo in README

commit 6d2d2ffee9f128ab9dd47a76dca1474e8b70ead6
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Wed Oct 1 23:41:01 2014 +0200

    Fix typo in README

 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 541cb8dbccdab127a08e63855cea00f0f5608787
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Sep 26 12:00:07 2014 +0100

    Force disk check before save to prevent accidental overwriting
    
    Useful e.g. with Save All when the modified file is not the current tab.

 src/document.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 5df59cefcb5ce45c13b4f35dc52bfa8680abbe22
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 30 16:31:44 2014 +0200

    Fix build with GLib 2.20
    
    Don't use `g_regex_get_compile_flags()` that is new in 2.26, but we
    only depend on 2.20.
    
    Closes #340.

 src/search.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 52a0c3160673b9a019f9a7d09485dee1d881d4e4
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Sep 29 23:34:14 2014 +0200

    Update of German translation

 po/de.po | 71 ++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 38 insertions(+), 33 deletions(-)

commit 9eb865dab366ca8de07b7d1ff34cef71d092b513
Merge: 2b98487 bbf63d1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Sep 29 16:16:50 2014 +0100

    Merge pull request #337 from ntrel/project-line-wrap
    
    Project line wrapping pref

commit bbf63d131a84a099c9e1627ac5ec321985052fb4
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Sep 25 17:47:05 2014 +0100

    Fixups
    
    Fix adding stash group and applying defaults.
    Don't let Properties dialog override per-document line wrapping state.
    Use "editor" for key group name.
    Remove code already handled by stash group.

 src/editor.c  | 26 ++++++++++----------------
 src/project.c | 29 ++++++++++++++---------------
 2 files changed, 24 insertions(+), 31 deletions(-)

commit cb2aebcfd98c8c53a98ffe00f33b7497c9c3f34a
Author: Tim Tassonis <stuff@decentral.ch>
Date:   Thu Sep 25 12:43:34 2014 +0100

    Enable per-project line wrapping

 data/geany.glade     | 16 ++++++++++++++++
 src/editor.c         | 13 +++++++++++++
 src/project.c        | 10 ++++++++++
 src/projectprivate.h |  1 +
 4 files changed, 40 insertions(+)

commit 2b98487a70953fc268a5fa76c774f1c676adf0d2
Merge: 96806bf 3ab6579
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Sep 26 11:45:27 2014 +0100

    Merge pull request #335 from ntrel/save-cleanup
    
    Notify user when trying to save read-only document

commit 3ab65790910c494cf94db67d7e65bd5738aae6f1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 24 16:57:16 2014 +0100

    Notify user when trying to save read-only document

 src/document.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 4ceb9fb1f27b7a73631566bf0f3df273fe16f7db
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 24 16:49:33 2014 +0100

    Add comment about throwing away read-only for renamed documents

 src/document.c        | 1 +
 src/documentprivate.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 96806bf639d08038c1406854c7e031bdc18b3313
Merge: 187dca2 d7aa4b5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Sep 26 00:31:03 2014 +0200

    Merge branch 'scintilla-update-351-pre'

commit d7aa4b591622a09e0c7c1c16a548ba99f05f01ab
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Sep 26 00:20:18 2014 +0200

    Update for new Scintilla styles

 data/filetypes.sql         | 1 +
 data/filetypes.vhdl        | 1 +
 src/highlightingmappings.h | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

commit 1e59b15c618720bad5036c39b203a41114d41002
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Sep 26 00:09:04 2014 +0200

    Update Scintilla to 3.5.1 pre-release

 scintilla/gtk/PlatGTK.cxx         |  29 ++++++---
 scintilla/gtk/ScintillaGTK.cxx    |   2 +-
 scintilla/include/SciLexer.h      |  10 +++
 scintilla/include/Scintilla.h     |   5 ++
 scintilla/include/Scintilla.iface |  23 +++++++
 scintilla/lexers/LexSQL.cxx       |  32 +++++++++-
 scintilla/lexers/LexVHDL.cxx      | 124 +++++++++++++++++++++++++++++++-------
 scintilla/scintilla_changes.patch |   3 +-
 scintilla/src/Document.cxx        |  14 +++--
 scintilla/src/EditModel.cxx       |   1 +
 scintilla/src/EditModel.h         |   2 +
 scintilla/src/EditView.cxx        |  13 ++--
 scintilla/src/EditView.h          |   4 +-
 scintilla/src/Editor.cxx          |  17 +++---
 scintilla/src/Editor.h            |   1 -
 scintilla/src/Indicator.h         |   7 ++-
 scintilla/src/RESearch.cxx        |   3 +-
 scintilla/src/ViewStyle.cxx       |  12 +---
 scintilla/version.txt             |   2 +-
 19 files changed, 229 insertions(+), 75 deletions(-)

commit 187dca29573f9247dab607738274341b08e105a1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 23 14:37:01 2014 +0200

    Use named constants everywhere for msgwin/compiler internal columns

 src/msgwindow.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

commit 88a36268efd91b91f188024019c01ed68896667d
Merge: ed0fa45 9d669a7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Sep 25 11:53:16 2014 +0100

    Merge pull request #334 from ntrel/confirm-infobar-reload
    
    Confirm infobar reload when document has modifications

commit 9d669a72f74b9433b9ad8f40f1a1424c77f3172d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 24 17:22:01 2014 +0100

    API: Rename document_reload_file -> document_reload_force
    
    New name is clearer against document_reload_prompt.
    Add deprecated alias.

 plugins/geanyfunctions.h | 4 ++--
 src/document.c           | 4 ++--
 src/document.h           | 2 +-
 src/plugindata.h         | 6 ++++--
 src/plugins.c            | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

commit ed0fa4538f3b3b296e38203591a07d7c33b4c6cb
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Sep 24 20:09:15 2014 +0200

    Update of German translation

 po/de.po | 381 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 194 insertions(+), 187 deletions(-)

commit b646424ddb715382a937d233a75bc684c22e18ec
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 24 12:06:33 2014 +0100

    Only close reload infobar if the response succeeded

 src/document.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

commit 3830240cb8a7b0a7699125b1870d5169b2dcdf70
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Sep 23 15:38:02 2014 +0100

    Confirm info-bar reload when document has modifications

 src/document.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 09411956ada70783dac30de1f29d36613d8caf65
Merge: ae45e83 0a80a72
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 24 12:20:03 2014 +0100

    Merge pull request #326 from ntrel/reload-modified
    
    Don't set document text as changed when file on disk is newer

commit 0a80a72f0bbf2ca883c50cccc8540910a9c9969d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 3 15:22:10 2014 +0100

    Set status id to STATUS_DISK_CHANGED when protecting document

 src/document.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 9a02525d1c27bd3a5256162940916ccebb5e619a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Aug 27 16:32:25 2014 +0100

    Don't set document text as changed when file on disk is newer
    
    Setting the document text as changed makes it too easy to accidentally
    overwrite the file - e.g. when closing you're reminded to save it.
    It also makes it slower to close documents you no longer want open.
    Setting text as changed is still done if the user cancels the warning.

 src/document.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit ae45e8344f20968cc2f1655a63471ca447dd16ab
Merge: 22ab163 06e40e5
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Sep 23 15:24:48 2014 +0100

    Merge pull request #328 from ntrel/infobar-save
    
    Confirm whether to save protected documents instead of ignoring save

commit 06e40e512fd4d88aeed8401e6e433ea24bc31e18
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 3 17:43:17 2014 +0100

    Confirm whether to save protected documents
    
    (Reuses existing strings).

 src/document.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

commit 7450a992b51f239ce2a3c10d375ebe9dcec2301e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Sep 4 11:53:32 2014 +0100

    Use 'Overwrite' rather than Save for clarity in reload infobar

 src/document.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a6d11cb4f848ea6a9bb3d0fdf367e30fdb4694f1
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Mon Jun 9 12:31:35 2014 +0200

    Use custom document info bar response IDs

 src/document.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit 22ab1631debcd64b761dfc436c30fc027e6954dc
Merge: 34f7ce9 0843705
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 22 19:38:46 2014 +0200

    Merge branch 'scintilla/autoc-sizing'
    
    Backport changes applied upstream not to hard-code auto-completion popup
    frame border size.

commit 34f7ce9cc993b9aec41c36fa04fa196cc4f7b402
Merge: 634a4b1 20c31b6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 22 19:38:41 2014 +0200

    Merge branch 'about-banner-fix'

commit 084370560896ad50a3030136cc7739eaf189a26f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 16 23:06:36 2014 +0200

    GTK: Don't hardcode auto-completion popup frame border width

 scintilla/gtk/PlatGTK.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 20c31b62ff0289ba51954e10f315c8bd96eb9ce3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 22 19:25:03 2014 +0200

    Fix custom about dialog style overriding
    
    Don't assume changing the style inside a style-set handler results in
    recursion, as it would be wrong if the next signal emission was
    triggered asynchronously.  Instead, only modify the style if it isn't
    already as we want it.
    
    This fixes the about dialog's style-set handlers on GTK 3.10 which
    didn't liked constant style updating.

 src/about.c | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

commit 76d6e9faa900773bcc45e0f947b532c9a5233af0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 22 18:19:20 2014 +0200

    Revert "Fix GTK frame clock warnings with our about dialog"
    
    This reverts commit ec7071062c5dc39d5f893a830b3c26968a579251.
    
    Apparently the selected state of an event box doesn't necessary mean it
    will be styled with a selection background color.  This e.g. isn't the
    case in GTK 3.14's Adwaita (default) theme.
    
    So, revert the commit that removed custom style overrides.  Next commit
    will fix the GTK 3.10 problem this reverted commit fixed.

 src/about.c | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

commit 634a4b111fd14eec9045653bb328c018285aa6ec
Author: Matthew Brush <matt@geany.org>
Date:   Wed Sep 17 16:45:32 2014 -0700

    Highlight C types from tags in C++ code
    
    Useful for when using, for example, GTK+, SDL, and other C-only APIs
    in files with the C++ filetype. Before only the symbol auto-completion
    worked, but not the highlighting of type names.
    
    TODO: figure out why taking something like SDL.c.tags and making a copy
    as SDL.cpp.tags doesn't work, once that's fixed, this extra condition
    could probably be removed.

 src/symbols.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 87592539b4bbbeb2e4117f075c604369ea79a546
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Sep 17 20:20:20 2014 +0200

    Update of Polish translation

 po/pl.po | 2958 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1495 insertions(+), 1463 deletions(-)

commit e42cd4d6e920daea6c48512a8d69cc0cc3fc1232
Merge: e84cf12 069e2d4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 15 16:03:43 2014 +0200

    Merge branch 'scintilla/autoc-sizing'
    
    Backport changes applied upstream to fix auto-completion popup sizing.

commit e84cf128cbf85ffba4fb2176b5ae7057838fe720
Merge: 93c9e2c df5b2fd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 15 16:03:13 2014 +0200

    Merge branch 'scintilla/gtk3-dead-windows'
    
    Backport patches applied upstream to cache auto-completion windows,
    hopefully avoiding dead popup windows lying around on GTK3 builds in
    some high stress scenarios.

commit 069e2d4ec56f84436682cddfe06e6b4ca9d0576c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Sep 12 18:09:18 2014 +0200

    GTK: Fix auto-completion popup sizing on some themes

 scintilla/gtk/PlatGTK.cxx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit 4d66bd3745eb3759539b116e7784d11d035ebd44
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Sep 12 17:08:34 2014 +0200

    GTK: Allow the auto-completion popup to be as small as needed

 scintilla/gtk/PlatGTK.cxx | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

commit d1e519c11dec18e6738b80b3c76f16935f82f3ad
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Sep 11 14:37:20 2014 +0200

    GTK: Fix auto-completion popup width to better fit contents

 scintilla/gtk/PlatGTK.cxx | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

commit 61eaf23a266d3fa0d00e3d148b1d128906b46fac
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Sep 11 14:37:12 2014 +0200

    GTK: Fix auto-completion popup height to better fit contents

 scintilla/gtk/PlatGTK.cxx | 52 +++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

commit 93c9e2ce860d09e74b642ef50a6961d91f3177e5
Merge: d6d836c 683c380
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Sep 12 19:34:11 2014 +0200

    Merge pull request #331 from scriptum/rpg-translate-ru
    
    Update of Russian translation

commit 683c380d10d828e10c7be98d793ddc9425be32ea
Author: Pavel Roschin <roshin@scriptumplus.ru>
Date:   Fri Sep 12 19:14:38 2014 +0400

    Update of Russian translation

 po/ru.po | 2923 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1491 insertions(+), 1432 deletions(-)

commit d6d836c59fc522fcbb96fab7917311c2c6613ea7
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Thu Sep 11 19:16:24 2014 +0200

    Don't match regexes on empty strings
    
    Save As on an empty document would cause warnings like:
    sys:1: Warning: g_regex_match_full: assertion 'string != NULL' failed
    because SCI_GETRANGEPOINTER returns NULL then.
    On a Ubuntu 12.04 system this warning even crashed Geany at writing the
    log message.
    So, simply don't search for anything if the document is empty.

 src/search.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 7d38ff67ecf18f9f331ed1fad849878a6089097d
Merge: d6a9a44 df5b2fd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Sep 10 23:23:01 2014 +0200

    Merge branch 'scintilla/gtk3-dead-windows'
    
    Backport patches applied upstream to cache auto-completion windows,
    hopefully avoiding dead popup windows lying around on GTK3 builds in
    some high stress scenarios.

commit df5b2fd81065650259a87b8eb901343d36676e59
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Sep 4 00:04:54 2014 +0200

    GTK: fix cached completion popup window sizing
    
    Only cache the popup window itself and not its content, as it seems the
    window sizing is affected whether the content was just created or not.

 scintilla/gtk/PlatGTK.cxx | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

commit e6f8547e3e0d9ad42e7abdd360e4f3b2aac7b534
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 1 20:03:13 2014 +0200

    GTK: cache the completion popup window
    
    This avoids creating and destroying windows quickly under stress, which
    may lead to XID collisions.
    
    See e.g. https://bugzilla.gnome.org/show_bug.cgi?id=581526 and
    https://bugzilla.gnome.org/show_bug.cgi?id=590690
    
    Closes [scintilla:bugs:1649].

 scintilla/gtk/PlatGTK.cxx | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

commit d6a9a44efebacf4eaf9dc4ce5f866402dd7c22ec
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Sep 7 19:13:16 2014 +0200

    Update of German translation

 po/de.po | 2909 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1482 insertions(+), 1427 deletions(-)

commit 22700ab332ac459f4bd4609b0243360881095d5c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Sep 7 18:55:07 2014 +0200

    Update of Swedish translation

 po/sv.po | 128 +++++++++++++++++++++------------------------------------------
 1 file changed, 42 insertions(+), 86 deletions(-)

commit a733bf9b2a7e04156a60f43ed2c41b4090b63762
Merge: d2ce3d6 7047152
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Sep 1 17:01:41 2014 +0100

    Merge pull request #327 from ntrel/open-file-exists
    
    Allow user to edit open dialog filename when file doesn't exist

commit d2ce3d6fa11223a636483b517a545d8d55975ea2
Merge: 666fdf3 0453991
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 29 17:07:08 2014 +0200

    Merge branch 'doc/untrack-geany.html'

commit 666fdf30fa776566dbbaccaaf7aec67427b2e322
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 29 15:30:24 2014 +0200

    Document document_find_by_id() parameter so Doxygen is happy

 src/document.c | 1 +
 1 file changed, 1 insertion(+)

commit 6e755985a8e8847fed176dea21976dc2eefbed3e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 29 15:22:49 2014 +0200

    Update Doxyfile

 doc/Doxyfile.in | 2382 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1479 insertions(+), 903 deletions(-)

commit 0453991a61c57550555327707c3ecdefcf4de009
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 29 16:58:26 2014 +0200

    Don't try to install the HTML documentation if we don't have it

 doc/Makefile.am      | 5 +++++
 m4/geany-docutils.m4 | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

commit 7125075168198f00f66001cbeaeb3d2318c0abf7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 29 16:48:01 2014 +0200

    Fix HTML documentation installation for VPATH builds

 doc/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit f219ea1b38d06c15e8e53a705c1aa09f04bf97fb
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Aug 29 16:12:40 2014 +0200

    Cleanup apidoc and hackingdoc commands to use ctx.top_dir and ctx.out_dir
    
    This should be cleaner and safer than using '../' mixed with os.chdir().

 wscript | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 5bd878cb7cab25beed42166e42fe67690207e9fe
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Aug 29 15:46:44 2014 +0200

    Reuse ConfigurationContext when searching for programs if we have one
    
    This enables proper logging when checking for rst2html during configuration.

 wscript | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 9307a6877c75169118672e453c55b54fd9a6ab3b
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Aug 29 15:40:47 2014 +0200

    Explicitly specify extensions when searching for rst2html
    
    This is cleaner than searching for rst2html and rst2html.py since Waf
    offers the API for this and this change enables Windows support.
    While at it, add binary name 'rst2html2' for ArchLinux support.

 wscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6ecf750759b0611542586818b27a0638f23fb97f
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Aug 29 14:39:26 2014 +0200

    The missing bits for HTML docs: only on GIT build and support in-tree geany.html

 wscript | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 8961f0b6e96de3591aa30b3886572147c4321c2f
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Aug 29 14:27:12 2014 +0200

    Add option --disable-html-docs

 wscript | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 985cd9146ffae3ab6022c5127946f6f594378a2e
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Aug 29 14:13:57 2014 +0200

    Add "hackingdoc" as proper action and remove non-working --hackingdoc option

 wscript | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 15c2fafff6b76cb6d7e2032840832bae14a5aa7b
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Aug 29 14:11:14 2014 +0200

    Update Waf to 1.7.16

 waf | Bin 90923 -> 91846 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

commit 8d5e666d9eab5518f300b45a71295027b2e9047a
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Aug 29 14:10:56 2014 +0200

    Build HTML documentation automatically during the build process
    
    This is an improvement as requested in #322 to update the HTML docs
    after geany.txt or geany.css have changed.
    Also, with this change the resulting HTML will be generated in the outdir,
    not in srcdir/doc anymore.

 wscript | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

commit 7047152a1f3ee79cd4e08dd77d1fe9039acc9834
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Aug 29 12:18:53 2014 +0100

    Allow user to edit open dialog filename when file doesn't exist

 src/dialogs.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

commit 82cd83183c93f912c5610d58249a6a2f4afef70b
Merge: 102169e ee79b2e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Aug 27 19:07:22 2014 +0200

    Merge branch 'doc/auto-enable-api'
    
    Closes PR#324.

commit 102169ee3200176178bfd2290ae5db45b545df4f
Merge: 2f68158 64910a4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Aug 27 19:06:22 2014 +0200

    Merge branch 'doc/untrack-geany.html'
    
    Closes PR#322.

commit 64910a4ea1f3f902ffa08dfdf6422c8e69ad98fd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Aug 27 19:02:24 2014 +0200

    Fix Waf build after HTML documentation untracking

 wscript | 5 +++++
 1 file changed, 5 insertions(+)

commit 2f6815841de2d0abea7fdb0629802a0dad54af14
Merge: d62fd48 18181c2
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Aug 27 16:19:33 2014 +0100

    Merge pull request #256 from ntrel/doc-id
    
    Support pseudo-unique IDs for documents

commit d62fd48b44c5d404440e34143a74991b972ca427
Merge: 132b93c 355f0c8
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Aug 27 16:17:03 2014 +0100

    Merge pull request #315 from ntrel/move-session
    
    Properly handle existing session when creating new project

commit 355f0c804ebab24e03339aa6498bd7f0d79a7883
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Aug 22 12:00:33 2014 +0100

    Fix GLib warning 'app->project == NULL failed'
    
    Occurred on Project->New with an existing project when closing an
    unsaved file was cancelled.

 src/project.c | 10 +++++-----
 src/project.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 5964d2e086d60005fd677e9c107729a78ecd37bf
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Aug 21 17:15:21 2014 +0100

    Properly close abandoned new project that couldn't be written
    
    Also rewrite the default session in case it was cleared.

 src/project.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

commit 132b93c591f79907f16360e133a43886f7bba1c2
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Aug 25 13:31:12 2014 +0200

    SQL: Adding print to list of keywords
    
    e.g. used to 'print' debug output to log on e.g. Sybase ASA

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee79b2eb3f8f79112eca28c4974b355bdbef230e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Aug 23 18:33:50 2014 +0200

    Enable API documentation generation automatically when possible

 m4/geany-doxygen.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 32bda2e6cb1d6c0ecafebd70c12f3e09d1aae269
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Aug 23 18:22:52 2014 +0200

    Don't clean HTML manual if we didn't build it
    
    Clean the HTML manual upon 'maintainer-clean' rather than 'clean' in
    case it was not built by Make but rather part of the distribution.
    This is fine even then, as configure will properly require what is
    needed to build it again if it is missing.

 doc/Makefile.am | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 74006b069c1525af2d52cc8d488d8cbe03dd43a1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Aug 23 18:14:56 2014 +0200

    Cleanup doc Makefile so that each conditional set all its targets
    
    Don't set clean-local and all-local dependencies all together at the
    end and rather let each section add the appropriate dependencies.
    This makes each conditional more self-contained, and is safe as Make
    allows adding extra dependencies to existing targets.

 doc/Makefile.am | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

commit 288b4f29d8a62a5cc2baa6f0ddefa6a3fe201ade
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Aug 23 17:56:14 2014 +0200

    Enable HTML manual building by default but for distribution tarballs
    
    Enable building of the HTML manual by default unless not building from
    Git and with an existing local copy (which is included in distribution
    tarballs).
    
    This makes sure we can install the HTML manual without having it
    checked in VCS, yet not require rst2html for tarball builds.

 m4/geany-docutils.m4 | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit c990cd9dca40ac67a7404ed2ba36b3c6e134e13b
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Aug 14 12:25:14 2014 +0100

    Properly handle existing session when creating new project
    
    Ask whether to adopt the existing session documents.
    
    Also fixes the existing bug of not reloading the default session when
    an existing project is open and a new project is cancelled.

 src/keyfile.c | 56 ++++++++++++++++++++++++++++++++++++++------------------
 src/keyfile.h |  2 ++
 src/project.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 91 insertions(+), 23 deletions(-)

commit 602ae0b324397d25a587af35738e5f034526a1e2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Aug 20 16:40:25 2014 +0200

    Properly remove generated HTML documentation on clean

 doc/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit a4dfc9c12b7a6880ebf5922614823565dc7cfb4a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Aug 20 15:52:03 2014 +0200

    Enable documentation generation automatically when possible

 m4/geany-docutils.m4 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 80c648e7f3731a36ef7213be7e4a42cfb4d470ab
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Aug 20 15:44:07 2014 +0200

    Remove generated HTML documentation from version control
    
    As it is generated by the build system it doesn't have to be checked
    in, and having it in became a whole lot more annoying since it started
    being generated automatically on `make all` instead of specific (and
    weird) `make doc`, as it means whenever the documentation changes the
    HTML is re-generated on any make run.  This is particularly problematic
    if using a different Docutils version than the one used to generate the
    checked-in version as it would create local noise that should not be
    committed, yet keep being annoying.
    
    This situation probably leads to most people disabling (or at least,
    not enabling) the documentation generation on normal builds, itself
    leading to more hassle updating of the documentation.

 .gitignore     |    1 +
 doc/geany.html | 6970 --------------------------------------------------------
 2 files changed, 1 insertion(+), 6970 deletions(-)

commit 1424b608a34995e7583fc524e482b3dcd8f1c00a
Merge: d78c8fb 92e34ba
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 17:06:06 2014 +0200

    Merge branch 'ntrel/make-win-doc'

commit 72897bac7d5475170eeefab82060c1ffffe3cc0f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 16:44:40 2014 +0200

    Add a Txt2tags test case for titles
    
    This is simply extracted from the rules.t2t test, but with unique title
    content as the tagmanager removes duplicate tags in tags files.

 tests/ctags/Makefile.am     |  1 +
 tests/ctags/titles.t2t      | 40 ++++++++++++++++++++++++++++++++++++++++
 tests/ctags/titles.t2t.tags | 17 +++++++++++++++++
 3 files changed, 58 insertions(+)

commit 18181c2e9043add8b13c1fc94c66db2ca5b885be
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri May 2 15:33:44 2014 +0100

    Support pseudo-unique IDs for documents
    
    Add GeanyDocument::id, document_find_by_id() to plugin API.
    
    This also fixes clicking on a Messages item whose document has been
    closed and reused. Now the click will be ignored instead of jumping to
    an unexpected line in the new document.

 plugins/geanyfunctions.h |  2 ++
 src/document.c           | 45 ++++++++++++++++++++++++++++++++++++++++++---
 src/document.h           |  6 ++++++
 src/msgwindow.c          | 31 +++++++++++++++++++++----------
 src/plugindata.h         |  3 ++-
 src/plugins.c            |  3 ++-
 6 files changed, 75 insertions(+), 15 deletions(-)

commit ff0fde30cbad0bf7597783c827235c29489c020c
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Apr 30 16:11:48 2014 +0100

    Use enum for Messages list store IDs

 src/msgwindow.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

commit a1466f656fd260739f48e2d0e162ac7805ffb4ac
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 16:34:21 2014 +0200

    Add a Txt2tags test case
    
    From the official docs:
    https://txt2tags.googlecode.com/svn/trunk/samples/sample.t2t

 tests/ctags/Makefile.am     |   1 +
 tests/ctags/sample.t2t      | 225 ++++++++++++++++++++++++++++++++++++++++++++
 tests/ctags/sample.t2t.tags |  14 +++
 3 files changed, 240 insertions(+)

commit e587038dea5215cb2db1b6c61ed0a287e5ed1fd1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 16:24:48 2014 +0200

    Add a Txt2tags test case
    
    From the official docs:
    https://txt2tags.googlecode.com/svn/trunk/doc/English/rules.t2t

 tests/ctags/Makefile.am    |   1 +
 tests/ctags/rules.t2t      | 782 +++++++++++++++++++++++++++++++++++++++++++++
 tests/ctags/rules.t2t.tags |  22 ++
 3 files changed, 805 insertions(+)

commit 92e34baa4f02b0fda3c878434e4fac88e39835fb
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Aug 19 15:14:03 2014 +0100

    Update HACKING for changed doc generation instructions

 HACKING | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit b7b34ec451c70927520f57ed773bd1b0736af2c0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 16:11:23 2014 +0200

    Rewrite the Txt2tags parser for better conformance and features
    
    This fixes parsing indented titles and titles with embedded delimiter
    characters, and adds support for title nesting information.
    
    Syntax: http://txt2tags.org/rules.html
    
    Closes [feature-requests:#690].

 src/symbols.c               |   1 +
 tagmanager/ctags/txt2tags.c | 176 ++++++++++++++++++++++++++++++--------------
 2 files changed, 121 insertions(+), 56 deletions(-)

commit d78c8fb5d91da58bf5ee8bde918d8db7d65dc89c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Aug 19 14:32:29 2014 +0200

    SQL: Adding keyword hold
    
    Adding new keyword hold, used e.g. on SQLAnywhere to open a cursor 'with hold'

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9e18884390157de3e557a7210e8159fef40620f5
Merge: 0817ddd a8e8e2c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 14:06:11 2014 +0200

    Merge branch 'master' of github.com:geany/geany

commit 0817dddc855a062521e64172810b3ede913eb004
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 13:44:52 2014 +0200

    FreeBasic: Add missing `endif` keyword
    
    From a patch by TJF.  Part of [feature-requests:#691].

 data/filetypes.freebasic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a8e8e2cd9e34d91fb769101cdcda8f696ce067ae
Merge: dc14016 ed20a43
Author: elextr <elextr@gmail.com>
Date:   Tue Aug 19 18:05:38 2014 +1000

    Merge pull request #312 from elextr/reflow_fix
    
    Make reflow paragraph leave cursor at end of reflowed text, which is more likely to be useful than where it was left at the start of the last line.

commit dc140165ae1022d518984a1e7a3bc7862e528cc4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 03:42:58 2014 +0200

    Use GeanyFindFlags instead of plain integer when expecting Geany find flags
    
    This makes the API more obvious on what argument is expected, and avoid
    confusion between Geany and Scintilla find flags.

 src/callbacks.c |  2 +-
 src/document.c  | 10 +++++-----
 src/document.h  |  8 ++++----
 src/search.c    | 28 ++++++++++++++--------------
 src/search.h    | 45 +++++++++++++++++++++++----------------------
 5 files changed, 47 insertions(+), 46 deletions(-)

commit bdc0f720e7509ca3fcd65b0c3dab051f1efc9a53
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 03:40:52 2014 +0200

    Remove unused flags from document_search_bar_find()
    
    Passed-in flags was always 0, so the argument is not useful.
    Also, this function expected Scintilla search flags rather than Geany
    ones, making the API confusing for no good reason.

 src/callbacks.c | 4 ++--
 src/document.c  | 6 +++---
 src/document.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 8812e39e2e937d1e7cfee1526af23e6ba3a45938
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 03:31:34 2014 +0200

    Fix searching backwards from the Find dialog
    
    search_find_prev() wasn't properly updated to work on GeanyFindFlags
    leading to incorrect flags handling.

 src/search.c  | 24 ++++++++++++------------
 src/symbols.c |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

commit 0a063c1a7268117dbe59308967d4fc2ec058d993
Author: asmblur <asmblurdev@gmail.com>
Date:   Mon Aug 18 19:06:27 2014 -0500

    Fix regexp search & replace.

 src/search.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1d08d3cc806969c0da1f8678224a86f819629fa6
Merge: cf67242 bb25ba6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 00:29:03 2014 +0200

    Merge branch 'freebasic-ft-update'

commit bb25ba6ed2aca71ac63e2398bb5b5dc8fb4004a8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 19 00:10:40 2014 +0200

    FreeBasic: Update keywords
    
    Patch from TJF.  Part of [feature-requests:#691]

 data/filetypes.freebasic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8278d7f9f0c3adc1c69eddd880eb28a600a862cd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Aug 18 23:57:49 2014 +0200

    FreeBasic: Fix preprocessor keywords list
    
    See http://www.freebasic.net/wiki/wikka.php?wakka=CatPgFunctIndex
    
    Part of [feature-requests:#691]

 data/filetypes.freebasic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7276c49949ae6762ec4978ef7532784362582f23
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Aug 18 23:55:03 2014 +0200

    Sort FreeBasic keywords alphabetically

 data/filetypes.freebasic | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1f8d2de53b0bb3c5856278ba817e7b236caa984d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Aug 18 13:21:07 2014 +0100

    Remove doc, hacking-doc targets (Windows)

 doc/makefile.win32 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit cf6724240a176fa48f3facaedf98c5389d14d4f4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Aug 18 00:07:43 2014 +0200

    Fix "Contributing to this document" for new HTML/PDF generation process

 doc/geany.txt | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit 874b019e4ed9ec4013317cb724da367681662128
Author: James Lownie <jlownie@hotmail.com>
Date:   Sun Aug 17 14:13:13 2014 +1000

    Clarified the location of the "Use project-based session files" option

 doc/geany.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7435a81d83707302ce83a833b8f32263a4b82cc9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 17 01:31:40 2014 +0200

    Fix a named style misspelling in the Lua filetype

 data/filetypes.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 768659b89fc8bc6727f5bce7605d417edc859f4a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Aug 16 17:59:10 2014 +0200

    i18n: don't restrict LINGUAS at configure time
    
    Don't use the $LINGUAS at configure time to set ALL_LINGUAS, and let
    the translations Makefile properly honor the $LINGUAS itself, which it
    already does better than we do, cleanly ignoring translations it
    doesn't know.
    
    If we do set ALL_LINGUAS=$LINGUAS, it will result in a build failure if
    we do not have a translation for some of the language(s) specified in
    $LINGUAS, and would make it impossible to build other languages without
    re-configuring.  So, just drop that part and let the build-time support
    kick in.
    
    Closes #507.

 m4/geany-i18n.m4 | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 91d0ed218341e6e0c7c9eb47f2f8fa8846b0a806
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Aug 14 17:12:58 2014 +0200

    Find in Files: start search when pressing return in all field
    
    Patch partly from Yosef Or Boczko, thanks.  Closes #959.

 src/search.c | 2 ++
 1 file changed, 2 insertions(+)

commit 328c22eaf6164b8e8cdc7e4ad4193d9122197903
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Aug 13 14:07:03 2014 +0200

    Update Scintilla to version 3.5.0

 scintilla/gtk/ScintillaGTK.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 521778ad311d076d1d423c4d9e4421fd66c57bf3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 12 20:40:21 2014 +0200

    Color scheme dialog: scroll to the initially selected item

 src/highlighting.c | 4 ++++
 1 file changed, 4 insertions(+)

commit df964312b2b2e27b28d127aa30e814d5d367a0c3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 12 20:38:59 2014 +0200

    Remove a global in colorscheme dialog code

 src/highlighting.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

commit 8b0990e52a1c2bfaf8678d4e14fb18a256618ddb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 12 16:38:42 2014 +0200

    Fix relative project base path when creating a new project
    
    Closes #1062.

 src/project.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cc1c36d0093de8c2559dfeb65eb60cc957489239
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 12 16:24:03 2014 +0200

    project: Sanitize entries_modified scope

 src/project.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit 87c6cefc1940a8d8e4e02f842bdbfc4bf05e3e37
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 12 16:17:39 2014 +0200

    Remove dead assignment
    
    `entries_modified` global is only used by on_name_entry_changed() and
    on_entries_changed(), both of which are only ever called from
    project_new() scope -- which already initializes this variable.

 src/project.c | 2 --
 1 file changed, 2 deletions(-)

commit 0b2b647a6dfd76dd2e8ff4ff0b8e0eea84bad3c8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 12 14:39:53 2014 +0200

    Remove an unnecessary dynamic allocation

 src/project.c | 66 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

commit 6ed6a995651dc8e239df3ba23dda2f3df3aa23ac
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 12 14:38:48 2014 +0200

    about: Don't leak global variables to the program scope

 src/about.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ba8899b09cb8635a3b3c67bef07d9ea4cba9780f
Merge: 5832c4b 36a6dd2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 12 14:18:04 2014 +0200

    Merge branch 'small-dialogs-cleanup'

commit 36a6dd2e2c1808adedcc1135ffc70a210c77350d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Aug 11 16:52:26 2014 +0200

    dialogs: Don't abuse GObject data

 src/dialogs.c | 70 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 37 insertions(+), 33 deletions(-)

commit 571239e0bf07752b2059376ca815f3b1efa115a9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Aug 11 16:38:09 2014 +0200

    dialogs: Remove an unnecessary function indirection
    
    Having add_input_widgets() didn't really make the code any simpler,
    rather obfuscating it a little.

 src/dialogs.c | 54 ++++++++++++++++++++++--------------------------------
 1 file changed, 22 insertions(+), 32 deletions(-)

commit 5fcacf066d7150cdfa9408b82141230209bafe2e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Aug 11 15:44:51 2014 +0200

    Add user data to GeanyInputCallback, avoiding global variable hacks

 src/build.c   |  4 ++--
 src/dialogs.c | 35 ++++++++++++++++++-----------------
 src/dialogs.h |  4 ++--
 3 files changed, 22 insertions(+), 21 deletions(-)

commit 5832c4b64c293e6091cf4da555b59d7931b13cb9
Merge: a8a6ef7 2559cda
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 10 16:28:56 2014 +0200

    Merge branch 'prefs-less-globals'

commit 2559cda95408bd8b32a96baff1918a78ce649c75
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 10 15:28:29 2014 +0200

    prefs: Remove some global state in keybinding-related code
    
    Use gtk_dialog_run() to run the key input dialog, which is modal anyway.
    This avoids having to pass the label and the iter around for the dialog
    response callback to have them, as they now only are used directly in the
    function setting them in the first place.

 src/prefs.c | 53 +++++++++++++++++++++++++----------------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

commit 852f3266507ccd06a894a797c67881cc21e5dca7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 10 14:57:33 2014 +0200

    prefs: Pack keybinding-related globals together and avoid much direct access
    
    This however doesn't get rid of any of the global data itself, it only pack it
    in a struct and passes pointer to this struct around instead of accessing the
    global whenever possible.

 src/prefs.c | 162 +++++++++++++++++++++++++++++-------------------------------
 1 file changed, 79 insertions(+), 83 deletions(-)

commit a8a6ef7d131e49e1cc5ed843ebec3167fd7b018b
Merge: 593b9dd 74ef1b8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 10 02:23:21 2014 +0200

    Merge branch 'scintilla-update-350-pre'

commit 74ef1b8344a34810771f69ef7b82a8aeca57e894
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 10 02:21:54 2014 +0200

    Update for new Scintilla styles

 data/filetypes.rust        | 3 +++
 src/highlighting.c         | 3 +++
 src/highlightingmappings.h | 5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

commit d77fe4c6b78f1b3d6f7650370d2f46eaec0e6f8d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 10 02:17:32 2014 +0200

    Update Scintilla to 3.5.0 pre-release

 scintilla/Makefile.am              |    6 +
 scintilla/gtk/PlatGTK.cxx          |   12 +-
 scintilla/gtk/ScintillaGTK.cxx     |  284 +++-
 scintilla/include/SciLexer.h       |   18 +
 scintilla/include/Scintilla.h      |   15 +-
 scintilla/include/Scintilla.iface  |   48 +-
 scintilla/lexers/LexHTML.cxx       |   12 +-
 scintilla/lexers/LexMatlab.cxx     |    5 +-
 scintilla/lexers/LexRuby.cxx       |   36 +-
 scintilla/lexers/LexRust.cxx       |  105 +-
 scintilla/lexlib/LexerModule.h     |    7 +-
 scintilla/makefile.win32           |    3 +
 scintilla/scintilla_changes.patch  |    3 +-
 scintilla/src/CellBuffer.cxx       |   40 +-
 scintilla/src/CellBuffer.h         |   12 +
 scintilla/src/ContractionState.cxx |   18 +-
 scintilla/src/ContractionState.h   |    4 +-
 scintilla/src/Document.cxx         |   59 +
 scintilla/src/Document.h           |    8 +-
 scintilla/src/EditModel.cxx        |   74 +
 scintilla/src/EditModel.h          |   67 +
 scintilla/src/EditView.cxx         | 2072 ++++++++++++++++++++++++++
 scintilla/src/EditView.h           |  163 +++
 scintilla/src/Editor.cxx           | 2795 +++++-------------------------------
 scintilla/src/Editor.h             |  130 +-
 scintilla/src/LineMarker.cxx       |   96 +-
 scintilla/src/MarginView.cxx       |  455 ++++++
 scintilla/src/MarginView.h         |   41 +
 scintilla/src/PerLine.cxx          |   70 +
 scintilla/src/PerLine.h            |   17 +
 scintilla/src/PositionCache.cxx    |   25 +-
 scintilla/src/PositionCache.h      |    7 +-
 scintilla/src/RESearch.cxx         |   17 +-
 scintilla/src/RESearch.h           |    1 -
 scintilla/src/ScintillaBase.cxx    |    5 +-
 scintilla/src/ScintillaBase.h      |    4 +-
 scintilla/src/Selection.cxx        |   11 +-
 scintilla/src/Selection.h          |    1 +
 scintilla/src/ViewStyle.cxx        |   14 +
 scintilla/src/ViewStyle.h          |    4 +
 scintilla/version.txt              |    2 +-
 41 files changed, 4007 insertions(+), 2759 deletions(-)

commit 593b9dd2c9345c381a8929c8aaabbba968b2e472
Merge: 604e05c 83deafe
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 10 01:51:48 2014 +0200

    Merge branch 'single-line-regex'

commit 83deafeddaa9bf2a0eca6eb34056e61cc7a2021c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Aug 2 16:04:42 2014 +0200

    Update the documentation for single-line regular expressions

 doc/geany.txt | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit 673c3c36a3acb4218567eccbdee87d6eb5d4d402
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 10 01:46:31 2014 +0200

    Add UI elements to control single-line regex settings

 src/search.c | 59 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

commit 482d2732af20c2501f299990c4214e00badf5e32
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 10 01:46:16 2014 +0200

    Add support for single-line regular expressions

 src/callbacks.c   |  6 +++---
 src/document.c    |  6 +++---
 src/keybindings.c |  4 ++--
 src/search.c      | 59 +++++++++++++++++++++++++++++++++++++------------------
 src/search.h      |  9 +++++++++
 5 files changed, 57 insertions(+), 27 deletions(-)

commit 604e05cb2d84a2f6d10f9dde3b2e53a6e9078969
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Aug 7 15:30:54 2014 +0200

    Adding message to client/log keywords to SQL type

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a26bdd628f7a7d6a5937195083b7829be09b1a81
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Aug 7 15:14:22 2014 +0200

    Fix crash when closing a document with visible infobars
    
    Apparently the ::unrealize symbol is sent too late, after we destroyed
    the widget and freed the GeanyDocument, and some signals like
    ::focus-in-event can still be fired on the widget after that.
    
    So, properly use the ::destroy signal that is supposed to be fired when
    others should release references to that instance.

 src/document.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ed20a4373da28564be76028df6e137f0f2194d80
Author: elextr <elextr@gmail.com>
Date:   Wed Aug 6 12:25:59 2014 +1000

    Make reflow paragraph leave cursor at end.
    
    The cursor was left at the beginning of the last line, leaving
    it at the end is more likely to be a useful position to continue
    typing.

 src/keybindings.c | 1 +
 1 file changed, 1 insertion(+)

commit 8341228ffa5a69970e85cddc7adb6d1f49f247d9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 3 23:55:25 2014 +0200

    JavaScript: fix handling of parentheses around an rvalue
    
    Properly skip parentheses around an rvalue, and then properly recognize
    the surrounded value.  This allows to properly recognize e.g. rvalue
    `({...})` as an object, or `(function(){})` as a function.  As the
    implementation is tolerant regarding garbage after the statement,
    function expressions called straight away (`(function(){})()`) are
    implicitly supported.
    
    This however removes support for the following invalid JavaScript
    syntax that was previously supported as a function/method declaration:
    
    	var func = () {}
    
    This syntax is not present in the ECMA standard nor is supported by
    popular JavaScript engines.
    
    See:
     * http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
       section 13, "Function Definition"
     * http://ecma262-5.com/ELS5_HTML.htm#Section_13
     * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions_and_function_scope#Defining_functions

 tagmanager/ctags/js.c                  | 61 ++++++++++++++--------------------
 tests/ctags/Makefile.am                |  1 +
 tests/ctags/parenthesis-rvalue.js      | 35 +++++++++++++++++++
 tests/ctags/parenthesis-rvalue.js.tags | 23 +++++++++++++
 tests/ctags/simple.js                  |  2 +-
 5 files changed, 85 insertions(+), 37 deletions(-)

commit 35e8fbbe2886b2c5c82686f7e0435e5aa6aad32f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 3 23:24:33 2014 +0200

    JavaScript: fix handling of various missing semicolons in loops

 tagmanager/ctags/js.c       | 16 +++++++++-----
 tests/ctags/1880687.js      | 53 ++++++++++++++++++++++++++++++++++++++++++++-
 tests/ctags/1880687.js.tags | 12 ++++++++++
 3 files changed, 75 insertions(+), 6 deletions(-)

commit 3ff01aeeb30462fe8b9c82740cae4a2e419c9587
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 3 19:07:59 2014 +0200

    JavaScript: recognize assignation to a parenthesized expression

 tagmanager/ctags/js.c          | 4 ++++
 tests/ctags/bug2777310.js      | 2 ++
 tests/ctags/bug2777310.js.tags | 2 ++
 3 files changed, 8 insertions(+)

commit b596aa14e82967d02d711c48cd62e631c29bea65
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 3 16:57:26 2014 +0200

    JavaScript: don't choke when returning object literals

 tagmanager/ctags/js.c              |  4 +++
 tests/ctags/Makefile.am            |  1 +
 tests/ctags/complex-return.js      | 61 ++++++++++++++++++++++++++++++++++++++
 tests/ctags/complex-return.js.tags | 18 +++++++++++
 4 files changed, 84 insertions(+)

commit bc9b2fa4445b6b870f2be942aa27d49994985ae9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 3 16:34:24 2014 +0200

    JavaScript: don't choke on array lists

 tagmanager/ctags/js.c         |  4 ++++
 tests/ctags/Makefile.am       |  1 +
 tests/ctags/arraylist.js      | 20 ++++++++++++++++++++
 tests/ctags/arraylist.js.tags |  9 +++++++++
 4 files changed, 34 insertions(+)

commit 3c2d93eca42d550fe416a9200e6a67a82bcd7afe
Author: Matthew Brush <matt@geany.org>
Date:   Sun Aug 3 04:23:19 2014 -0700

    Refactor win32 native dialog-mainloop update code
    
    Just cleaning up last commit.

 src/win32.c | 74 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

commit eb267d30cbe1fe603d315d7f165bdff7ed574b2c
Author: Matthew Brush <matt@geany.org>
Date:   Sat Aug 2 20:29:02 2014 -0700

    For native win32 dialogs, pump main window loop a bit
    
    Mostly gets rid of re-drawing issues, however is not great.

 src/win32.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 80 insertions(+), 7 deletions(-)

commit fc0e8fa56644230aeb4b7cdfde4271280565ce76
Merge: d4acd1e c47c848
Author: Dominic Hopf <dmaphy@googlemail.com>
Date:   Sat Aug 2 23:02:21 2014 +0200

    Merge pull request #311 from philippwiesemann/fix-typo-doc
    
    Fix typo in documentation

commit c47c84820e6f48be9eb70261d4d790229b1b3294
Author: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date:   Sat Aug 2 22:03:34 2014 +0200

    Fix typo in documentation

 doc/geany.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4acd1e061211cb5c113b50dbe9786d62e67786e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Aug 1 12:10:17 2014 +0100

    *View->Change Font* should respect native dialog setting (Windows, #1059)

 src/dialogs.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 4cfe71a487dfabdc3a4ce79bfa924567101c8838
Merge: 257de65 f1ce9af
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 1 17:26:54 2014 +0200

    Merge branch 'tm/faster-current-tag'
    
    This makes tm_get_current_tag() roughly 4.5 times faster.

commit 257de6597cd7fb0f7cd75d20c67c0de1d85d491a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 1 16:05:09 2014 +0200

    fortran: Make sure not to index kinds out of bounds
    
    This also makes recent GCC shut up about indexing below the bounds as
    it detected the code checked for a negative index yet didn't guard the
    actual access.  For now GCC doesn't understand the more comprehensive
    check, but it might come back if GCC becomes smart enough.
    
    Anyway, this makes the Assert() more correct, and addition of the
    explicit kinds array size makes sure any future kind addition won't
    miss its entry.

 tagmanager/ctags/fortran.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e1988964c17b57fdaf7741105d384235fec1bff1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Aug 1 12:00:20 2014 +0100

    Fix Windows build

 src/build.c    | 1 +
 src/dialogs.c  | 1 +
 src/document.c | 1 +
 src/main.c     | 1 +
 src/plugins.c  | 1 +
 src/project.c  | 1 +
 src/socket.c   | 1 +
 src/tools.c    | 1 +
 src/ui_utils.c | 1 +
 src/utils.c    | 1 +
 10 files changed, 10 insertions(+)

commit 01b3103eafd787b9a94d14026c3872691d6e1f90
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Aug 1 11:54:05 2014 +0100

    Remove unread variable

 src/document.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit c250195b81827b159c32a2c8d4c0d6f4bda7d35d
Author: elextr <elextr@gmail.com>
Date:   Wed Jul 30 16:07:50 2014 +1000

    Add HTML and XML template extensions
    
    Add *.tpl and *.xtpl.

 data/filetype_extensions.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit aea113f1c5095fa28790f1c330f1c5220d813d59
Merge: c8dab25 db977a9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jul 29 18:23:11 2014 +0200

    Merge pull request #306 from SiegeLord/more_rust_updates

commit db977a999d52f34713b11430a3d02fd6386a880a
Author: SiegeLord <slabode@aim.com>
Date:   Tue Jul 29 11:27:25 2014 -0400

    Rust: Add keyword

 data/filetypes.rust | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 58f0a20bcc640a7973b22b3f7647750eaa1838c2
Author: SiegeLord <slabode@aim.com>
Date:   Tue Jul 29 11:20:56 2014 -0400

    Rust: Update test sources to be valid Rust code.

 tests/ctags/test_input.rs      | 20 ++++++++++----------
 tests/ctags/test_input.rs.tags |  2 +-
 tests/ctags/test_input2.rs     |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

commit d9e569398a0dbdac961cf4aa9e624d51fbdfa1f0
Author: SiegeLord <slabode@aim.com>
Date:   Tue Jul 29 11:14:34 2014 -0400

    Rust: Add new comment handling test.

 tests/ctags/test_input2.rs      | 1 +
 tests/ctags/test_input2.rs.tags | 1 +
 2 files changed, 2 insertions(+)

commit 5e469dc5aeb1982a046703b95893dfd52e5a1174
Author: SiegeLord <slabode@aim.com>
Date:   Tue Jul 29 11:10:14 2014 -0400

    Rust: Update comment parsing.
    
    Rust now allows CRLF line endings in source files, which doesn't actually
    change any lexing here but the comment was wrong.
    
    Also, the hashbang initial comment has a special case where #![ doesn't count
    as a comment (but instead an inner attribute that just happens to be on the
    first line).

 tagmanager/ctags/rust.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

commit cf9385c6d49eaee4788847b4bda5b9b7b727d087
Author: SiegeLord <slabode@aim.com>
Date:   Tue Jul 29 10:55:15 2014 -0400

    Rust: Add test for character literals.

 tests/ctags/test_input.rs      | 9 +++++++++
 tests/ctags/test_input.rs.tags | 2 ++
 2 files changed, 11 insertions(+)

commit 756344d901afba9e5a51ae099aa7c1fe9ecef019
Author: SiegeLord <slabode@aim.com>
Date:   Tue Jul 29 10:51:36 2014 -0400

    Rust: Parse character literals.
    
    These were omitted by mistake. Caused bugs like '"' being interpreted as a
    start/end of a string, '}' as the end of a block etc.

 tagmanager/ctags/rust.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

commit fba9d19ec775161f722adab322ec384483d4b05c
Author: SiegeLord <slabode@aim.com>
Date:   Tue Jul 29 09:34:04 2014 -0400

    Rust: Add a test for the new string lexer.

 tests/ctags/test_input.rs      | 2 ++
 tests/ctags/test_input.rs.tags | 1 +
 2 files changed, 3 insertions(+)

commit d96a314a68a6ca779f3e447dd25724df4881a93a
Author: SiegeLord <slabode@aim.com>
Date:   Tue Jul 29 09:23:42 2014 -0400

    Rust: Change/simplify how the string tokens are handled.
    
    Previously, only the string contents were stored in lexerState::token_str (i.e.
    not including the delimeters). Now, the delimeters are stored as well, thus
    preserving them. This also simplifies the code a bit.
    
    A new function is added to handle the character storage, which is also now
    applied for normal identifiers. To that end, the MAX_STRING_LENGTH was boosted
    to 256 so that all reasonably sized identifiers may fit.

 tagmanager/ctags/rust.c | 49 ++++++++++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

commit c8dab25e6e608f3f928c2c1c0dbc7f444b1dffc1
Merge: b65f499 19e9866
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Jul 26 19:08:16 2014 +0200

    Merge pull request #303 from samsulmaarif/master
    
    Update Indonesian Translation

commit b65f49902f726d76178c7b72c244e901ccfa419d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 26 14:55:58 2014 +0200

    Fix closing the documents when quitting
    
    When quitting we avoid doing some unnecessary actions, and used to
    simply destroy the Scintilla widget (and thus the notebook page)
    instead of the elaborate UI updates.
    
    Unfortunately, when the infobars landed they changed what is packed as
    a notebook page, and now destroying the Scintilla widget alone is not
    enough to close the page.  Fix this by properly removing the whole page
    no matter what it contains.
    
    This issue was visible when quitting Geany with a project open.

 src/document.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0682a255853bada9bb5a07a575100925997e1de9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 26 13:36:19 2014 +0200

    Fix crash when quitting with an infobar visible
    
    When the infobar gets closed/destroyed it tries to focus the possibly
    destroyed document, leading to a crash.

 src/document.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 19e98669f473b7ea6f7433b505156b8aa5763223
Author: Samsul Ma'arif <samsul@samsul.web.id>
Date:   Fri Jul 25 03:53:40 2014 +0700

    Update Indonesian Translation

 po/id.po | 1898 ++++++++++++++++++++------------------------------------------
 1 file changed, 619 insertions(+), 1279 deletions(-)

commit a87655480ffbfdb8c29a843c77ba23e5c00dc79a
Merge: 6768a1b ffcec43
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 11 18:06:59 2014 +0200

    Merge most of PR#298

commit 6768a1b78f131dc857ba7674c213a70ef19edc5d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Jul 11 17:06:47 2014 +0200

    Update of Greek translation

 po/el.po | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

commit 81a9026c3b7c7100bef800ad8652d0e99d68d8c0
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Jul 8 21:00:34 2014 +0200

    Update of Greek translation

 po/el.po | 4557 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 2145 insertions(+), 2412 deletions(-)

commit 487b8aea0ba904103eaddaf81f2dd6647b8bc7b3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 5 19:16:24 2014 +0200

    Custom commands dialog: Make sure the selected item is always visible
    
    Always bring back the selected item after an user action, so the user
    can see what she's doing.

 src/tools.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 47e9e6c000e7f0742ef416e56a73e5c02ef93778
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 4 17:52:48 2014 +0200

    Ask whether to overwrite the project file when creating a new project

 src/project.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 7f7f66978bca26581cae16f27b6e8bf4e58d1a54
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 4 17:52:13 2014 +0200

    Add tooltips to explain the purpose of the New Project dialog fields

 src/project.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 11b50493fcd65216014d4bcab157d79cc33d9e7b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 4 17:50:37 2014 +0200

    Use ui_button_new_with_image() to build image buttons

 src/project.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

commit 98fa600a2ff40cd55ec8010bff258ed0b32ff8aa
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 4 03:06:17 2014 +0200

    Update Scintilla to version 3.4.4

 scintilla/gtk/PlatGTK.cxx              |  41 ++--
 scintilla/gtk/ScintillaGTK.cxx         |  28 +--
 scintilla/include/Scintilla.h          |   8 +-
 scintilla/include/Scintilla.iface      |  10 +
 scintilla/lexers/LexBash.cxx           |  11 +-
 scintilla/lexers/LexCPP.cxx            |  22 ++-
 scintilla/lexers/LexHTML.cxx           |  11 +-
 scintilla/lexers/LexHaskell.cxx        |   2 +-
 scintilla/lexers/LexPerl.cxx           |   2 +-
 scintilla/lexers/LexRuby.cxx           |   5 +-
 scintilla/lexers/LexRust.cxx           |   2 +-
 scintilla/lexers/LexTCL.cxx            |   2 +-
 scintilla/lexers/LexVHDL.cxx           |   2 +-
 scintilla/lexlib/Accessor.cxx          |   2 +-
 scintilla/lexlib/CharacterCategory.cxx |   2 +-
 scintilla/lexlib/CharacterSet.cxx      |   2 +-
 scintilla/lexlib/LexAccessor.h         |  20 +-
 scintilla/lexlib/LexerBase.cxx         |   2 +-
 scintilla/lexlib/LexerModule.cxx       |  14 +-
 scintilla/lexlib/LexerModule.h         |   9 +-
 scintilla/lexlib/LexerNoExceptions.cxx |   2 +-
 scintilla/lexlib/LexerSimple.cxx       |   2 +-
 scintilla/lexlib/StyleContext.cxx      |   2 +-
 scintilla/lexlib/StyleContext.h        |   4 +-
 scintilla/lexlib/WordList.cxx          |   2 +-
 scintilla/src/CaseFolder.cxx           |   2 +-
 scintilla/src/Catalogue.cxx            |   2 +-
 scintilla/src/CellBuffer.cxx           |  13 +-
 scintilla/src/CellBuffer.h             |   4 +-
 scintilla/src/Document.cxx             |  26 +--
 scintilla/src/Document.h               |   9 +-
 scintilla/src/Editor.cxx               | 343 ++++++++++++---------------------
 scintilla/src/Editor.h                 |  30 ++-
 scintilla/src/ExternalLexer.cxx        |   2 +-
 scintilla/src/Indicator.cxx            |   4 +-
 scintilla/src/Indicator.h              |   2 +-
 scintilla/src/LineMarker.cxx           |   2 +-
 scintilla/src/LineMarker.h             |   2 +-
 scintilla/src/PositionCache.cxx        |  41 ++--
 scintilla/src/PositionCache.h          |  28 ++-
 scintilla/src/ScintillaBase.cxx        |  56 ++++--
 scintilla/src/ScintillaBase.h          |   1 +
 scintilla/src/Selection.cxx            |   8 +
 scintilla/src/Selection.h              |   2 +
 scintilla/src/Style.cxx                |   4 +
 scintilla/src/Style.h                  |   4 +-
 scintilla/src/ViewStyle.cxx            |  37 ++++
 scintilla/src/ViewStyle.h              |   3 +-
 scintilla/version.txt                  |   2 +-
 49 files changed, 413 insertions(+), 423 deletions(-)

commit db90411b0e7684fb5d7868309e1fc96a93df664b
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sat Jun 28 14:17:54 2014 +0200

    main: Refactor quit functions
    
    Move quit-related functions to main.c and make them static. main_quit() now
    does all the heavy work and can be called from signal handlers.

 src/callbacks.c   | 54 ++---------------------------------------------------
 src/keybindings.c |  3 ++-
 src/main.c        | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/main.h        |  2 +-
 4 files changed, 58 insertions(+), 57 deletions(-)

commit fd5ac727cbb687cc66c2de596f1dde8d957af051
Author: Martin Spacek <git@mspacek.mm.st>
Date:   Wed Jun 11 22:17:48 2014 -0700

    Add %l current line number substitution to build commands

 doc/geany.txt |  1 +
 src/build.c   | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

commit ffcec43d01609ea0cc8a8e25d77bd4325b5b1e27
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sun Jun 8 14:22:56 2014 +0200

    document.c: Immediately mark as changed when document is externally deleted
    
    Before infobar it didn't matter because the dialog was modal and interaction
    with the doc was impossible. Now that you can interact it the doc should
    be marked changed immediately.

 src/document.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit 0f7db113e7da5b15957754388af74992d738b100
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Fri Jun 6 22:17:46 2014 +0200

    document.c: Restore lost document_set_text_changed(doc, TRUE) call
    
    It got lost by accident in 5117940.

 src/document.c | 1 +
 1 file changed, 1 insertion(+)

commit c8970e23316fb41f06a20af310f4b109f5f059d3
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Mon Jun 9 10:52:40 2014 +0200

    info bars: Show additional save button for the "reload file?" info bar
    
    This allows overwriting the file right from the info bar.

 src/document.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 4b8f42cd9e4206e672539dd559e9d41e831a39bd
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Mon Jun 9 12:35:22 2014 +0200

    info bars: Explicitely move focus back to the editor when closing
    
    This does not seem to happen automatically, at least on GTK3.

 src/document.c | 2 ++
 1 file changed, 2 insertions(+)

commit ab426623099dee3b8a187eefb662c7c022669b83
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Fri Jun 6 22:11:11 2014 +0200

    Fix racy glib assertion failure
    
    Use g_signal_connect_object() to establish automatic and race-free signal
    disconnection instead of the hand-crafted mechanism.

 src/document.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

commit 0870b8663fa6a40d1870f1b015b87db5148ea37e
Author: danyalzia <catofdanyal@yahoo.com>
Date:   Thu Jun 19 22:16:37 2014 +0500

    Add remaining D keywords

 data/filetypes.d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 35a212dffc34ae2f7bc532f69caf9bdea695ef39
Merge: 3ce25db 0d03fad
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jun 27 22:32:38 2014 +0200

    Merge branch 'callbacks-cleanup'

commit 3ce25db632e7142159fc86081f36afefe9f317ce
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jun 27 22:05:46 2014 +0200

    Remove line number zoom hack as it is no longer necessary
    
    Since cbf9813632d7ee921ffa1fda0d1f69128b2bc755 we have a proper
    solution for maintaining line number consistent with the editor zoom,
    so drop the old hack.
    
    This also allows to remove the now useless third argument of
    sci_set_line_numbers().

 src/callbacks.c   | 7 -------
 src/document.c    | 4 ++--
 src/editor.c      | 6 +++---
 src/printing.c    | 2 +-
 src/sciwrappers.c | 7 +------
 src/sciwrappers.h | 2 +-
 src/ui_utils.c    | 2 +-
 7 files changed, 9 insertions(+), 21 deletions(-)

commit cccc6ea0df885eefa07ba6ba99141e23574a1849
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 26 20:04:15 2014 +0200

    Remove some dead code

 src/callbacks.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 6c804880374058fbc1ed44084f4768b6c20d0038
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 26 20:00:24 2014 +0200

    Make sure the current document is still the same after Save All
    
    Save All updates the sidebar and title bar with the document that was
    the current one when the action was triggered, but the action could
    have changed the focused document if an non-file-backed file required
    saving.  So, make sure current document is the same after the action.

 src/callbacks.c | 1 +
 1 file changed, 1 insertion(+)

commit 0d03fad7bf478b7bd7aeaee04b1d04be96eb8e86
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 26 18:36:22 2014 +0200

    Move date insert callbacks to the UI code where they belong

 src/callbacks.c | 73 ------------------------------------------------------
 src/callbacks.h |  4 ---
 src/ui_utils.c  | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 75 insertions(+), 79 deletions(-)

commit a51bc3d6545b48eddb18de3b10a4381dc459614c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 26 18:31:05 2014 +0200

    Move include insert callbacks to the UI code where they belong

 src/callbacks.c | 44 --------------------------------------------
 src/callbacks.h |  4 ----
 src/ui_utils.c  | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 46 insertions(+), 53 deletions(-)

commit 00ec175d63931075fcf82c48497d9245a65da70b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 26 18:23:34 2014 +0200

    Callbacks: get rid of the ugly `insert_callback_from_menu` global

 src/callbacks.c | 191 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 96 insertions(+), 95 deletions(-)

commit 721769e682b142c0d07b12a3d7158695ccc3dacb
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Tue Jun 24 23:07:08 2014 +0200

    Fix build warning about missing return value.

 src/document.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cc2f1879a83aeb95bd9aa6b0d6362b32016c0432
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 18:30:54 2014 +0200

    Add printf attribute to document_show_message() for better safety
    
    Add G_GNUC_PRINTF attribute to document_show_message() so some
    compilers can check the format arguments match the format string.

 src/document.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 9bf647c5c3117d36c4ea7c99f05ad99e03106045
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 18:26:44 2014 +0200

    Move on_clone1_activate() to callbacks.c

 src/callbacks.c | 11 +++++++++++
 src/document.c  | 10 ----------
 2 files changed, 11 insertions(+), 10 deletions(-)

commit 0b32227bf0892f8bf430d712cae1fa73741c906a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 18:15:46 2014 +0200

    Don't manually connect handlers Glade can connect for us
    
    Don't bother manually connecting handlers that Glade can connect for us
    just as well.

 data/geany.glade | 3 +++
 src/callbacks.c  | 6 ++++--
 src/callbacks.h  | 6 +-----
 src/main.c       | 6 ------
 4 files changed, 8 insertions(+), 13 deletions(-)

commit ab3b7ce49660cfec1b4b21e549257bf2b7b4a7a5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 18:11:34 2014 +0200

    Use the appropriate prototype for the window's delete-event callback

 src/callbacks.c | 6 +++---
 src/callbacks.h | 2 +-
 src/main.c      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

commit 2113537e939aa7c73130c80ded791a698f05fbc1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 18:07:29 2014 +0200

    Add two missing Glade-only prototypes

 src/callbacks.c | 2 ++
 1 file changed, 2 insertions(+)

commit a398b087da51db03f0b89c8883ea6a239b0af8bf
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 18:04:11 2014 +0200

    Remove redundant toolbar-specific callbacks

 src/callbacks.c | 52 ++--------------------------------------------------
 src/callbacks.h | 20 ++++----------------
 src/toolbar.c   | 18 +++++++++---------
 3 files changed, 15 insertions(+), 75 deletions(-)

commit 517bf5f960fd4559073bf62039893aa39f8a4bf8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 17:48:54 2014 +0200

    Move Glade-only callbacks out of callbacks.h
    
    There is no need to expose the Glade-only callbacks in the header as
    nobody uses them directly anyway;  and not having them makes the header
    a little less bloated.

 src/callbacks.c |  75 +++++++++++++++++++++++++++++
 src/callbacks.h | 146 +-------------------------------------------------------
 2 files changed, 77 insertions(+), 144 deletions(-)

commit 3b1fbc16e5a01d4643d01f29abc7e8e8504688f6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 16:52:21 2014 +0200

    Normalize callbacks prototypes

 src/callbacks.h | 757 ++++++++++++++++----------------------------------------
 1 file changed, 216 insertions(+), 541 deletions(-)

commit 220545d988ab90c46699fa5586d8115de104c0d6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 16:44:10 2014 +0200

    Don't export callbacks not used from Glade

 src/callbacks.c | 46 +++++++++++++++++++++++-----------------------
 src/callbacks.h | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 47 insertions(+), 47 deletions(-)

commit 69a44997ad2ddf0d07244fb6c1901de819a2703a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 16:43:11 2014 +0200

    Remove prototypes of non-existing callbacks

 src/callbacks.h | 21 ---------------------
 1 file changed, 21 deletions(-)

commit d6382e443fa966c4333cf320db9d754d89812148
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 15:04:37 2014 +0200

    VTE: avoid exporting callbacks that are only used internally

 src/vte.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 2490df9b45a2b5c3707436971a8bb5f3538fc006
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 24 15:02:31 2014 +0200

    Avoid passing non-literals to string formatting functions
    
    Having a string literal allows the compiler to check the arguments
    match the format, so avoid passing non-literal whenever possible.

 src/filetypes.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

commit 135b60d25ef7557d2ea75a1a4f684ee49b5c3463
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Tue Jun 24 09:13:44 2014 +0200

    callbacks: Refactor on_reload_as_activate() as document_reload_prompt()
    
    The callback wasn't used from glade but is useful for some other places so
    it's worth moving into document.c. This also fixes a bug where reload via sidebar
    always reloads the current document instead of the actually clicked one.

 src/callbacks.c | 36 +-----------------------------------
 src/callbacks.h |  4 ----
 src/document.c  | 32 ++++++++++++++++++++++++++++++++
 src/document.h  |  2 ++
 src/encodings.c | 23 ++++++++++++++++-------
 src/sidebar.c   |  2 +-
 6 files changed, 52 insertions(+), 47 deletions(-)

commit d6c980f2fcdf49b731aacbd9e4751cbb9d85cafe
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 23 18:36:25 2014 +0200

    Printing: properly claim ownership of the printing Scintilla widget
    
    This avoids a GObject warning about unref-ing a floating object on
    print termination.

 src/printing.c | 2 ++
 1 file changed, 2 insertions(+)

commit 881ca4fa0243c29ace29e56955d85fcad255e90f
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Jun 22 14:09:04 2014 +0200

    Fix typo in generated geany.pc

 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ec7071062c5dc39d5f893a830b3c26968a579251
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 21 18:35:17 2014 +0200

    Fix GTK frame clock warnings with our about dialog
    
    We used to set the widget's style in a style-set handler, and despite
    guarding ourselves from recursive invocations, the GTK frame clock
    introduced by GTK 3.8 didn't like it very much.
    
    So, replace the manual color modification by a simpler global widget
    state modification, making the code simpler and smaller, yet achieving
    the same result (or so I hope and see).

 src/about.c | 38 ++------------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

commit 40662e4c01c3eac83beb522d2e5bbc775b413724
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Jun 19 14:20:16 2014 +0200

    SQL: Adding uniqueidentifier as keyword
    
    uniqueidentifier is a data type e.g. used on SAP/Sybase SQLAnywhere

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d5fd29baabfc76cee6718ddfaad97e0ba5446924
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Jun 12 18:41:27 2014 +0200

    Update of Slovenian translation

 po/sl.po | 54 ++++++++++++++++++++++++------------------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

commit d3b96283151f7a6e71763a9ec5f392f3b89dd804
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Jun 12 18:38:48 2014 +0200

    Update of Italian translation

 po/it.po | 2677 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1350 insertions(+), 1327 deletions(-)

commit c79c983364c8754a0944693cae0439d97b874067
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jun 4 14:31:12 2014 +0200

    Fix build with GLib < 2.32
    
    Second part of #1047.

 src/document.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit ea6ebaf48f40945374ea1075ceeaeedc56adee8e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jun 4 14:16:39 2014 +0200

    Fix build with GTK < 2.24
    
    Part of #1047.

 src/document.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 01cf9a9fdc6795b971cbad59585d33bfcb796b74
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Thu May 29 17:47:37 2014 +0200

    Do not use backward slashes in geany.pc on Windows
    
    And explicitly convert backward slashes in the global
    prefix to forward slashes as tools like pkg-config or
    gcc could interpret the backward slashes as escape
    sequences.

 wscript | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

commit 147167cfa5883107fe7592b3ea24728f53bba1a1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 28 18:01:23 2014 +0200

    infobars: Use wrap labels to avoid cropped infobars
    
    Since the infobar is backed in a GtkPaned that allows "shrink", if the
    content is too wide, it's far end will just get cropped.  Also, wrap
    labels are nicer to display possibly long texts as it flows naturally.

 src/document.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit d6e9e40ccc7966228aa684e8b00caa7150448378
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 27 20:25:04 2014 +0200

    Fix a few missing/extra includes

 src/ui_utils.c | 1 +
 src/ui_utils.h | 1 -
 src/utils.h    | 4 +++-
 3 files changed, 4 insertions(+), 2 deletions(-)

commit 7a4b5246611193cece08161c965c9a81b1e6b04d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 27 17:59:48 2014 +0200

    Avoid code duplication in document_get_current()

 src/document.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

commit 46f01bff59073905a01c799219fd0118c041f9c7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 27 17:55:00 2014 +0200

    Properly mirror document_get_from_page() in document_get_notebook_page()
    
    Now document_get_from_page() supports arbitrary nesting inside the
    notebook page, update document_get_notebook_page() to support it also,
    by searching up for the direct notebook child rather than assuming it
    is the ScintillaWidget's direct parent.

 src/document.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit d399957471fbbde0dcaea3691933e51ad9df973f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 27 16:02:59 2014 +0200

    Fix an inverted check

 src/document.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4adbd5088060839421eb34adb42dd762d6e5b034
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 27 15:42:57 2014 +0200

    Remove some empty table rows and columns from the Glade file
    
    Cleanup some useless placeholders, and replace some one-column tables
    with vertical boxes.
    
    No UI changes.

 data/geany.glade | 162 ++++++++++++++++++-------------------------------------
 1 file changed, 52 insertions(+), 110 deletions(-)

commit 73a1589618f71d7cd0aee0913613683c4fbfbb53
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 26 18:11:58 2014 +0200

    Remove empty table rows in the Glade file
    
    This avoids glade from emitting some useless placeholders.
    No UI changes.

 data/geany.glade | 60 ++++++++++++--------------------------------------------
 1 file changed, 13 insertions(+), 47 deletions(-)

commit e9795732b600895c1e6f0954915ba52bf6417a20
Merge: 2b9ecc2 62077c6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 26 16:45:25 2014 +0200

    Merge PR#113

commit 2b9ecc2e4ff59e9805261a3aa4fe553c93e69531
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 26 16:24:24 2014 +0200

    Remove unused variables and avoid variable shadowing

 src/document.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit 6e58ef3755e1d69c4edf3300ac17ae34413b8545
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 26 16:21:16 2014 +0200

    Don't use the notebook page widget for tab popup
    
    Directly use the GeanyDocument rather than pass the notebook page
    widget and get the document from that.  This makes the code more future
    proof and less weird.

 src/callbacks.c | 15 ++++-----------
 src/notebook.c  | 19 +++++--------------
 2 files changed, 9 insertions(+), 25 deletions(-)

commit 54724ee2ad4a67eb394aa55a29327da1689d394b
Author: Thomas Marititz <kugel@rockbox.org>
Date:   Mon May 26 10:44:57 2014 +0200

    notebook: Fix crash on tab close
    
    Since infobars notebook_tab_close_clicked_cb() wants a GeanyDocument as userdata.
    show_tab_bar_popup_menu() on the other hand wants the actual GtkNotebook child.

 src/notebook.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 8ea54993c5d599f82b6060550f304e06302b46d6
Merge: f3ac748 19e24fb
Author: Matthew Brush <matt@geany.org>
Date:   Sun May 25 18:55:07 2014 -0700

    Merge branch 'kugel/document-messages2'
    
    This is an extension of the long-lived `document-messages` branch.
    
    It is mostly adjusted according to the feedback on the mailing list.
    There might existing some usability issues to be resolved, but this
    is the first step towards non-modal document notifications.

commit 19e24fb5ee53cb70de02669fc2d1dc0cdbd82c11
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sat May 24 16:53:59 2014 +0200

    infobars: Dismiss the info bar when reloading via toolbar button/keybinding.

 src/document.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit b96daf6fc0f17780642e73e0cce7591af930b29e
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sat May 24 16:32:58 2014 +0200

    infobars: Do not use GeanyWrapLabel for now, it has problems on gtk3.

 src/document.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 100e0e1bf17e496dbe728a3637d199157d93b10e
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Sat May 24 14:37:24 2014 +0200

    infobars: Intercept some keys when the info bar is shown to allow interacting with it using the keyboard only.
    
    When the info bar is shown tab/shift+tab and escape are intercepted.
    * tab/shift+tab change the focus to the info bar buttons which can then be
      cycled through with more tab presses
    * escape closes the info bar (same as clicking cancel)
    
    Both keys aren't needed for the document because it's read-only. Other keys,
    such arrow/page up/down, remain to the document for navigating.

 src/document.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

commit 1dc96f1e50fad6d68ef1d27aa44ef25a9652db38
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed May 21 08:11:37 2014 +0200

    infobars: Cancel "reload file" dialog when spawning the "resave file" one.
    
    When the file was deleted from disk the message that the file is newer on
    disk has become out of date and irrelevent.

 src/document.c | 3 +++
 1 file changed, 3 insertions(+)

commit b487d8dea3c2c3d448431ae91e06470b43d7d6bc
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Wed May 21 07:11:56 2014 +0200

    infobars: Do not show reload and resave messages more than once since only the
    last one (respectively) is significant to the user.

 src/document.c        | 52 +++++++++++++++++++++++++++++++++++----------------
 src/documentprivate.h |  9 +++++++++
 2 files changed, 45 insertions(+), 16 deletions(-)

commit 5117940ff6e6457b24e7ee0989d3092ff38bac7d
Author: Thomas Martitz <kugel@rockbox.org>
Date:   Tue May 20 07:14:10 2014 +0200

    infobars: Make document read-only while infobar is shown.
    
    This avoids accidental changes the file until the infobar is ackowledged. The
    document can still be viewed and scrolled through but modifications and saving
    are disabled. Of course ignoring the document by changing to another one is
    also possible.

 src/document.c        | 42 +++++++++++++++++++++++++++++++++++++++---
 src/documentprivate.h |  3 +++
 2 files changed, 42 insertions(+), 3 deletions(-)

commit 43bff93046d891cdf250704d520e4785f5f07cd4
Author: Matthew Brush <matt@geany.org>
Date:   Sun Nov 13 06:05:53 2011 -0800

    Make locate_sci_in_container() search recursively
    
    Supports changes to the widget heirarchy in the future.

 src/document.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit e469aa6acc76fb47194c322efef3d4f900f990a2
Author: Matthew Brush <matt@geany.org>
Date:   Wed May 21 07:52:57 2014 +0200

    Use document_show_message() when a file is removed from disk
    
    The close button is removed from the dialog also since the user can easily
    choose to close the document normally.
    
    Setting default response removed since it's not working yet.

 src/document.c | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

commit 667c35a004aeabfb254da3d91186b8f523869cf0
Author: Matthew Brush <matt@geany.org>
Date:   Sun Nov 6 15:59:32 2011 -0800

    Use document_show_message() when a file is externally modified
    
    Two other related changes are that document_set_text_changed() is used to
    indicate that the buffer is different from what's on disk and also that
    the 'Close' button has been removed from the dialog since the user can easily
    just close the document themselves the normal way.

 src/document.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

commit a6bbea53c8a7f9e1d278c00eebbc6aa483fee416
Author: Matthew Brush <matt@geany.org>
Date:   Tue May 20 06:45:23 2014 +0200

    Add new function document_show_message()

 src/document.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 114 insertions(+), 1 deletion(-)

commit 9f587e9c265893e9fa3081c2387a0246d3e3c9c9
Author: Matthew Brush <matt@geany.org>
Date:   Sun Nov 6 12:29:37 2011 -0800

    Pack Scintilla widgets into a GtkVBox and use it as the notebook page.
    
    This is to allow stacking widgets such as GtkInfoBar above the Scintilla
    widget in each tab.
    
    notebook.c need to be changed because the document isn't the direct widget
    anymore which was assumed for tab closing.

 src/document.c | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
 src/notebook.c | 27 +++++++++++++++------------
 2 files changed, 59 insertions(+), 19 deletions(-)

commit f3ac7480c52d71188d16ddb350ea12fdbf18083d
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat May 24 13:33:27 2014 +0200

    Re-order header includes and cleanup unused imports

 src/win32.c | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

commit 34de4b655ee967506b5c3eae657bebbc3e6e67de
Merge: 1bacf86 238ab56
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat May 24 13:15:39 2014 +0200

    Merge pull request #276 from codebrainz/win32-includes
    
    Re-order win32.[ch] includes a little bit to unbreak build

commit 238ab562791311b533d7eaa56cdd9a5d101c49e3
Author: Matthew Brush <matt@geany.org>
Date:   Sat May 24 04:01:09 2014 -0700

    Re-order win32.[ch] includes a little bit to unbreak build

 src/win32.c | 3 +--
 src/win32.h | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

commit 1bacf869e076ef37caa768196d21d941a657d1e7
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat May 24 11:32:45 2014 +0200

    Extend use of os.path.join() to construct platform compliant paths

 wscript | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 7d38f0512190d8f5b8e3cec6715f7ce6e50bd7e7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 24 03:18:52 2012 +0100

    Initial support for single-line regular expressions matching

 src/search.c | 41 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

commit 46affaf19eab08712174faac8638d4428c9e6516
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 22 03:31:31 2014 +0200

    Update Scintilla to 3.4.2 final release
    
    No code changes.

 scintilla/lexers/LexCPP.cxx     | 4 ++--
 scintilla/lexers/LexFortran.cxx | 2 +-
 scintilla/lexers/LexPerl.cxx    | 6 +++---
 scintilla/lexers/LexRuby.cxx    | 2 +-
 scintilla/src/AutoComplete.h    | 2 +-
 scintilla/src/Editor.cxx        | 8 ++++----
 scintilla/src/RESearch.cxx      | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

commit 4d22aa48502ff818102af42495daaa55e6c6694e
Merge: 3d549f5 50feb0e
Author: Matthew Brush <matt@geany.org>
Date:   Wed May 21 15:43:40 2014 -0700

    Merge branch 'header-cleanup'
    
    Closes #272

commit 50feb0e05c87ff973ca678e255842e5fe43badc3
Author: Matthew Brush <matt@geany.org>
Date:   Mon May 19 22:57:14 2014 -0700

    Improve support of compiling without gettext
    
    * If GETTEXT_PACKAGE is not defined (ex. by build system/user) then
      define it to NULL. Most GLib gettext-functions allow passing NULL
      to use the domain set with textdomain().
    * Improve the ngettext() wrapper macro.
    * Improve/fix bind_textdomain_codeset() wrapper macro.
    * Fix argument in bindtextdomain()
    * Cast bind*textdomain*() results with (void) to get rid of compiler
      warnings when building without GETTEXT_PACKAGE defined.

 src/main.c    | 4 ++--
 src/support.h | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

commit 34888d6bafd1df9ae2e3456b066c2b44ea676ae8
Author: Matthew Brush <matt@geany.org>
Date:   Mon May 19 01:38:33 2014 -0700

    Add some info about header includes to `HACKING` file

 HACKING | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

commit 4efcbab33234d13a7c6d1dea2901535d9317e4e1
Author: Matthew Brush <matt@geany.org>
Date:   Sun May 18 17:31:51 2014 -0700

    Include what you use
    
    This is a mega-commit - because most of it had to be done in one go
    otherwise some commits would fail to compile - that attempts to fix a
    few problems with Geany's includes as well as various other related
    cleanups. After this change it's easier to use includes and there's
    little worry about which order things are included in or who includes
    what.
    
    Overview of changes:
    
    * Include config.h at the start of each source file if HAVE_CONFIG_H
      is defined (and never in headers).
    * Go through each source file and make the includes section generally
      like this:
      - Always config.h first as above
      - Then if the file has a header with the same name, include that
      - Then include in alphabetical order each other internal/geany header.
      - Then include standard headers
      - Then include non-standard system headers
      - Then include GLib/GTK+ related stuff
    * Doing as above makes it easier to find implicit header include
      dependencies and it exposed quite a few weird problems with includes
      or forward declarations, fix those.
    * Make geany.h contain not much besides some defines.
      - Add a little header file "app.h" for GeanyApp and move it there
      - Move "app" global to new "app.h" file
      - Move "ignore_callback" global to "callbacks.h"
      - Move "geany_object" global to "geanyobject.h"
    * Add an include in "geany.h" for "app.h" since GeanyApp used to be
      defined there and some plugins included this header to access
      GeanyApp.
    * Include "gtkcompat.h" everywhere instead of gtk/gtk.h so that
      everywhere sees the same definitions (not a problem in practice AFAIK
      so this could be changed back if better that way.
    * Remove forward declarations from previous commits as some people
      apparently consider this bad style, despite that it reduces inter-
      header dependencies.
    
    TODO:
    * As always, to test on win32
    * As always, to test with not Autotools
    * Test plugins better, both builtin and geany-plugins, likely API/ABI bump
    * Test with various defines/flags that may change what is included
    * win32.[ch] not really touched since I couldn't test

 plugins/geanyplugin.h       |  6 ++--
 src/Makefile.am             |  2 ++
 src/about.c                 | 17 ++++++----
 src/app.h                   | 60 +++++++++++++++++++++++++++++++++++
 src/build.c                 | 38 +++++++++++++----------
 src/build.h                 | 17 +++++-----
 src/callbacks.c             | 71 ++++++++++++++++++++----------------------
 src/callbacks.h             |  5 +--
 src/dialogs.c               | 35 ++++++++++-----------
 src/dialogs.h               | 11 +++----
 src/document.c              | 56 ++++++++++++++++-----------------
 src/document.h              | 33 ++++++++++----------
 src/documentprivate.h       |  2 +-
 src/editor.c                | 45 ++++++++++++++-------------
 src/editor.h                | 11 +++++--
 src/encodings.c             | 18 ++++++-----
 src/encodings.h             |  2 +-
 src/filetypes.c             | 27 +++++++++-------
 src/filetypes.h             | 12 +++++--
 src/filetypesprivate.h      |  4 +--
 src/gb.c                    |  5 ++-
 src/geany.h                 | 50 +++++++----------------------
 src/geanyentryaction.c      |  9 ++++--
 src/geanyentryaction.h      |  2 +-
 src/geanymenubuttonaction.c |  7 +++--
 src/geanymenubuttonaction.h |  2 +-
 src/geanyobject.c           |  5 ++-
 src/geanyobject.h           | 36 +++++++++++----------
 src/geanywraplabel.c        |  5 +--
 src/geanywraplabel.h        |  2 +-
 src/highlighting.c          | 37 +++++++++++-----------
 src/highlighting.h          | 14 +++++----
 src/highlightingmappings.h  |  5 ++-
 src/keybindings.c           | 45 +++++++++++++--------------
 src/keybindings.h           |  2 +-
 src/keybindingsprivate.h    |  3 +-
 src/keyfile.c               | 47 +++++++++++++++-------------
 src/log.c                   | 13 +++++---
 src/main.c                  | 76 +++++++++++++++++++++------------------------
 src/msgwindow.c             | 24 +++++++-------
 src/msgwindow.h             |  5 ++-
 src/navqueue.c              | 17 +++++-----
 src/navqueue.h              |  2 ++
 src/notebook.c              | 23 ++++++++------
 src/notebook.h              |  7 ++---
 src/plugindata.h            |  3 +-
 src/pluginprivate.h         |  4 ++-
 src/plugins.c               | 51 ++++++++++++++----------------
 src/pluginutils.c           | 15 ++++++---
 src/pluginutils.h           |  3 +-
 src/prefix.c                |  2 --
 src/prefs.c                 | 49 ++++++++++++++---------------
 src/printing.c              | 24 ++++++++------
 src/printing.h              |  7 ++---
 src/project.c               | 34 ++++++++++----------
 src/projectprivate.h        |  3 +-
 src/sciwrappers.c           | 11 ++++---
 src/sciwrappers.h           |  7 +++--
 src/search.c                | 23 ++++++++------
 src/search.h                |  4 +--
 src/sidebar.c               | 29 ++++++++---------
 src/sidebar.h               | 17 +++++-----
 src/socket.c                | 28 ++++++++++-------
 src/stash.c                 |  9 +++---
 src/stash.h                 |  2 +-
 src/symbols.c               | 41 +++++++++++++-----------
 src/symbols.h               | 13 ++++----
 src/templates.c             | 26 ++++++++++------
 src/templates.h             | 17 +++++-----
 src/toolbar.c               | 20 +++++++-----
 src/toolbar.h               |  2 +-
 src/tools.c                 | 28 ++++++++---------
 src/tools.h                 |  7 ++---
 src/ui_utils.c              | 43 +++++++++++++------------
 src/ui_utils.h              | 27 ++++++++--------
 src/utils.c                 | 28 ++++++++---------
 src/utils.h                 |  1 +
 src/vte.c                   | 30 +++++++++---------
 src/vte.h                   |  2 +-
 src/win32.c                 |  3 +-
 src/win32.h                 |  2 +-
 wscript                     |  2 +-
 82 files changed, 827 insertions(+), 705 deletions(-)

commit 6f87aac118fac7730fd981d11b41c8438e2f4649
Author: Matthew Brush <matt@geany.org>
Date:   Sun May 18 17:07:50 2014 -0700

    Normalize use of header guards and extern "C" guards
    
    * Always define GEANY_FOO_H to 1 in the header guards
    * Always put a G_BEGIN_DECLS/G_END_DECLS guard in every header for
    consistency, even private ones where it doesn't matter.
    * Always include either <glib.h>, <gtk/gtk.h> or some other header
    that will provide G_BEGIN_DECLS before using it. In a lot of headers
    that use glib.h and gtk/gtk.h stuff anyway, this resolves an implicit
    dependency they had on them being included before that header.
    * Always put a comment at the #endif part of the guard so it's
    easier to see what it applies to.
    * Always use an underscore between the header guard identifier's words
    even though the filename doesn't have one.

 src/about.h                 | 11 ++++++++---
 src/build.h                 |  4 +++-
 src/callbacks.h             |  8 ++++++++
 src/dialogs.h               |  8 +++++++-
 src/document.h              |  4 +++-
 src/documentprivate.h       |  9 +++++++--
 src/editor.h                |  3 ++-
 src/encodings.h             |  6 ++++--
 src/filetypes.h             |  3 ++-
 src/filetypesprivate.h      |  9 +++++++--
 src/geany.h                 |  4 ++--
 src/geanyentryaction.h      |  4 +++-
 src/geanymenubuttonaction.h |  4 +++-
 src/geanyobject.h           |  6 +++---
 src/geanywraplabel.h        |  4 +++-
 src/gtkcompat.h             |  2 +-
 src/highlighting.h          |  7 ++++---
 src/highlightingmappings.h  |  9 ++++++---
 src/keybindings.h           |  4 +++-
 src/keyfile.h               |  7 ++++++-
 src/log.h                   | 10 ++++++++--
 src/main.h                  | 10 ++++++++--
 src/msgwindow.h             |  4 +++-
 src/navqueue.h              |  7 +++++--
 src/notebook.h              |  8 +++++++-
 src/plugindata.h            | 19 ++++++++++---------
 src/pluginprivate.h         |  9 ++++++---
 src/plugins.h               | 12 +++++++++---
 src/pluginutils.h           | 10 +++++++---
 src/prefix.h                |  7 ++++++-
 src/prefs.h                 |  4 +++-
 src/printing.h              |  8 +++++++-
 src/project.h               |  4 +++-
 src/projectprivate.h        |  6 +++++-
 src/sciwrappers.h           | 10 +++++++---
 src/search.h                | 12 ++++++------
 src/sidebar.h               |  8 +++++++-
 src/socket.h                |  6 +++++-
 src/stash.h                 |  6 ++++--
 src/support.h               |  5 +++++
 src/symbols.h               |  8 +++++++-
 src/templates.h             |  4 +++-
 src/toolbar.h               |  6 ++++--
 src/tools.h                 |  8 +++++++-
 src/ui_utils.h              |  2 +-
 src/utils.h                 |  6 +++---
 src/vte.h                   |  9 +++++++--
 src/win32.h                 | 11 ++++++++++-
 48 files changed, 248 insertions(+), 87 deletions(-)

commit fec15c61c4a8e5c1f8054b17d21a599790ed1b5c
Author: Matthew Brush <matt@geany.org>
Date:   Sun May 18 16:20:25 2014 -0700

    Move typedefs out of geany.h and into their own headers
    
    This helps to avoid the requirement that geany.h be included before
    using any of the changed headers.

 src/build.h        | 12 ++++++++----
 src/dialogs.h      |  7 +++++--
 src/document.h     | 20 ++++++++++++--------
 src/editor.h       | 16 ++++++++++------
 src/filetypes.h    | 15 +++++++++------
 src/geany.h        |  7 -------
 src/geanyobject.h  | 25 +++++++++++++++----------
 src/highlighting.h |  4 +++-
 src/notebook.h     |  5 ++++-
 src/plugindata.h   |  4 +++-
 src/printing.h     |  4 +++-
 src/search.h       |  7 +++++--
 src/sidebar.h      | 12 +++++++-----
 src/symbols.h      | 11 +++++++----
 src/templates.h    | 12 ++++++++----
 src/tools.h        |  5 ++++-
 src/ui_utils.h     | 24 +++++++++++++-----------
 17 files changed, 116 insertions(+), 74 deletions(-)

commit 23d9cad7dcbc93e5f6cfcc5688bc928692c11bcd
Author: Matthew Brush <matt@geany.org>
Date:   Sun May 18 15:49:22 2014 -0700

    Start to make it easier to compile the core in isolation
    
    This is for work on making the files scannable by GObject-Introspection
    but is still useful otherwise (even fixes a FIXME in the comments). I
    made this by using a simple GNU Make file and trying to compile the
    sources each on their own without all the build system infrastructure.
    
    * Add keybindingsprivate.h file to hold private GeanyKeyGroup structure
    and remove it from the GEANY_PRIVATE guard in keybindings.h.
    * Move private members that were guarded by GEANY_PRIVATE from
    GeanyFiletypes to GeanyFiletypesPrivate and remove guarded build.h
    include.
    * Move private members that were guarded by GEANY_PRIVATE from
    GeanyProject to GeanyProjectPrivate.

 src/Makefile.am          |  11 ++++-
 src/build.c              | 118 +++++++++++++++++++++++------------------------
 src/editor.c             |   6 +--
 src/filetypes.c          |   9 ++--
 src/filetypes.h          |  18 --------
 src/filetypesprivate.h   |  15 ++++++
 src/keybindings.c        |   2 +-
 src/keybindings.h        |  14 ------
 src/keybindingsprivate.h |  44 ++++++++++++++++++
 src/keyfile.c            |   1 +
 src/main.c               |   1 +
 src/plugins.c            |   2 +-
 src/prefs.c              |   2 +-
 src/project.c            |  52 ++++++++++-----------
 src/project.h            |   6 ---
 src/projectprivate.h     |   4 ++
 src/support.h            |   4 +-
 17 files changed, 172 insertions(+), 137 deletions(-)

commit 3d549f59e8fd325a6e0f08983f67f29127618873
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 21 16:13:22 2014 +0200

    Fix a sign comparison warning

 src/socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 894207d0e3ed5101f6e97ce82ac10de0aef54134
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 21 16:08:38 2014 +0200

    Don't use deprecated gdk_get_display()

 src/socket.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 0a03e414e743fbc82c5b43814a1b88646c0f6026
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue May 20 20:24:16 2014 +0200

    Fix a little typo on Dutch translation
    
    Fixes a little typo on Dutch translation reported by MarioJC

 po/nl.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit df5edd00322e637e2a673f9ea502092f2b4ee2b9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 19 03:19:09 2014 +0200

    Scintilla: fix missing redraws on GTK < 3.9.2
    
    Also, make the recent redraw fixes depend on the GTK version Scintilla
    is running against, rather than built against.  This allows for the
    same build to work with both GTK < 3.9.2 or >= 3.9.2.

 scintilla/gtk/ScintillaGTK.cxx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

commit e566435dfae4e410f65efbb463f682221788354c
Merge: f3d96ef 67329f2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat May 17 22:23:43 2014 +0200

    Merge branch 'scintilla-update-342'
    
    This fixes flickering under GTK >= 3.10.

commit 67329f2b9860a970cf9afe6bf85b25ef7402df6e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat May 17 22:17:44 2014 +0200

    Update for new Scintilla styles
    
    The new C styles escapesequence and taskmarker are currently mapped
    conservatively, and may benefit from a more visible mapping.

 data/filetypes.c           | 2 ++
 src/highlighting.c         | 6 ++++--
 src/highlightingmappings.h | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

commit 9bcdd64be9add144cc7cfbb9456797511631e300
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat May 17 22:15:57 2014 +0200

    Update Scintilla to 3.4.2 pre-release

 scintilla/gtk/ScintillaGTK.cxx     |   65 ++-
 scintilla/include/Platform.h       |   24 +-
 scintilla/include/SciLexer.h       |   13 +
 scintilla/include/Scintilla.h      |    5 +-
 scintilla/include/Scintilla.iface  |   22 +-
 scintilla/lexers/LexCPP.cxx        |  486 ++++++++++++----
 scintilla/lexers/LexHTML.cxx       |    8 +-
 scintilla/lexers/LexLua.cxx        |    2 +-
 scintilla/lexlib/LexerModule.h     |    2 +-
 scintilla/lexlib/PropSetSimple.cxx |    5 -
 scintilla/scintilla_changes.patch  |    3 +-
 scintilla/src/CallTip.cxx          |   63 +-
 scintilla/src/CharClassify.cxx     |    5 -
 scintilla/src/ContractionState.cxx |    4 +
 scintilla/src/ContractionState.h   |    1 +
 scintilla/src/Document.cxx         |  113 ++--
 scintilla/src/Document.h           |   20 +-
 scintilla/src/Editor.cxx           | 1121 +++++++++++++++++++-----------------
 scintilla/src/Editor.h             |   11 +-
 scintilla/src/Indicator.cxx        |   72 +--
 scintilla/src/LineMarker.cxx       |  168 +++---
 scintilla/src/PositionCache.cxx    |   19 +-
 scintilla/src/PositionCache.h      |    2 +-
 scintilla/src/RESearch.cxx         |    5 -
 scintilla/src/ScintillaBase.cxx    |   59 +-
 scintilla/src/Selection.cxx        |    8 +
 scintilla/src/Selection.h          |    1 +
 scintilla/src/ViewStyle.cxx        |    8 +-
 scintilla/src/ViewStyle.h          |    2 +-
 scintilla/src/XPM.cxx              |    8 +-
 scintilla/version.txt              |    2 +-
 31 files changed, 1381 insertions(+), 946 deletions(-)

commit 4e0193d8f14ece47fa30ce7239e4e49c482f457b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 15 18:08:25 2014 +0200

    Zephir: add some tag parser tests

 tests/ctags/Makefile.am          |  2 ++
 tests/ctags/return-hint.zep      | 14 ++++++++++++++
 tests/ctags/return-hint.zep.tags |  5 +++++
 tests/ctags/simple.zep           | 19 +++++++++++++++++++
 tests/ctags/simple.zep.tags      |  5 +++++
 5 files changed, 45 insertions(+)

commit b1f93c29770a9de30c2172ce7ee6ad5ca981c9a4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 15 17:03:56 2014 +0200

    Add Zephir filetype

 data/Makefile.am              |  3 ++-
 data/filetype_extensions.conf |  1 +
 data/filetypes.zephir         | 24 ++++++++++++++++++++++++
 src/filetypes.c               |  1 +
 src/filetypes.h               |  1 +
 src/highlighting.c            |  2 ++
 src/highlightingmappings.h    |  7 +++++++
 src/symbols.c                 |  2 ++
 8 files changed, 40 insertions(+), 1 deletion(-)

commit f6068d0e86331e65422bd6542b010f2d2ca08203
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 15 16:58:04 2014 +0200

    Add a Zephir tag parser
    
    This Zephir parser uses the PHP parser with minor tweaking not to
    require the initial PHP open tag and skip function return type hints.

 tagmanager/ctags/parsers.h |  3 ++-
 tagmanager/ctags/php.c     | 57 +++++++++++++++++++++++++++++++++++++++-------
 tagmanager/src/tm_parser.h |  1 +
 3 files changed, 52 insertions(+), 9 deletions(-)

commit c1aba3862d6c0b240c67b028779af04e8d7c84be
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 15 16:37:22 2014 +0200

    Handle PHPSCRIPT like HTML but for markup cases

 src/editor.c       | 4 ++++
 src/highlighting.c | 2 ++
 2 files changed, 6 insertions(+)

commit 7aa647b9d3ba412d3afb0ba2b907b0240386b25a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 15 16:35:23 2014 +0200

    Enable PHPSCRIPT lexer

 scintilla/scintilla_changes.patch | 2 +-
 scintilla/src/Catalogue.cxx       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit f3d96ef91db976a81b48f34a37ffd7c856dc7527
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 15 03:13:11 2014 +0200

    Re-generate with Glade 3.8.5
    
    3.8.5 is supposed to fix the unstable file output, hopefully making
    further edits generate small diffs, not rearranging the whole file for
    no good reason.
    
    Note that this commit may introduce UI problems if the output actually
    isn't equivalent, the diff making it nearly impossible to review
    manually.  Keep an eye open for such problems.

 data/geany.glade | 6601 ++++++++++++++++++++++++++----------------------------
 1 file changed, 3144 insertions(+), 3457 deletions(-)

commit d8aaa59f9ab506e92f474bd9007127a6dbac016c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 12 21:46:09 2014 +0200

    Python: fix parsing of variables assigned to triple quoted strings
    
    Fixes #262.

 tagmanager/ctags/python.c      | 66 ++++++++++++++++++++----------------------
 tests/ctags/bug1906062.py.tags |  1 +
 2 files changed, 33 insertions(+), 34 deletions(-)

commit 0e5d699a139a8e7e4ed273b9fa248ee53150ac5a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 12 21:41:43 2014 +0200

    Python: remove a redundant macro

 tagmanager/ctags/python.c | 2 --
 1 file changed, 2 deletions(-)

commit a6b1433e6673d4cdb159818187233f0cde3245e8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 7 16:00:49 2014 +0200

    Fix modulo by zero, resulting in FPE
    
    Fix modulo zero error resulting in floating point exception, and then
    crash. This was introduced in fd6ce2da11e9f2d20cb96236753662c23feaecb4.
    
    Closes #265.

 src/keyfile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit de57548a716045a1bbadac290758759dd1d050ce
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 5 16:03:25 2014 +0200

    Fix a few unlikely corner-case leaks
    
    Fix a few leaks that can only happen in case of programming error.
    
    Thanks to Pavel Roschin and his cppcheck for spotting them!

 src/symbols.c   | 3 ++-
 src/templates.c | 3 ++-
 src/utils.c     | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

commit f366150f7a12de1ee591c4c14771510e811fbf26
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 5 14:52:05 2014 +0200

    Fix return with no value within a function returning non-void (oops)

 src/editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 435d32ad1dc048031319775ff73c21ea5ba889db
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 5 14:49:26 2014 +0200

    Fix duplicate msgids in Japanese translation (oops)
    
    75e10f49fc8b12b5fefc719e0e15e2dfe43eeda3 broke Japanese translation
    because it had been re-generated since the first recent mnemonic
    changes, leading for the automatic update in that commit to create
    duplicate entries.

 po/ja.po | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

commit 70ce9d81417fd9cfe23978ca750ad6977c24f998
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 5 05:32:52 2014 +0200

    Small update of the British English translation for new and updated strings

 po/en_GB.po | 217 ++++++++++++++++++++++--------------------------------------
 1 file changed, 80 insertions(+), 137 deletions(-)

commit 75e10f49fc8b12b5fefc719e0e15e2dfe43eeda3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 5 04:21:39 2014 +0200

    Update translations for recent mnemonic and wording fixes
    
    There is no need to require the translators to review their translation
    for these changes as the mnemonics and wordings are specific to the
    language.  The update here will only save translators from having to
    manually check and and remove the fuzzy marks from those strings.

 po/ar.po    | 44 +++++++++++++++---------------
 po/ast.po   | 44 +++++++++++++++---------------
 po/be.po    | 44 +++++++++++++++---------------
 po/bg.po    | 44 +++++++++++++++---------------
 po/ca.po    | 44 +++++++++++++++---------------
 po/cs.po    | 44 +++++++++++++++---------------
 po/de.po    | 44 +++++++++++++++---------------
 po/el.po    | 44 +++++++++++++++---------------
 po/en_GB.po | 90 ++++++++++++++++++++++++++++++-------------------------------
 po/es.po    | 44 +++++++++++++++---------------
 po/et.po    | 44 +++++++++++++++---------------
 po/eu.po    | 44 +++++++++++++++---------------
 po/fa.po    | 76 +++++++++++++++++++++++++--------------------------
 po/fi.po    | 44 +++++++++++++++---------------
 po/fr.po    | 44 +++++++++++++++---------------
 po/gl.po    | 44 +++++++++++++++---------------
 po/he.po    | 44 +++++++++++++++---------------
 po/hi.po    | 44 +++++++++++++++---------------
 po/hu.po    | 44 +++++++++++++++---------------
 po/id.po    | 44 +++++++++++++++---------------
 po/it.po    | 44 +++++++++++++++---------------
 po/ja.po    | 42 ++++++++++++++---------------
 po/kk.po    | 44 +++++++++++++++---------------
 po/ko.po    | 44 +++++++++++++++---------------
 po/lb.po    | 44 +++++++++++++++---------------
 po/lt.po    | 44 +++++++++++++++---------------
 po/mn.po    | 44 +++++++++++++++---------------
 po/nl.po    | 44 +++++++++++++++---------------
 po/nn.po    | 44 +++++++++++++++---------------
 po/pl.po    | 44 +++++++++++++++---------------
 po/pt.po    | 44 +++++++++++++++---------------
 po/pt_BR.po | 44 +++++++++++++++---------------
 po/ro.po    | 44 +++++++++++++++---------------
 po/ru.po    | 44 +++++++++++++++---------------
 po/sk.po    | 44 +++++++++++++++---------------
 po/sl.po    | 44 +++++++++++++++---------------
 po/sr.po    | 44 +++++++++++++++---------------
 po/sv.po    | 44 +++++++++++++++---------------
 po/tr.po    | 44 +++++++++++++++---------------
 po/uk.po    | 44 +++++++++++++++---------------
 po/vi.po    | 44 +++++++++++++++---------------
 po/zh_CN.po | 44 +++++++++++++++---------------
 po/zh_TW.po | 44 +++++++++++++++---------------
 43 files changed, 983 insertions(+), 985 deletions(-)

commit 1e405ce88e8e1f99f442aaed937cab7af99e5f2b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 5 05:05:09 2014 +0200

    Keep exact menu item string as keybinding label
    
    Using the exact same string avoids duplicate translation, and here only
    mnemonic changes were introduced with commit
    95306ac8db4fc38ad7ba7e172328cef5117efaf0.

 src/keybindings.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 1e50962de2c7afcd132c3c10c2fc7fd6ea7d6a31
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 5 02:34:17 2014 +0200

    Fix some conflicting mnemonics in the menus

 data/geany.glade  | 32 ++++++++++++++++----------------
 src/keybindings.c |  8 ++++----
 2 files changed, 20 insertions(+), 20 deletions(-)

commit e61bba1bc36e1fc801685a23f0ea47d7f31aa293
Author: Matt Copperwaite <mattcopp+git@gmail.com>
Date:   Mon Oct 28 16:03:02 2013 +0000

    Reword "replace by tabs/spaces" as "replace with"

 data/geany.glade  | 10 +++++-----
 doc/geany.html    |  8 ++++----
 doc/geany.txt     |  8 ++++----
 src/document.c    |  4 ++--
 src/keybindings.c |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

commit f94976495d09d3e2b709a51efd6f83577a7eca45
Author: Matthew Brush <matt@geany.org>
Date:   Thu May 1 17:25:22 2014 -0700

    Add more details about menu mnemonics

 README.I18N | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

commit 9b6b5f2401a4d20ee3a5aa7300e36b50384e0653
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun May 4 12:05:20 2014 +0200

    Adding an HTML5-template in addition to xhtml 1.0 strict one

 data/Makefile.am                     |  1 +
 data/templates/files/file_html5.html | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

commit b2ce441fb1ac7c463232d131fde0e58901c7f9b9
Author: Matthew Brush <matt@geany.org>
Date:   Sat May 3 21:37:41 2014 -0700

    Update Vala file template
    
    Vala is not Java

 data/templates/files/main.vala | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit f1923c79b43099a9929dcc99aeffda65e72bb1d3
Author: Matthew Brush <matt@geany.org>
Date:   Sat May 3 21:22:00 2014 -0700

    Simulate `main` function in Python

 data/templates/files/main.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 1f67e42b1206165f6a96e0e892f6e3bd604a39a8
Author: Matthew Brush <matt@geany.org>
Date:   Sat May 3 21:20:18 2014 -0700

    Replace tabs with 4 spaces in main.py template

 data/templates/files/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ace6d6b3edca4033e8f012dfe9247a2220b55c4c
Author: NiKaro127 <nicolas+github@karolak.fr>
Date:   Thu Sep 26 10:10:16 2013 +0200

    Add VBS extension to FreeBasic syntax
    
    Just adding '*.vbs' to 'FreeBasic' line.

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 007d5395c29e89318b52fd70d9b73518fb76dfb3
Author: Igor Shaula <gentoo90@gmail.com>
Date:   Sun Oct 28 00:45:16 2012 +0300

    Disable commenting out blank lines by 'Toggle line commentation'

 src/editor.c | 15 +++++++++------
 src/editor.h |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

commit 53d17aecfd3176dcbc12a537f551f01f060bb268
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat May 3 18:46:29 2014 +0200

    CSS: remove some pseudo elements listed as pseudo classes

 data/filetypes.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1944e26ee03bc0574769b2563f6ad28fb7581d32
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat May 3 18:45:07 2014 +0200

    CSS: fix mappings to non-existing styles

 data/filetypes.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 81114783565b1c8db235f1560bd523795066b5b9
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat May 3 08:25:08 2014 +0200

    Update of Japanese translation

 po/ja.po | 916 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 459 insertions(+), 457 deletions(-)

commit fd6ce2da11e9f2d20cb96236753662c23feaecb4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat May 3 00:52:23 2014 +0200

    Fix UI updating after loading a project
    
    When loading a project and focusing the last document, the UI wouldn't
    get properly updated for the displayed file -- because for performance
    reasons we disable notebook page switch handlers when loading session
    files.  Fix this by synthesizing a notebook page switch event when done
    loading.

 src/keyfile.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 09b2cf159291e87699782d75bc965861351f0e6e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri May 2 21:41:02 2014 +0200

    Fix Waf build for recent Doxyfile changes
    
    Recent changes to Doxyfile.in added new placeholders the build system
    has to replace, and Waf recognized them but failed, not knowing what to
    replace them with.

 wscript | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit e186ba50c0b8b8f824f11c75bc584afe4cc40cdd
Merge: cc64ee7 7a5883e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri May 2 01:14:39 2014 +0200

    Merge branch 'b4n/use-rst2pdf'

commit cc64ee7578456105f51c008f5f5a2d43f8d6dd0f
Merge: f205c97 a13b033
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 1 15:12:42 2014 +0200

    Merge branch 'plugin-dialog-cleanup'

commit a13b033d424bd25d013518d4c18d20eb681042f4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 1 03:18:04 2014 +0200

    Hide column headers in plugin manager dialog
    
    They are not very useful and waste both vertical (the headers
    themselves) and horizontal (first column wider because of title)
    screen space.

 src/plugins.c | 1 +
 1 file changed, 1 insertion(+)

commit f205c97362b26563c221268cfe555c29827456e5
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu May 1 00:35:16 2014 +0200

    Update open string on filebrowser plugin to make clearer, that the file will be opened in Geany

 plugins/filebrowser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2b1616d8295c3fb2d02325e353d5fae36f93905e
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu May 1 00:21:19 2014 +0200

    Update tooltip string for check_cmdline_new_files

 data/geany.glade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 95306ac8db4fc38ad7ba7e172328cef5117efaf0
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu May 1 00:07:23 2014 +0200

    Try to fix some duplicated accelerators inside Edit->Commands

 data/geany.glade | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 2be9b551cdf1ac34702cdc14c1695d86964dcd22
Merge: 3f50f35 d58c344
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue Apr 29 21:55:40 2014 +0200

    Merge pull request #249 from b4n/b4n/waf/link-libm
    
    Waf: correctly link libm as required

commit 3f50f357d358873cd6977f201cc25482b9ec1c58
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Apr 29 14:13:42 2014 +0200

    Adding while to list of SQL keywords

 data/filetypes.sql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d58c344585b5fbb4d34a792da41aca7bb6655b93
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 29 02:03:06 2014 +0200

    Waf: correctly link libm as required

 wscript | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 7a5883e29448c1ffba0b9f6ec083848ec23340f1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 28 17:04:46 2014 +0200

    Use rst2pdf instead of rst2latex and pdflatex to generate PDF manual

 doc/Makefile.am      | 22 +++++-----------------
 m4/geany-docutils.m4 | 17 +++++++----------
 2 files changed, 12 insertions(+), 27 deletions(-)

commit 16072c9cb5a584ae8227a693b05a9703eaa3660f
Merge: 0605a56 5ff38b4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 28 16:40:44 2014 +0200

    Merge branch 'ntrel/fix-valid-doc-dox'

commit 0605a56c56727a5c246eb06ed85e4ace355c0c29
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 28 16:38:59 2014 +0200

    Enable PDF generation on distcheck

 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit db995a37cf8aee7665c8ec5d6beb7ec1221e7609
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 28 16:38:39 2014 +0200

    Don't truncate pdflatex warnings

 doc/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 86d2e90d4c4e2bbb0e11130939a0eb79348854ef
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 28 16:38:12 2014 +0200

    Fix distchecking with PDF enabled

 doc/Makefile.am | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 5ff38b4daa332b1d90af991dd369857df3798b70
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 31 14:14:00 2013 +0000

    Fix document pointer documentation
    
    Improve clarity and remove wrong documentation about using `is_valid` to
    check if a document still exists.

 src/document.c | 15 ++++++++-------
 src/document.h |  8 +++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

commit d65c5d107e27079e0e11e92d1182a499ea77245a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Apr 28 11:57:35 2014 +0100

    Replace autoconf directory variables with sed (Windows makefile)

 doc/makefile.win32 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 8ee8d8c4f134e8cea167759b60890147197a4c8c
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 27 19:15:48 2014 -0700

    Unconditionally install HTML manual (oops)

 doc/Makefile.am | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

commit 29b525797a54ec973caffba819380eebf143fac8
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 27 18:02:39 2014 -0700

    Add `--enable-html-docs` to distcheck flags
    
    FIXME: `--enable-pdf-docs` not added because I can't make it pass
    distcheck due to quirks of `pdflatex` (see comments in
    `doc/Makefile.am`)

 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 86cd6c50274ef02da3e6abfb4957e9483b8044a8
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 27 16:49:00 2014 -0700

    Use improved Docutils Autotools support
    
    FIXME: The `install-html-local` rule might be wrong since it's
    copying `$(srcdir)/geany.html` instead of `$(builddir)/geany.html`
    because for some reason generated `geany.html` is checked-in to
    version control in the source `doc` directory.

 .gitignore      |   5 +++
 doc/Makefile.am | 106 ++++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 78 insertions(+), 33 deletions(-)

commit 87f57812586dc1045ff9e95874f908fd87307ab3
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 27 15:19:56 2014 -0700

    Improve Docutils (and friends) support in Autotools
    
    * Add `--enable-html-docs` and `--enable-pdf-docs` arguments
      (off by default)
    * Add `RST2HTML`, `RST2LATEX` and `PDFLATEX` to override path to these
      tools.
    * Add HTML and PDF doc status messages to configure summary

 configure.ac         |  2 ++
 m4/geany-docutils.m4 | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

commit 5eb526f9d0385fb62f83425c3ccdc13b3940d17f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 27 22:36:25 2014 +0200

    Improve implementation of utils_str_equal()

 src/utils.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 8befd03b7c4da86d67e2ec61181fa7380e84beb1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 27 19:02:31 2014 +0200

    Force enabling API docs on distcheck

 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 1794be565cc068a2cfa8b3d4273d246026807154
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 27 18:41:36 2014 +0200

    Remove unnecessary $(builddir) prefixes

 doc/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit bde741ab433e4f4c1e11601940abb3ede6839023
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 27 18:37:59 2014 +0200

    Fix doc/Doxyfile.stamp rule portability
    
    $< is only portable in suffix rules, so don't use it there.

 doc/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 63a2f075f6c910add7f56e69c9d24b2757aee5fa
Merge: d769e51 5758b9c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 27 18:06:01 2014 +0200

    Merge branch 'ntrel/doc-macro-examples'

commit d769e51e97a5e9f5572b91060e4d1377c56bde1a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 27 17:49:02 2014 +0200

    Fail if Doxygen is enabled but not found

 m4/geany-doxygen.m4 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit c67caf03a555dc0f2f3b433b5eab649ec19ff189
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Apr 27 16:39:08 2014 +0100

    Fix unsigned >= 0 comparison warning

 tagmanager/ctags/r.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 916b65b661a505a51f45a6169b7798067a98e76e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Apr 27 16:38:37 2014 +0100

    Fix sign comparison warning

 src/win32.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5758b9ca679eb3813c5d8582fe998f76ea507545
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Apr 27 15:53:18 2014 +0100

    Add foreach_document(), documents[] examples

 src/document.c |  6 ++++--
 src/document.h | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

commit 5475d15b87ad45bfbe266eaddf3ef854dfa3b62b
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 27 03:53:59 2014 -0700

    Remove comment noise from `doc/plugins.dox` and make it a build depend

 doc/Makefile.am |   1 +
 doc/plugins.dox | 712 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 357 insertions(+), 356 deletions(-)

commit 747be883cd747ba8556e887c3608c5a3aa6d608e
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 27 03:16:48 2014 -0700

    Re-enable Markdown support now that major bugs are fixed
    
    I went through each link from the API docs and everything seems fine
    since the extra leading whitespaces were removed in commits
    `edaa6f713f1b8e037a56652da15032aac56e2227` and
    `67ae7707364ecc09da8675803b48575d61b82fcf`.

 doc/Doxyfile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 206cc158a87d83a4dcb60575aac57f43d880d5c7
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 27 03:06:07 2014 -0700

    Remove some redundant path info from `doc/Makefile.am`

 doc/Makefile.am | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit c5cefd20df7743c30b07d9e75a405824db8f4fb8
Author: Matthew Brush <matt@geany.org>
Date:   Sat Apr 26 23:11:53 2014 -0700

    Use improved Doxygen Autotools support

 .gitignore      |  1 +
 doc/Makefile.am | 26 ++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

commit 595b4459843ad75b353fcb0c6b62f95dc21b2f8e
Author: Matthew Brush <matt@geany.org>
Date:   Sat Apr 26 23:05:22 2014 -0700

    Improve Doxygen support in Autotools build system
    
    * Add `m4/geany-doxygen.m4` file
    * Support `DOXYGEN` environment variable setting which Doxygen to use
    * Support `--enable-api-docs` to activate building Doxygen docs
        (off by default)

 configure.ac        |  2 ++
 m4/geany-doxygen.m4 | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

commit 93560c5e53317892ea18eeb70cdf128d75e5dd74
Author: Matthew Brush <matt@geany.org>
Date:   Sat Apr 26 21:15:30 2014 -0700

    Support out-of-tree builds by not hardcoding paths

 doc/Doxyfile.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 67ae7707364ecc09da8675803b48575d61b82fcf
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 27 04:31:28 2014 +0200

    Strip more double leading spaces

 doc/pluginsignals.c | 218 +++++++++++++++++++++++++++-------------------------
 1 file changed, 113 insertions(+), 105 deletions(-)

commit edaa6f713f1b8e037a56652da15032aac56e2227
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 27 04:08:40 2014 +0200

    Strip double leading spaces
    
    These are weird and break Doxygen Markdown support.

 doc/plugins.dox | 344 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 172 insertions(+), 172 deletions(-)

commit 82f556d2a5e1962605cc9df357e51443395f176c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 27 04:05:07 2014 +0200

    Disable Markdown support in our Doxyfile
    
    At least the "Plugin Writing Guidelines" and "Plugin HowTo" sections
    are displaying undesirable side effects of Markdown support, so disable
    it at least for now.

 doc/Doxyfile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bc4e76582b24c822f9acdce242e322d9b529805d
Merge: 6cba1e0 b28e5db
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 27 02:43:20 2014 +0200

    Merge branch 'scriptum/sidebar-middle-button-close'

commit b28e5db7ce72965cc5e45da41e2ab8d768b593c1
Author: Pavel Roschin <roshin@scriptumplus.ru>
Date:   Sat Sep 28 15:56:35 2013 +0400

    Close documents in sidebar with middle mouse button

 src/sidebar.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 605ec0b02ec8f563fc683b76f2b5684018bcfa31
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Apr 25 18:46:14 2014 +0200

    Cleanup Plugin Manager dialog
    
    Merge "Name" and "Description" columns, and move plugin details to
    tooltips.

 src/plugins.c | 168 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 86 insertions(+), 82 deletions(-)

commit 6cba1e0a47794282932383a08c8cd41ce65c1f21
Merge: d775d28 b77e810
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 16 18:58:31 2014 +0200

    Merge branch '1.24'

commit b77e8101996a0e846931346060be9226c5c85219
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 16 17:19:22 2014 +0200

    Re-generate HTML manual

 doc/geany.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit b0cdf31d902f9cb6cb43051dd478ce49a6883fad
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 16 17:19:06 2014 +0200

    Set release date

 NEWS           | 2 +-
 doc/geany.1.in | 2 +-
 doc/geany.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit d775d28c226097c24e83e34067b47869d9c33cd3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 15 15:47:28 2014 +0200

    Small update of the French translation

 po/fr.po | 699 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 357 insertions(+), 342 deletions(-)

commit 5217d683caf6b9d747125923c55eaea16515b347
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 15 15:42:51 2014 +0200

    Reword "Detect from file extension" from the open dialog
    
    We don't actually detect from file extension only, and other references
    of the feature always use "Detect from file", so use it also in the
    open dialog.

 src/dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bb61dfcdc3eef225f7eb61c6c48651b300eb7bbe
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 15 15:30:00 2014 +0200

    Add a translation context to the open dialog's "View" button
    
    The "View" button string is the same as the View menu one, but one is
    an action (verb) and the other a noun, and as such might need to be
    translated differently.

 src/dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 45f193a17a8722dce003a05a84b092610f1c0ba7
Merge: aeab183 420891a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 15 15:57:26 2014 +0200

    Merge branch 'cleaner-filetype-combo-box'

commit aeab183ef2a40943a4b7751a3e5127a5de63749a
Merge: a96a2b0 8c5e198
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 15 15:57:13 2014 +0200

    Merge branch 'unified-encoding-combo-boxes'

commit 420891ae81b5bd470ba62c9579edd37e7c0e95bd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jan 17 22:56:04 2014 +0100

    Group filetypes in the Open dialog filetype combo box
    
    Display the filetypes in the Open dialog filetype combo box grouped,
    as they are in the filetypes menu.
    
    This makes it easier to select a filetype, because they are better
    sorted and follows the filetypes menu layout.

 src/dialogs.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 113 insertions(+), 12 deletions(-)

commit 8c5e198cf12c619596bae2b5976f52c7e52bad80
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jan 17 21:56:51 2014 +0100

    Unify encoding combo boxes
    
    Make all encoding combo box display a list with encodings grouped by
    categories into sub-menus, making it easier to find the appropriate
    encoding than in a big single-level list.
    
    This is what was used in the Open dialog, but not in the Preferences
    dialog or the Find in Files dialog.  This also makes the encoding
    combo boxes behave more like the encoding menus.

 data/geany.glade |  18 +--------
 src/dialogs.c    | 117 +++----------------------------------------------------
 src/encodings.c  | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/encodings.h  |   9 +++++
 src/prefs.c      |  47 ++++++++++++----------
 src/search.c     |  17 ++------
 src/symbols.c    |  45 ++-------------------
 src/ui_utils.c   |  91 +++++++++++++++++++++++++++++++++++++++++++
 src/ui_utils.h   |   7 ++++
 9 files changed, 264 insertions(+), 204 deletions(-)

commit a851f87a62a970c380469ba7daf707df249d017b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 15 14:58:36 2014 +0200

    Update NEWS

 NEWS | 3 +++
 1 file changed, 3 insertions(+)

commit 64bc67916d9d27c7e4ddb0d0a399cbf157a135cc
Author: Matthew Brush <matt@geany.org>
Date:   Mon Apr 14 19:39:07 2014 -0700

    Distribute `geany.gtkrc` and `geany.css` files
    
    Maybe they aren't dist'ed if they are in Automake conditional?
    This probably makes both GTK2 and GTK3 files installed unconditionally.

 Makefile.am | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit 15a2366e361057b26f91c51be8e0dccdf165586e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 15 14:57:54 2014 +0200

    Revision bump

 NEWS               | 3 +++
 configure.ac       | 2 +-
 doc/geany.txt      | 2 +-
 geany.exe.manifest | 2 +-
 geany.nsi          | 4 ++--
 geany_private.rc   | 4 ++--
 win32-config.h     | 2 +-
 wscript            | 2 +-
 8 files changed, 12 insertions(+), 9 deletions(-)

commit a96a2b08ce5c70bcb2955ce5b7ee70b60f431117
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 15 14:41:26 2014 +0200

    Cleanup documentation files installation
    
    Don't use wildcards to select files to install, nor manually perform
    the installation when Automake could do it for us.

 doc/Makefile.am | 54 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 17 deletions(-)

commit 451d58a2dd8eb0c068b5b24bbf663b4a8ef4b48e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 15 14:30:00 2014 +0200

    Cleanup data files installation
    
    Don't use wildcards to select files to install, nor manually perform
    the installation when Automake could do it for us.
    
    Using wildcards makes it hard to know what will really be installed,
    and may results in installing files not part of the distribution.

 HACKING          |   2 +
 Makefile.am      |  55 +++-----------------------
 configure.ac     |   1 +
 data/Makefile.am | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 124 insertions(+), 50 deletions(-)

commit d11066561e79d3a907b714ae68c37022f8488ccd
Merge: 54f3c0a 157b44f
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Mon Apr 14 19:50:50 2014 -0700

    Merge pull request #242 from codebrainz/dist-gtkrc
    
    Distribute `geany.gtkrc` and `geany.css` files

commit 157b44f443557f05543a9f4d05322ef1f4f24903
Author: Matthew Brush <matt@geany.org>
Date:   Mon Apr 14 19:39:07 2014 -0700

    Distribute `geany.gtkrc` and `geany.css` files
    
    Maybe they aren't dist'ed if they are in Automake conditional?
    This probably makes both GTK2 and GTK3 files installed unconditionally.

 Makefile.am | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit 54f3c0a904245c7be41d4ed940ecba0250dc725f
Merge: 0b4ec54 1abee90
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 14 20:32:59 2014 +0200

    Merge branch 'wip/configurable-mime-type-gicon'

commit 1abee90434649c6f84f037021743cb11699f9555
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 14 20:27:35 2014 +0200

    Plug a memory leak

 src/ui_utils.c | 3 +++
 1 file changed, 3 insertions(+)

commit 3ec0369f474935c8d137a44dc3c21ac7054be3b1
Merge: 0b4ec54 01e7fe4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 14 20:21:40 2014 +0200

    Merge branch 'wip/configurable-mime-type--gicon' into wip/configurable-mime-type-gicon

commit 0b4ec549fc02d781a6213fad109f954dcaf28f40
Merge: d32ae83 06068d3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 14 16:46:30 2014 +0200

    Merge branch 'scintilla-update-341'

commit 06068d38d8d49f365c8b1c3ee3de6df08a04998d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 14 16:37:29 2014 +0200

    Fix a typo in the update script

 scripts/update-scintilla.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9a41f919c17ab0fffd11e4979a75ec562e01d4d2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 14 16:36:05 2014 +0200

    Update mappings for new Scintilla

 data/filetypes.c           | 1 +
 data/filetypes.freebasic   | 6 +++++-
 src/highlighting.c         | 6 +++++-
 src/highlightingmappings.h | 5 +++++
 4 files changed, 16 insertions(+), 2 deletions(-)

commit b81c35e4e3a6fd8fb780d67f2f4783ffe3761eaf
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 3 14:19:21 2014 +0100

    Fix const promotion with updated Scintilla

 src/editor.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 6c5a0dd7179b3f0ff183134059d596632a52e9cb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 14 16:25:01 2014 +0200

    Update Scintilla to version 3.4.1

 scintilla/Makefile.am                  |   1 +
 scintilla/gtk/Converter.h              |   4 +-
 scintilla/gtk/PlatGTK.cxx              |  38 ++--
 scintilla/gtk/ScintillaGTK.cxx         |  50 +++--
 scintilla/include/Platform.h           |  12 +-
 scintilla/include/SciLexer.h           |  19 +-
 scintilla/include/Scintilla.h          |  42 ++--
 scintilla/include/Scintilla.iface      | 142 +++++++-----
 scintilla/lexers/LexAbaqus.cxx         |  15 --
 scintilla/lexers/LexAsm.cxx            |  13 +-
 scintilla/lexers/LexBash.cxx           |   9 +-
 scintilla/lexers/LexBasic.cxx          |  92 ++++++--
 scintilla/lexers/LexCPP.cxx            |  44 +++-
 scintilla/lexers/LexCmake.cxx          |  14 +-
 scintilla/lexers/LexForth.cxx          |   9 -
 scintilla/lexers/LexFortran.cxx        | 235 ++++++++++---------
 scintilla/lexers/LexHTML.cxx           |  29 +--
 scintilla/lexers/LexMarkdown.cxx       |   8 +-
 scintilla/lexers/LexMatlab.cxx         |  13 +-
 scintilla/lexers/LexOthers.cxx         |   3 +-
 scintilla/lexers/LexPerl.cxx           |   2 +-
 scintilla/lexers/LexSQL.cxx            |   2 +-
 scintilla/lexers/LexTxt2tags.cxx       |   8 +-
 scintilla/lexers/LexVHDL.cxx           |   2 +-
 scintilla/lexlib/Accessor.h            |   2 +-
 scintilla/lexlib/CharacterCategory.cxx |   3 +-
 scintilla/lexlib/LexAccessor.h         |   7 +-
 scintilla/lexlib/LexerModule.cxx       |   2 +-
 scintilla/lexlib/LexerSimple.h         |   2 +-
 scintilla/lexlib/PropSetSimple.cxx     |   4 +-
 scintilla/lexlib/SparseState.h         |   2 +-
 scintilla/lexlib/StringCopy.h          |  36 +++
 scintilla/lexlib/StyleContext.h        |   4 +-
 scintilla/lexlib/SubStyles.h           |   2 +-
 scintilla/lexlib/WordList.cxx          |  10 +-
 scintilla/lexlib/WordList.h            |   2 +-
 scintilla/scintilla_changes.patch      |   8 +-
 scintilla/src/AutoComplete.cxx         |  14 +-
 scintilla/src/AutoComplete.h           |   6 +-
 scintilla/src/CallTip.cxx              |   8 +-
 scintilla/src/CaseConvert.cxx          |  12 +-
 scintilla/src/CellBuffer.cxx           |   4 +
 scintilla/src/CellBuffer.h             |   4 +-
 scintilla/src/Decoration.h             |   2 +-
 scintilla/src/Document.cxx             |   8 +-
 scintilla/src/Document.h               |  14 +-
 scintilla/src/Editor.cxx               | 400 +++++++++++++++++----------------
 scintilla/src/Editor.h                 |  23 +-
 scintilla/src/ExternalLexer.cxx        |   8 +-
 scintilla/src/ExternalLexer.h          |  10 +-
 scintilla/src/FontQuality.h            |   3 +
 scintilla/src/KeyMap.cxx               |  21 +-
 scintilla/src/KeyMap.h                 |  18 +-
 scintilla/src/LineMarker.cxx           |  47 ++--
 scintilla/src/Partitioning.h           |   4 +-
 scintilla/src/PerLine.cxx              |   8 +-
 scintilla/src/PositionCache.cxx        |  54 ++++-
 scintilla/src/PositionCache.h          |   7 +-
 scintilla/src/RESearch.cxx             |  36 +--
 scintilla/src/RESearch.h               |   2 +-
 scintilla/src/ScintillaBase.cxx        |  28 ++-
 scintilla/src/ScintillaBase.h          |   1 +
 scintilla/src/Selection.cxx            |  17 +-
 scintilla/src/Selection.h              |   5 +-
 scintilla/src/SplitVector.h            |   4 +-
 scintilla/src/UniConversion.cxx        |   2 +-
 scintilla/src/ViewStyle.cxx            |  14 +-
 scintilla/src/ViewStyle.h              |   4 +-
 scintilla/src/XPM.cxx                  |  10 +-
 scintilla/src/XPM.h                    |   9 +-
 scintilla/version.txt                  |   2 +-
 71 files changed, 1015 insertions(+), 684 deletions(-)

commit d32ae832022361bbe14cb133fe0fd104d83166a8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 14 02:38:50 2014 +0200

    Apply filetype-specific indentation settings for newly opened files
    
    Fix the check enabling filetype-specific indentation settings to also
    pass if the document has no filetype set yet, e.g. when opening it.

 src/document.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8f713377c403e6b0368ff1aae918876f756c1564
Merge: 24f2363 75542c6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 13 20:07:26 2014 +0200

    Merge branch '1.25/safer-plugin_signal_connect'

commit 75542c6d3c51663a0c23243a8c7cf2555fa12858
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Apr 11 23:04:14 2014 +0200

    Add defensive checks on plugin_signal_connect()'s sensitive arguments

 src/pluginutils.c | 3 +++
 1 file changed, 3 insertions(+)

commit 27a073f1a65c60e0568a5b379a6eaad385c717b0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Apr 11 22:56:30 2014 +0200

    Make plugin_signal_connect() safe on any object
    
    Watch the lifetime of objects referenced in plugin->signal_ids and
    remove our references to them if they get destroyed.  This avoids
    possibly trying to disconnect signals on destroyed objects when the
    plugin is unloaded.
    
    Supporting this case is safer, and is useful for objects that may or
    may not outlive the plugin (like ScintillaObjects), because in such
    cases plugin_signal_connect() is handy to make sure the signals are
    disconnected if the object is still alive, but used to crash if the
    object was destroyed.

 src/plugindata.h    |  2 +-
 src/pluginprivate.h |  3 +++
 src/plugins.c       | 34 ++++++++++++++++++++++++++++++++++
 src/pluginutils.c   | 11 +++++++++--
 4 files changed, 47 insertions(+), 3 deletions(-)

commit 24f2363fb702ac5e8b87fc16b5b30d761abd4fb9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 13 19:33:23 2014 +0200

    Post release version bump
    
    Say hello to Geany 1.25 "Veed"!

 NEWS               | 3 +++
 configure.ac       | 2 +-
 doc/geany.txt      | 2 +-
 geany.exe.manifest | 2 +-
 geany.nsi          | 4 ++--
 geany_private.rc   | 4 ++--
 src/geany.h        | 2 +-
 win32-config.h     | 2 +-
 wscript            | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)

commit 1514993a6a8a86e8ee464a12751c262ee14930d4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 13 18:02:49 2014 +0200

    Fix generating distcheck on clean sources
    
    There is no point in runner.sh depending on the generated Geany
    executable, and this breaks running `make distcheck` before building
    the sources, as the Geany executable doesn't exist yet.

 tests/ctags/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

commit d28fb783c7def3b195465e645735c9816c6a91d3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 13 18:00:50 2014 +0200

    Re-generate HTML manual

 doc/geany.html | 169 +++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 109 insertions(+), 60 deletions(-)

commit 6f56bdd32da5d63daa9cc953a0f301a78b2073bf
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 13 18:00:39 2014 +0200

    Set release date

 NEWS           | 2 +-
 doc/geany.1.in | 2 +-
 doc/geany.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit ec3cc4dcbe789d304746a8804afd7ccc68f4c4c2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 13 17:26:53 2014 +0200

    Add a few more bug references in NEWS

 NEWS | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 33cbd11a0f070c676adee771617120325c9b683f
Merge: d52a918 187e06b
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 13 17:17:08 2014 +0200

    Merge branch 'master' of github.com:geany/geany

commit d52a918e3e626715b89bd894ef0b102246abd895
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 13 17:16:56 2014 +0200

    Add missing items, remove duplicates and fix typos

 NEWS | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

commit 187e06bcb1c8b604b8a5665a58401ecbd6e9b9ff
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 13 16:19:32 2014 +0200

    Use proper argument lists

 src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3533584d1e642ee6ff2ce724582ccb59fff13017
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 13 16:02:14 2014 +0200

    Add eht16's changes
    
    These are way too few changes from me over a one-year period :(.

 NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

commit 00fbbced252a2fba9427b3fe068dc1c17c4d136b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 13 15:50:48 2014 +0200

    Add some missing NEWS items

 NEWS | 3 +++
 1 file changed, 3 insertions(+)

commit 725cf3ea5b2a3bb32deac1c868afe5c54ae97c57
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 13 15:32:18 2014 +0200

    Update NEWS for missing translation updates

 NEWS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8fe9fa68c110a395e2651e21f79810ea94901b1f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Apr 13 00:54:11 2014 +0200

    Update displayed copyright years

 README           | 2 +-
 doc/geany.html   | 2 +-
 doc/geany.txt    | 2 +-
 geany.nsi        | 2 +-
 geany_private.rc | 2 +-
 po/ar.po         | 2 +-
 po/ast.po        | 2 +-
 po/be.po         | 2 +-
 po/bg.po         | 2 +-
 po/ca.po         | 4 ++--
 po/cs.po         | 4 ++--
 po/de.po         | 4 ++--
 po/el.po         | 2 +-
 po/en_GB.po      | 2 +-
 po/es.po         | 4 ++--
 po/et.po         | 4 ++--
 po/eu.po         | 4 ++--
 po/fa.po         | 2 +-
 po/fi.po         | 4 ++--
 po/fr.po         | 4 ++--
 po/gl.po         | 4 ++--
 po/he.po         | 4 ++--
 po/hi.po         | 2 +-
 po/hu.po         | 4 ++--
 po/id.po         | 2 +-
 po/it.po         | 4 ++--
 po/ja.po         | 4 ++--
 po/kk.po         | 4 ++--
 po/ko.po         | 2 +-
 po/lb.po         | 2 +-
 po/lt.po         | 4 ++--
 po/mn.po         | 2 +-
 po/nl.po         | 2 +-
 po/nn.po         | 2 +-
 po/pl.po         | 2 +-
 po/pt.po         | 4 ++--
 po/pt_BR.po      | 4 ++--
 po/ro.po         | 2 +-
 po/ru.po         | 4 ++--
 po/sk.po         | 4 ++--
 po/sl.po         | 4 ++--
 po/sr.po         | 4 ++--
 po/sv.po         | 4 ++--
 po/tr.po         | 4 ++--
 po/uk.po         | 2 +-
 po/vi.po         | 2 +-
 po/zh_CN.po      | 4 ++--
 po/zh_TW.po      | 2 +-
 src/about.c      | 2 +-
 49 files changed, 73 insertions(+), 73 deletions(-)

commit e802194ad395201cfddf6fd1548446244f2748f3
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 13 15:14:35 2014 +0200

    Re-add the previous workaround to remember the directory Geany was started from
    
    My previous fix (e1ce9cfbec) didn't fix all possible use cases (opening
    files from CLI when starting Geany). This one should close the gap.

 src/main.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 9462367afcd9a8757e58a3387ce76e0b913dabce
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Apr 13 14:44:55 2014 +0200

    Fix a little typo on NEWS

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cfe43e297930a4f4a59f25f1b737901a4f914fc9
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 13 11:34:58 2014 +0200

    Add colorschemes from the geany-themes project if available

 geany.nsi | 2 ++
 1 file changed, 2 insertions(+)

commit e5eb69b20c103925a8a6494f5f4fc4d4ce8b978e
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 13 11:00:56 2014 +0200

    Add linker flags -static-libgcc and -static-libstdc++ on Windows
    
    This seems necessary with newer gcc versions to not
    require libgcc*.dll libraries on runtime.

 wscript | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 9f294c25c316ef7165f1f0f75882f3ba8be9d608
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 13 10:43:55 2014 +0200

    Add --no-scm configure option to bypass SCM detection

 wscript | 6 ++++++
 1 file changed, 6 insertions(+)

commit 6fce95cb10ab4ea57da33a224d181dcc0732509c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Apr 12 20:11:28 2014 +0200

    Update list of updated translation of NEWS file

 NEWS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit fc942f607d51083f94996e5a5f7cfddfd6612ca1
Merge: 1482833 929c7f7
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Apr 12 19:55:14 2014 +0200

    Merge pull request #241 from kgkilo/master
    
    Updated Hungarian translation

commit 148283356d0bde15925af4a613bb878829a576ea
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Apr 12 16:17:52 2014 +0200

    Fix a missing cast (oops)

 src/document.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3cf35f24c535f46dd549f4636b523ce8e48af5ec
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Apr 12 15:59:07 2014 +0200

    Fix possible crash on quit
    
    When quitting, we still have to destroy the Scintilla widget to avoid
    any possibility for us to receive signals from it after we destroyed
    the associated editor and/or document (used in signal handlers).
    
    I myself don't suffer from the issue, but it is theoretically possible
    for Scintilla to emit signals anytime before it is destroyed, so it is
    safer like this anyway.  And an user on IRC suffered from crashes on
    quit because of this issue, so it seems to actually happen in some
    situations.

 src/document.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 929c7f7402d7b2da192673dc5859539da8c9d9e6
Author: kilo aka Gabor Kmetyko <kg.kilo@gmail.com>
Date:   Sat Apr 12 00:38:46 2014 +0200

    Updated Hungarian translation

 po/hu.po | 1693 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 752 insertions(+), 941 deletions(-)

commit f74b4ed494f467b0f2fd58ecbb7b1995ec38758a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Apr 11 23:29:51 2014 +0200

    Update of Portuguese translation

 NEWS     |    2 +-
 po/pt.po | 1106 +++++++++++++++++---------------------------------------------
 2 files changed, 305 insertions(+), 803 deletions(-)

commit 95edb95a38dad3755a0b6fd5820b82d25c021f8f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Apr 11 22:47:10 2014 +0200

    Add a warning about using plugin_signal_connect() on short-lived objects

 src/pluginutils.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

commit e656043874c922ce88886ca5fe47980f029fc0d7
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Apr 11 00:07:33 2014 +0200

    Add a new section to the Windows installer to install header files

 geany.nsi | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 82842b230b06e87b15069ccc0384d06cdee22d2e
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Apr 11 00:06:29 2014 +0200

    Install header files and geany.pc also on Windows

 wscript | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

commit 3d403b6d9fe9231190dd332ee0143a07b89c1886
Author: Pavel Roschin <roshin@scriptumplus.ru>
Date:   Thu Apr 10 22:27:30 2014 +0400

    Update of Russian translation

 po/ru.po | 185 +++++++++++++++++++++------------------------------------------
 1 file changed, 61 insertions(+), 124 deletions(-)

commit 6834c3458cce0477e7e830b24c70ba448f6002e9
Merge: e1ce9cf 2cde2cc
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Thu Apr 10 22:25:50 2014 +0200

    Merge branch 'master' of https://github.com/geany/geany

commit e1ce9cfbecf432f8033ecf15322c2b273d377c34
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Thu Apr 10 22:24:15 2014 +0200

    Change the working directory on Windows properly
    
    On Windows we need to change the working directory on startup to not
    lock the directory Geany was started from (bug #2626124).
    However we can't change the directory to late in the startup process
    otherwise plugins maybe unable to load resources from the installation
    directory.
    
    Though we also can't change it too early otherwise opening files given
    with relative paths in Geany from the command line won't work anymore
    (bug #3613096).
    
    This change should fix both issues by changing the working directory after
    command line file handling happened and before plugins will be loaded.

 src/main.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 2cde2cc5f7bebed99af8830667ac9483a42d53d6
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Apr 10 22:21:15 2014 +0200

    Adding tr update to NEWS file

 NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit fd660e4dd84273ebd77d34d5c99e383b70cfecae
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Apr 10 22:16:03 2014 +0200

    Update of Turkish translation

 po/tr.po | 163 ++++++++++++++++++++++++---------------------------------------
 1 file changed, 61 insertions(+), 102 deletions(-)

commit 9ea8b9d11afa2ecc17775ef3ddd347a3a823457c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 10 17:31:29 2014 +0200

    Fix conflicting mnemonics in the French translation

 po/fr.po | 56 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

commit 9f4ef363f2fc86780f98ad4bf5bea98af8ad8048
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 10 14:13:56 2014 +0200

    Html chars: fix translation of category names
    
    Although the strings were properly marked for translation, they weren't
    actually translated because they missed run-time replacement.

 plugins/htmlchars.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 264d2ad6bdbece309aa0d7e47e50202cfb674174
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Apr 10 09:12:50 2014 +0200

    Add Dutch translation update to NEWS

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f0a12433e3ca2b1ef39a55d5e57192d1b66137c8
Merge: aff07fb 55034a3
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Apr 10 09:11:46 2014 +0200

    Merge pull request #239 from peter-scholtens/master
    
    Update nl.po

commit aff07fb2dc31a36524e89634125ae31f49713f43
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 9 23:13:30 2014 +0200

    French translation update

 po/fr.po | 83 +++++++++++++++++++++++++++-------------------------------------
 1 file changed, 35 insertions(+), 48 deletions(-)

commit 55034a358e17acc3d46b069f3cb4705d877f93ca
Author: Peter Scholtens <peter.scholtens@xs4all.nl>
Date:   Wed Apr 9 22:49:18 2014 +0200

    Update nl.po
    
    First contrib in Github

 po/nl.po | 143 +++++++++++++++++++++++----------------------------------------
 1 file changed, 52 insertions(+), 91 deletions(-)

commit 90658b2a82453242b2404468c9887067261027a5
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Apr 9 22:10:22 2014 +0200

    Update of Russian translation

 po/ru.po | 48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

commit 6a432d2a9b6907ec49172c12dec2a4d113204bc3
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Apr 9 19:02:58 2014 +0200

    Update NEWS with recent translation updates

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c7b1a7a659870dca642203b050eafc37d3d910fa
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Apr 9 19:01:22 2014 +0200

    Update of Kazakh translation

 po/kk.po | 245 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 105 insertions(+), 140 deletions(-)

commit fb9da9714cbc1d81e9fd67d2410e85816ed3774a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Apr 9 18:58:36 2014 +0200

    Update of Catalan translation

 po/ca.po | 182 ++++++++++++++++++++++++---------------------------------------
 1 file changed, 70 insertions(+), 112 deletions(-)

commit de2eaa38abb982ab1539950ac4256359199f028c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 9 18:14:36 2014 +0200

    Update NEWS

 NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

commit f8564585e65acbc0700d6406a84fb4ea0fba5002
Merge: e135da8 85af653
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 9 18:08:17 2014 +0200

    Merge branch 'export/fixes'

commit 85af65323b33df5a6cbbd40fb5df651df5a249c9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 9 16:48:10 2014 +0200

    Export: escape file name in case it contains HTML control characters

 plugins/export.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 1032d0fc68fa8cf3005d00fc2579b1e79f84c751
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 9 15:18:15 2014 +0200

    Export: use `DOC_FILENAME()` instead of re-implementing it manually

 plugins/export.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

commit 527dee720362a20063b730cbcad97f184c636f17
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 9 15:05:44 2014 +0200

    Export: fix LaTeX export for more than 2 consecutive '-', '<' or '>'
    
    Fix escaping of '-', '<' and '>' characters to properly handle inputs
    with more than 2 consecutive identical characters of this set.

 plugins/export.c | 40 +++++++---------------------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

commit 874c822328ed046cb15b4fe2d3dc7839eeac2b94
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 9 15:01:50 2014 +0200

    Export: don't include unused, random styles
    
    Fix the bounds checking on included styles only to check for inclusion
    actually defined styles, not to include random styles based on
    uninitialized array indices.

 plugins/export.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4eb8205f5605e680f83ce062e7d03fcf2bc26c3e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 9 14:44:26 2014 +0200

    Export: don't try to read past the document end
    
    A faulty bound checking resulted in reading a byte past the document
    end, which resulted in Scintilla returning byte 0 because the position
    was invalid.  By adding this NUL byte to the string used to build the
    body, the body was truncated after the last document byte (as C strings
    are NUL-terminated), leading to any format structure after it to be
    missing from the output.
    
    This broke HTML and LaTeX export if the last line didn't end with a
    newline, as the last line's style closing structure were missing.

 plugins/export.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e135da8a79fa2a96d836b18159b535d0f7294ecd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 9 02:57:10 2014 +0200

    Fix replacing colors with "0x" prefix with length different than 6
    
    We used to assume that if the selected text started with "0x" when
    inserting a color, we had to replace exactly 6 bytes after the "0x"
    prefix.  Although this is generally the case as most color formats use
    6 hexadecimal digits, it still would erase either too many or too few
    characters if actually replacing something shorter (i.e. "0xfff") or
    longer (i.e. "0xffffffffffff").
    
    It could even partially override multi-byte characters if the 8th byte
    after the selection start was in the middle of a character, as the
    length was in bytes and not characters.
    
    Fix this by honoring the actual selection end.

 src/editor.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit ab6390fc8cd49bea62a94e9efcd9b30e9e1b61c8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 8 14:50:15 2014 +0200

    Update NEWS with newer changes

 NEWS | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

commit d7e3d4247f244611a5150c87a6726b242b52c990
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Apr 7 22:16:30 2014 +0200

    Update of Galician translation by José Manuel Castroagudín Silva

 po/gl.po | 1733 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 763 insertions(+), 970 deletions(-)

commit bd811b96cad7f700a97e30eb0ede279dad55c8c2
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 6 21:52:17 2014 +0200

    Change include order on Windows
    
    As suggested by a preprocessor warning from winsock2.h
    (i686-w64-mingw32/include/winsock2.h:15:2: warning: #warning Please
    include winsock2.h before windows.h).

 src/socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 20547265e601b72330b705e0ef9339990c5354f9
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 6 21:43:17 2014 +0200

    Add /waf-* to exclude Waf on Windows

 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit d9fca40de33f45a420fec1230ad12264e9fc24a9
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Apr 6 21:40:56 2014 +0200

    Include missing header
    
    It seems this header is necessary on Windows 7 or newer gcc versions
    (not sure which one requires it) but according to the docs, it is
    necessary anyways.

 src/win32.c | 1 +
 1 file changed, 1 insertion(+)

commit b31e66d32192db2ecff12c09c3d81506ed3280dd
Author: gymka <gymka@archlinux.lt>
Date:   Sun Apr 6 08:42:21 2014 +0300

    updated lithuanian translation

 po/lt.po | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit e94d162d300adb465bcc7dcd41bc8c584c3eec61
Merge: 16d9bbb e4c6aa3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 2 19:56:24 2014 +0200

    Merge branch 'SiegeLord/rust_updates'

commit e4c6aa3d9ca9a4814b207cadb9b7f4ffab142395
Author: SiegeLord <slabode@aim.com>
Date:   Wed Apr 2 13:41:40 2014 -0400

    Rust: Add a test for leading 'priv'.

 tests/ctags/test_input.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e89c4af47cc71f7dcf61e6069629dee0a03c3895
Author: SiegeLord <slabode@aim.com>
Date:   Wed Apr 2 13:05:57 2014 -0400

    Rust: Add some more syntax examples to the CTags test file.
    
    Also, made it compile again.

 tests/ctags/test_input.rs  | 6 ++++--
 tests/ctags/test_input2.rs | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

commit 530d047c9d80f1abc7b71e29b10bd89cfe11ad63
Author: SiegeLord <slabode@aim.com>
Date:   Tue Apr 1 21:22:38 2014 -0400

    Rust: Skip 'pub' keyword in front of struct fields.

 tagmanager/ctags/rust.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ff796360ce9b9f95cf562566051d02c06aa6cfa5
Author: SiegeLord <slabode@aim.com>
Date:   Sun Mar 23 13:50:53 2014 -0400

    Rust: Update keywords

 data/filetypes.rust | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2a80759a3aa323ab393e79864bfec0c35b0f6afb
Author: SiegeLord <slabode@aim.com>
Date:   Sun Mar 23 13:40:12 2014 -0400

    Rust: Update ctags tests.
    
    Also, make them compile again with the Rust compiler.

 tests/ctags/test_input.rs      | 24 +++++++++++++++++++++++-
 tests/ctags/test_input.rs.tags |  7 +++++++
 tests/ctags/test_input2.rs     |  2 ++
 3 files changed, 32 insertions(+), 1 deletion(-)

commit 478534e63523b5d7b3998b7b56c82b62600a45ea
Author: SiegeLord <slabode@aim.com>
Date:   Tue Mar 25 18:04:06 2014 -0400

    Rust: Allow [] delimeters for macros.
    
    New Rust syntax.

 tagmanager/ctags/rust.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

commit 2bde26b2027d683619a8c6013db8d63a92291a75
Author: SiegeLord <slabode@aim.com>
Date:   Sun Mar 23 12:44:17 2014 -0400

    Rust: Fix parsing of attributes in structs/enums.
    
    Previously, things like:
    
    struct Foo
    {
        #[bar]
        baz: int
    }
    
    or
    
    struct Foo
    {
        #![bar]
        baz: int
    }
    
    would horribly confuse the parser and prevent proper parsing of the rest of the
    file.

 tagmanager/ctags/rust.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

commit 52a179dce1717a673e8b4e57d507adea2fca6b59
Author: SiegeLord <slabode@aim.com>
Date:   Sun Mar 23 12:21:22 2014 -0400

    Rust: Fix parsing of function pointer struct fields.
    
    Previously, skipUntil was confused by the -> token.

 tagmanager/ctags/rust.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 16d9bbb26739bb14947fe25cb57de08a5c19e62f
Merge: 4b6e27c 98be8b1
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Apr 1 21:45:21 2014 +0200

    Merge pull request #236 from federeghe/translate
    
    Update Italian translation

commit 98be8b1cf3696e88e8e545babfdd9d9ccadd8926
Author: federeghe <federico.dev@reghe.net>
Date:   Tue Apr 1 21:35:15 2014 +0200

    Updated Italian translation

 po/it.po | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

commit 4b6e27c5166434dbf745b2287d1fd71cd6fa88b3
Author: Yosef Or Boczko <yoseforb@src.gnome.org>
Date:   Tue Apr 1 00:40:13 2014 +0300

    Updated Hebrew translation

 po/he.po | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

commit ea53365b813b967d06d797b0ce9a428207b2fd45
Merge: 60af2f1 726ee2b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Apr 1 11:28:14 2014 +0200

    Merge pull request #235 from xhacker/zh_CN
    
    Update zh_CN.po

commit 726ee2b372ddba08092d96f06d363ea526ec6c42
Author: LIU Dongyuan / 柳东原 <liu.dongyuan@gmail.com>
Date:   Mon Mar 31 17:37:45 2014 -0700

    Update zh_CN.po

 po/zh_CN.po | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 60af2f1bcd2d8847af5f73176a6e456c6855fe59
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Mar 31 20:53:08 2014 +0200

    Update NEWS files for more updated translations

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8e06d0dc1de7861f849ba7a064fb47e394dd6060
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Mar 31 20:52:03 2014 +0200

    Update of Spnaish translation

 po/es.po | 163 +++++++++++++++++++++++----------------------------------------
 1 file changed, 60 insertions(+), 103 deletions(-)

commit aed357254ca3f10febe3d07fca017e563660c46f
Author: Stanislav Horáček <stanislav.horacek@gmail.com>
Date:   Mon Mar 31 19:07:45 2014 +0200

    Updated Czech translation

 po/cs.po | 52 +++++++++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

commit cf3da8c661a293167880281a188bd5b7715ba337
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Mar 30 20:52:21 2014 +0200

    Update NEWS files for more updated translations

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c6e3c578ad1e822053e0a9398b5b111f5199b827
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Mar 30 20:51:36 2014 +0200

    Update of German translation

 po/de.po | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 3b56809a45f5c563902f2ffcc7b468973a8f0881
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Mar 30 20:49:21 2014 +0200

    Update of po files for string freeze of Geany 1.24

 po/ar.po    | 1951 +++++++++++++------------
 po/ast.po   | 1974 +++++++++++++------------
 po/be.po    | 1973 +++++++++++++------------
 po/bg.po    | 1963 +++++++++++++------------
 po/ca.po    | 4530 ++++++++++++++++++++++++++++++---------------------------
 po/cs.po    | 1982 +++++++++++++------------
 po/de.po    |   16 +-
 po/el.po    | 1963 +++++++++++++------------
 po/en_GB.po | 1978 +++++++++++++------------
 po/es.po    | 4268 ++++++++++++++++++++++++++++--------------------------
 po/et.po    | 1968 +++++++++++++------------
 po/eu.po    | 1962 +++++++++++++------------
 po/fa.po    | 1977 +++++++++++++------------
 po/fi.po    | 1982 +++++++++++++------------
 po/fr.po    |  945 ++++++------
 po/gl.po    | 3214 ++++++++++++++++++++++-------------------
 po/he.po    |   12 +-
 po/hi.po    | 1891 ++++++++++++------------
 po/hu.po    | 3176 +++++++++++++++++++++-------------------
 po/id.po    | 1978 +++++++++++++------------
 po/it.po    |  335 +++--
 po/ja.po    | 1986 +++++++++++++------------
 po/kk.po    | 1962 +++++++++++++------------
 po/ko.po    | 1960 +++++++++++++------------
 po/lb.po    | 1977 +++++++++++++------------
 po/lt.po    |   16 +-
 po/mn.po    | 1924 +++++++++++++------------
 po/nl.po    | 1981 +++++++++++++------------
 po/nn.po    | 1914 ++++++++++++------------
 po/pl.po    | 1979 +++++++++++++------------
 po/pt.po    | 1982 +++++++++++++------------
 po/pt_BR.po | 4584 +++++++++++++++++++++++++++++++---------------------------
 po/ro.po    | 1972 +++++++++++++------------
 po/ru.po    | 1982 +++++++++++++------------
 po/sk.po    |   12 +-
 po/sl.po    |  848 ++++++-----
 po/sr.po    | 1937 +++++++++++++------------
 po/sv.po    | 1982 +++++++++++++------------
 po/tr.po    | 4643 ++++++++++++++++++++++++++++++++---------------------------
 po/uk.po    | 1958 +++++++++++++------------
 po/vi.po    | 1973 +++++++++++++------------
 po/zh_CN.po |   12 +-
 po/zh_TW.po | 1966 +++++++++++++------------
 43 files changed, 44221 insertions(+), 39367 deletions(-)

commit 1d0fc64ce8b07b6b03320b293724cd70eca05c22
Author: Steven Valsesia <steven.valsesia@gmail.com>
Date:   Fri Mar 7 21:15:28 2014 +0100

    Add the choice to use Windows or Gtk color chooser dialog
    
    Modification of the string "Use Windows File Open/Save dialogs" to
    "Use Windows native dialogs".
    
    Signed-off-by: bestel <steven.valsesia@gmail.com>
    Signed-off-by: Colomban Wendling <ban@herbesfolles.org>

 data/geany.glade |  4 ++--
 src/tools.c      | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

commit 8846ef2c5d41f87aab6754153bcb33ddf8f1e0f0
Author: LIU Dongyuan / 柳东原 <liu.dongyuan@gmail.com>
Date:   Sat Mar 29 21:42:09 2014 -0700

    Update zh_CN.po

 po/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f05e8001e90276fa54ca68ce98a04bd76493fd11
Author: LIU Dongyuan / 柳东原 <liu.dongyuan@gmail.com>
Date:   Sat Mar 29 21:37:51 2014 -0700

    Update zh_CN.po

 po/zh_CN.po | 1976 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1027 insertions(+), 949 deletions(-)

commit d4900df553c10287de80c6f820e221af4f4f41df
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Mar 30 12:17:41 2014 +0200

    Fix restructuredText syntax

 HACKING | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 8f511b66f37524d13d9e532e040e6703bf57341f
Merge: a744000 aaed5e0
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Mar 29 22:30:03 2014 +0100

    Merge pull request #224 from bestel74/update_HACKING_file
    
    Update the HACKING file: add "pull request" before "patches"

commit a74400036248a28166246e51bec44383c83d95b6
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Mar 29 22:26:48 2014 +0100

    Update of German translation

 po/de.po | 399 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 216 insertions(+), 183 deletions(-)

commit 1e918d4f4eb3cb4bbe312d0ae65580b84e4ba06a
Author: Yosef Or Boczko <yoseforb@src.gnome.org>
Date:   Sat Mar 29 23:05:19 2014 +0300

    Updated Hebrew translation

 po/he.po | 3311 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1675 insertions(+), 1636 deletions(-)

commit cb07852ba5b9672408831878363d0d1cdc562691
Merge: bd06d7a a70ab6a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Mar 28 15:14:13 2014 +0100

    Merge pull request #232 from stefan-it/enhancement/lang-de-corrections
    
    Typo corrections for German language file.

commit a70ab6a5f774722b842ba226459512a75593a413
Author: Stefan Schweter <schweter@cip.ifi.lmu.de>
Date:   Fri Mar 28 14:33:45 2014 +0100

    Typo corrections for German language file.

 po/de.po | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit aaed5e028eaad0a212671949e235bed5020aa94f
Author: Steven Valsesia <steven.valsesia@gmail.com>
Date:   Tue Mar 11 11:53:51 2014 +0100

    Update the HACKING file, explain PR
    
    Add the new way of contributing for geany.

 HACKING | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

commit bd06d7a1021b3f6f32e6ee02e917e083425326da
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Mar 23 15:23:42 2014 +0100

    Update Doxyfile.in for newer doxygen versions
    
    Automatic config file update by running 'doxygen -u'. All previous settings are
    kept but old, deprecated settings were removed to avoid annoying warnings
    when executing doxygen (e.g. on the nightly cronjob to update the API docs
    on geany.org).
    Furthermore, the update tool added a lot of comments above the options,
    which is probably good.

 doc/Doxyfile.in | 1584 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 1569 insertions(+), 15 deletions(-)

commit 40db23752adcb01d61a01003c58c2bba950c9bf7
Merge: 608817f 1f0898b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Mar 23 10:49:38 2014 +0100

    Merge pull request #227 from fiacobelli/master
    
    changed filetypes.latex to add Bibtex compilation

commit 608817f4bd8ebcd5807c8cca298b05bcc34a5236
Merge: b27b367 5141f98
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Mar 23 10:47:17 2014 +0100

    Merge pull request #228 from gymka/master
    
    Updated Lithuanian translation

commit 5141f98f8c221daf4d7cf589d1ddda82f51b5518
Author: gymka <gymka@archlinux.lt>
Date:   Sun Mar 23 09:10:15 2014 +0200

    updated Lithuanian translation

 po/lt.po | 1978 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1028 insertions(+), 950 deletions(-)

commit 1f0898be05c59ab993075fd152476b760d6ad79b
Author: Francisco Iacobelli <francisco@iacobelli.cl>
Date:   Fri Mar 21 15:29:55 2014 -0500

    changed filetypes.latex to add Bibtex compilation

 data/filetypes.latex | 3 +++
 1 file changed, 3 insertions(+)

commit b27b3678dd787719a96832cd3a53102e0d66e177
Author: elextr <elextr@gmail.com>
Date:   Fri Mar 21 15:46:45 2014 +1100

    Add boolean to Pascal keyword list
    
    Pascal has a boolean type (see wikipedia entry) fixes bug #1033

 data/filetypes.pascal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c96e09f76fee933ad3264f150ec483270e54290c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Mar 18 19:57:26 2014 +0100

    Update of Slovak translation

 NEWS     |    2 +-
 po/sk.po | 4171 +++++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 2215 insertions(+), 1958 deletions(-)

commit 71b48bd6fb2e499e3352ad70c3e2cfa567ef667b
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Mar 16 13:20:05 2014 +0100

    Regenerate 16x16 Geany icon to be not cutoff
    
    For some reason, the icon was cutoff in the upper left corner.
    From the GIT history, I can't find any real reference for the
    reason, so I guess this was just a mistake when convertig the
    32x32 icon to 16x16. If anyone knows better, please tell me.

 icons/16x16/geany.png | Bin 830 -> 897 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

commit d76323260c85eebdbe54c8155ffa51ae68a205aa
Author: elextr <elextr@gmail.com>
Date:   Fri Mar 14 15:03:12 2014 +1100

    Put Makefile comments at start of line.
    
    In a makefile comments in recipes must start at the beginning of
    the line (see [1]).  Thanks to cousteau on IRC.
    
    [1] http://www.gnu.org/software/make/manual/make.html#Recipe-Syntax

 data/filetypes.makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4a8910fc4afc67fb0bf898592763322854a33b32
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Mar 12 14:26:04 2014 +0100

    Fix GTK 2.16 support (oops)

 src/ui_utils.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

commit bd6db90e297116e0b4168216a644fe1dbee8969f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 11 15:45:49 2014 +0100

    Windows: add default extension to native save dialogs
    
    Fixes bug #1021.
    
    Based on an initial work by Steven Valsesia, thanks!

 src/dialogs.c |  2 +-
 src/win32.c   | 15 ++++++++++++---
 src/win32.h   |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

commit 1e2be9e7b49bfe2b61a04b60ae3314e314a00dd9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 11 13:14:03 2014 +0100

    Add a note in the docs about shell constructs in custom commands

 doc/geany.txt | 6 ++++++
 1 file changed, 6 insertions(+)

commit 9ae07905620e78da3550945f47d01f2c7ea14edb
Merge: 717f8e1 77b8284
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 7 22:12:04 2014 +0100

    Merge branch 'bestel74/add_apply_button_color_chooser'
    
    Closes PR #223.

commit 77b82845edcc796380cddc26cc4064329f0817cd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 7 22:09:40 2014 +0100

    Fix color chooser button order

 src/tools.c    |  2 ++
 src/ui_utils.c | 35 +++++++++++++++++++++++++++++++++++
 src/ui_utils.h |  3 +++
 3 files changed, 40 insertions(+)

commit dbf9061a52b9ea32b3928be14b30dc1637019fc0
Author: Steven Valsesia <steven.valsesia@gmail.com>
Date:   Fri Mar 7 15:27:18 2014 +0100

    Feature request #686 : Add apply button on Gtk color chooser
    
    feature request : http://sourceforge.net/p/geany/feature-requests/686/
    
    Signed-off-by: Steven Valsesia <steven.valsesia@gmail.com>

 src/tools.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 717f8e1b137f7a51a78ffbf12d1c0c15b1784bc3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Mar 6 15:01:38 2014 +0100

    Windows: fix possible buffer overflows
    
    Fix improper use of MultiByteToWideChar() that could have led to
    buffer overflows.

 src/win32.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

commit 467f56ae7e70437f9c180f750e35520dc8811858
Author: Steven Valsesia <steven.valsesia@gmail.com>
Date:   Tue Mar 4 17:04:44 2014 +0100

    Add a new feature: autosave when the editor lose focus
    
    Documented unwanted behavior: pop-up saving.
    
    Closes feature request #683.
    
    Signed-off-by: Steven Valsesia <steven.valsesia@gmail.com>

 doc/geany.txt         |  8 ++++++++
 plugins/saveactions.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 64 insertions(+), 1 deletion(-)

commit 9c45ffd8ed312a8140bd652897e3a1864e45df58
Author: Steven Valsesia <steven.valsesia@gmail.com>
Date:   Tue Mar 4 14:33:47 2014 +0100

    Add documentation for the auto-save feature.
    
    Signed-off-by: Steven Valsesia <steven.valsesia@gmail.com>

 doc/geany.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 2f120d73c9dd13f3aa7aeb4bbe59979750c14c93
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Feb 27 14:33:45 2014 +0100

    Fix typo in "deque" include name
    
    Fixes bug #1027.

 src/ui_utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8930ba80eb7a5fb2c489772fa37fc269202ba2d3
Merge: 26d2ef8 5965b5e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Feb 23 20:30:11 2014 +0100

    Merge branch 'fortran/improvements'

commit 5965b5ebd3797b846ff3b92e9a5079d0834537f1
Author: Adam Hirst <adam@aphirst.karoo.co.uk>
Date:   Sun Feb 23 20:16:29 2014 +0100

    Fortran: add a few more test cases

 tests/ctags/Makefile.am         |  2 ++
 tests/ctags/block.f90           | 51 +++++++++++++++++++++++++++++++++++++++++
 tests/ctags/block.f90.tags      |  7 ++++++
 tests/ctags/interfaces.f90      | 45 ++++++++++++++++++++++++++++++++++++
 tests/ctags/interfaces.f90.tags |  8 +++++++
 5 files changed, 113 insertions(+)

commit d8954bbf67d575883a3fb3687e776cb92793d88c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Feb 22 17:50:56 2014 +0100

    Fortran: add support for "len" and "kind" qualifiers
    
    Test cases contributed by Adam Hirst, thanks.

 tagmanager/ctags/fortran.c           |  6 ++++++
 tests/ctags/Makefile.am              |  2 ++
 tests/ctags/members.f90              | 19 +++++++++++++++++++
 tests/ctags/members.f90.tags         |  8 ++++++++
 tests/ctags/qualified_types.f90      | 12 ++++++++++++
 tests/ctags/qualified_types.f90.tags | 11 +++++++++++
 6 files changed, 58 insertions(+)

commit ed1dc50062c27e1c00d94404d96e6bc3dd051e29
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Feb 22 16:54:30 2014 +0100

    Fortran: allow keywords as names
    
    Allow keywords for names of modules, programs, types, interfaces,
    structures and enums.
    
    Test case contributed by Adam Hirst, thanks.

 tagmanager/ctags/fortran.c         | 38 +++++++++++++++++++++++++++-----------
 tests/ctags/Makefile.am            |  1 +
 tests/ctags/keyword_names.f90      | 28 ++++++++++++++++++++++++++++
 tests/ctags/keyword_names.f90.tags |  8 ++++++++
 4 files changed, 64 insertions(+), 11 deletions(-)

commit e47d45eb281a968b733241aab431c045d61569f9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Feb 22 17:05:08 2014 +0100

    Fortran: fix handling of preprocessor directives on the first line
    
    Fix a race initialization leading to incorrect handling of preprocessor
    directives on the first input line.
    
    Test case contributed by Adam Hirst, thanks.

 tagmanager/ctags/fortran.c        | 13 +++++++------
 tests/ctags/Makefile.am           |  1 +
 tests/ctags/preprocessor.f90      | 17 +++++++++++++++++
 tests/ctags/preprocessor.f90.tags |  5 +++++
 4 files changed, 30 insertions(+), 6 deletions(-)

commit 98717999d0dd7362078514ec0964b39db605307d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Feb 20 23:07:20 2014 +0100

    Fortran: add missing `block` and `endblock` keywords

 data/filetypes.fortran | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ef4c72501e0f8532e31a9fac91a3a29c3e078ce4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Feb 20 22:47:55 2014 +0100

    Fortran: generate fake tags for anonymous structures, interfaces and enums
    
    This allows both to show those anonymous elements, as well as giving a
    parent to their children, fixing display in the symbols tree.

 src/symbols.c                    |  1 +
 tagmanager/ctags/fortran.c       | 38 +++++++++++++---------
 tests/ctags/enum.f90.tags        | 70 +++++++++++++++++++++-------------------
 tests/ctags/enumerators.f90.tags | 31 ++++++++++--------
 tests/ctags/numlib.f90.tags      |  1 +
 tests/ctags/recursive.f95.tags   |  2 ++
 tests/ctags/structure.f.tags     |  3 +-
 7 files changed, 81 insertions(+), 65 deletions(-)

commit 9520e7f7d7b7a9570db2feb165653ef1d68e547a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Feb 20 19:26:00 2014 +0100

    Fortran: parse Fortran 2003 enums
    
    Allow for not-yet-standard enum naming using `:: name` syntax, see
    http://docs.cray.com/books/S-3692-51/html-S-3692-51/z970507905n9123.html
    
    Test cases contributed by Adam Hirst, thanks.

 tagmanager/ctags/fortran.c       | 105 +++++++++++++++++++++++++++++++++------
 tests/ctags/Makefile.am          |   2 +
 tests/ctags/enum.f90             |  52 +++++++++++++++++++
 tests/ctags/enum.f90.tags        |  46 +++++++++++++++++
 tests/ctags/enumerators.f90      |  55 ++++++++++++++++++++
 tests/ctags/enumerators.f90.tags |  26 ++++++++++
 6 files changed, 271 insertions(+), 15 deletions(-)

commit 329b2cb40135b759322a9a3f942ddad64ae5c78b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Feb 20 22:43:12 2014 +0100

    Fortran: don't generate tags for interface content

 tagmanager/ctags/fortran.c     | 2 +-
 tests/ctags/numlib.f90.tags    | 3 ---
 tests/ctags/recursive.f95.tags | 8 --------
 3 files changed, 1 insertion(+), 12 deletions(-)

commit 26d2ef8d99c6c66796d7ab8b4a09aa230c9905ac
Merge: 7d76063 044120e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Feb 19 16:15:52 2014 +0100

    Merge branch 'win32-quote-spawn-args'
    
    Closes bug #943 and PR #180.

commit 044120e87ce8ce021832868ae690d282f59d3b15
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 3 15:42:56 2014 +0100

    Windows: properly initialize errno before checking it
    
    errno is never reset to 0 by the system libraries, so if we test
    its value we need to reset it to 0 before the call that may change
    it to something else.

 src/win32.c | 1 +
 1 file changed, 1 insertion(+)

commit 0ebf6ab82e8a9232caaabf0dd845390307fa1c80
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 3 15:41:44 2014 +0100

    Windows: convert the spawned command to locale encoding
    
    Converting to locale encoding is required to allows non-ASCII
    characters in the command, e.g. in the file names.

 src/win32.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 6af27eeb7af7fbb458c93bf98133a6a177014a5e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 3 15:40:37 2014 +0100

    Windows: add a debug to show the command as it is run

 src/win32.c | 1 +
 1 file changed, 1 insertion(+)

commit 5c893e9b0eac95cc26f35a5dc279872ff1588f27
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 3 15:36:28 2014 +0100

    Windows: fix spawning commands with spaces
    
    Fix spawnning command under Windows when they contain spaces in both
    the executable and the arguments.  Apparently system() quoting is
    unexpected, and doesn't work properly if there is more than 2 quotes
    in the whole command.
    
    To work this around, spawn the command through `cmd.exe /S /C`.

 src/win32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f1ce9afadd743dee5a6184b12eb5125305570d4d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Feb 19 01:10:07 2014 +0100

    TM: don't needlessly duplicate array when searching for current tag

 tagmanager/src/tm_workspace.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit c078a13019dc7a0a2789bf672feceaa9cb91f1c3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Feb 19 01:05:37 2014 +0100

    TM: simplify match test for current tag

 tagmanager/src/tm_workspace.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 5a67a4f64c633e83d0764eb71caaa6707e19c71f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Feb 18 19:33:39 2014 +0100

    Fortran: report interfaces

 tagmanager/ctags/fortran.c     | 2 +-
 tests/ctags/bug734933.f90.tags | 1 +
 tests/ctags/numlib.f90.tags    | 3 +++
 tests/ctags/recursive.f95.tags | 8 ++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

commit 29336ffed0742a876ef49ae3d6be220f09e554f2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Feb 18 19:10:58 2014 +0100

    Fortran: display components

 src/symbols.c                      | 1 +
 tagmanager/ctags/fortran.c         | 2 +-
 tests/ctags/array-spec.f90.tags    | 4 ++++
 tests/ctags/bug565813.f90.tags     | 1 +
 tests/ctags/bug734933.f90.tags     | 4 ++++
 tests/ctags/invalid_name.f90.tags  | 3 +++
 tests/ctags/misc_types.f90.tags    | 2 ++
 tests/ctags/square_parens.f90.tags | 2 ++
 tests/ctags/structure.f.tags       | 9 +++++++++
 tests/ctags/union.f.tags           | 4 ++++
 10 files changed, 31 insertions(+), 1 deletion(-)

commit 362a5cc6548982efa0898eaeabc353c089397580
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Feb 18 18:28:35 2014 +0100

    Fortran: properly report scope for programs, subroutines and types
    
    To do this we change the internal types to only use types matched by
    symbols_get_current_scope().  This is a bit of a hack, but the tag
    types were already questionable and simply mapped to ones the
    TagManager know.
    
    This however merges Functions and Subroutines under the same top-level
    item in the symbol list.

 src/symbols.c                                 |  6 +++---
 tagmanager/ctags/fortran.c                    |  6 +++---
 tests/ctags/array-spec.f90.tags               |  2 +-
 tests/ctags/auto.f.tags                       |  2 +-
 tests/ctags/bug565813.f90.tags                |  6 +++---
 tests/ctags/bug670433.f90.tags                |  2 +-
 tests/ctags/bug726712.f90.tags                |  6 +++---
 tests/ctags/bug734933.f90.tags                |  6 +++---
 tests/ctags/bug858165.f90.tags                |  2 +-
 tests/ctags/bug877956.f90.tags                |  2 +-
 tests/ctags/byte.f.tags                       |  2 +-
 tests/ctags/common.f.tags                     |  2 +-
 tests/ctags/debian_432872.f90.tags            |  2 +-
 tests/ctags/forall_module.f90.tags            |  2 +-
 tests/ctags/fortran_associate.f90.tags        |  2 +-
 tests/ctags/invalid_name.f90.tags             |  2 +-
 tests/ctags/misc_types.f.tags                 |  2 +-
 tests/ctags/misc_types.f90.tags               |  4 ++--
 tests/ctags/namelist.f.tags                   |  2 +-
 tests/ctags/procedure_pointer_module.f90.tags |  2 +-
 tests/ctags/procpoint.f90.tags                |  2 +-
 tests/ctags/square_parens.f90.tags            |  6 +++---
 tests/ctags/stdcall.f.tags                    |  4 ++--
 tests/ctags/structure.f.tags                  | 14 +++++++-------
 tests/ctags/union.f.tags                      |  4 ++--
 tests/ctags/value.f.tags                      |  2 +-
 26 files changed, 47 insertions(+), 47 deletions(-)

commit 7d760632824efacd44231f89d46de3a1deac64ec
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 17 23:17:35 2014 +0100

    Fortran: fix handling of pointer association operator
    
    Test case contributed by Adam Hirst, thanks.
    
    Closes #1030.

 tagmanager/ctags/fortran.c     |  3 ++-
 tests/ctags/Makefile.am        |  1 +
 tests/ctags/procpoint.f90      | 32 ++++++++++++++++++++++++++++++++
 tests/ctags/procpoint.f90.tags | 13 +++++++++++++
 4 files changed, 48 insertions(+), 1 deletion(-)

commit 1c0fa99e1d84b0331d65e56dcab4002f0006ccb1
Author: Adam Hirst <adam@aphirst.karoo.co.uk>
Date:   Sat Feb 15 14:29:22 2014 +0000

    Support F2003 array syntax and F2008 coarrays
    
    Fortran 2003 allows '[' and ']' as array constructors in addition to
    the legacy '(/' and '/)'. Fortran 2008 allows '[]' as part of a
    CODIMENSION specifier, which can either be `codimension[]` in
    the type-spec; or as either `variable[]` or `variable()[]` in
    the entry-spec.
    
    Credit to Colomban Wendling for the skipOverSquares logic, and
    treating `codimension` as a special-case.
    
    Last part of bug #1023.

 tagmanager/ctags/fortran.c         | 49 +++++++++++++++++++++++++++++---------
 tests/ctags/Makefile.am            |  1 +
 tests/ctags/square_parens.f90      | 39 ++++++++++++++++++++++++++++++
 tests/ctags/square_parens.f90.tags | 13 ++++++++++
 4 files changed, 91 insertions(+), 11 deletions(-)

commit 20f12872e28d9ff10db2fb477905edcdededb360
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Fri Feb 14 22:11:10 2014 +0200

    re-fix regex error message parsing (match count returns # of subgroups)

 src/filetypes.c | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

commit 497bfaed465ac3aa3baf394029189a01a043ff2e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Feb 15 00:28:01 2014 +0100

    Fortran: fix line continuation inside comments
    
    Fix improperly handling '&' at the end of the first comment line after
    a non-comment line as a line continuation.
    
    Part of bug #1023.

 tagmanager/ctags/fortran.c                     |  8 ++++----
 tests/ctags/Makefile.am                        |  1 +
 tests/ctags/fortran_line_continuation.f90      | 17 +++++++++++++++++
 tests/ctags/fortran_line_continuation.f90.tags |  3 +++
 4 files changed, 25 insertions(+), 4 deletions(-)

commit f22c028ca4c4bdf1d0669023fe22aaaeab93d5f1
Merge: df9a1b1 e1b115e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Feb 14 19:32:17 2014 +0100

    Merge branch 'aphirst/patch-1'
    
    Closes PR#209.

commit e1b115ee52cecce68277f850f6ebb18cc0f044fc
Author: Adam Hirst <adam@aphirst.karoo.co.uk>
Date:   Fri Feb 14 18:27:04 2014 +0000

    Added tests for the inclusion of ASSOCIATE in the tag manager

 tests/ctags/Makefile.am                |  1 +
 tests/ctags/fortran_associate.f90      | 20 ++++++++++++++++++++
 tests/ctags/fortran_associate.f90.tags |  5 +++++
 3 files changed, 26 insertions(+)

commit 2085e8a57c1623eb8fdd950c5eeda61c85c9b1ac
Author: Adam Hirst <adam@aphirst.karoo.co.uk>
Date:   Fri Feb 14 16:56:00 2014 +0000

    Symbol browser breaks with END ASSOCIATE
    
    Related to bug #1023.

 tagmanager/ctags/fortran.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit df9a1b15c60f91be2af558112dc201569b9863d2
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Jan 21 20:22:28 2014 +0200

    fix regex error message parsing (GRegex indexes subgroups, not matches)

 src/filetypes.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

commit b1d6291f7d15e3aed00f5def034d2fe4cf4ed7ab
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Feb 11 18:15:00 2014 +0100

    Fix unused warning when building without VTE support

 src/keyfile.c | 2 ++
 1 file changed, 2 insertions(+)

commit 5d3b2f6269dc9151d9d72ab550539e6de37a439f
Author: elextr <elextr@gmail.com>
Date:   Mon Feb 10 12:19:45 2014 +1100

    Fix crash if document closed while custom command is executing
    
    Custom command callback never checked that the doc was still valid.
    Can still paste in the wrong doc if user closes and opens while
    the command is running, but not crash.

 src/tools.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 09c2315bc43778537db987aa38d54dd5bf97381d
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Feb 9 09:26:36 2014 +0100

    Change expected tag kind for Python imports in tests since the parser has changed
    
    This fixes the tests which failed because I changed the parsing yesterday to
    classify Python as externvars and not as namespace tags anymore.

 tests/ctags/cython_sample2.pyx.tags        |  2 +-
 tests/ctags/py_constructor_arglist.py.tags | 26 +++++++++++++-------------
 tests/ctags/simple.py.tags                 |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

commit 3d9908df8cf63c857d2f38b6653df018acb67ba8
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Feb 8 10:26:08 2014 +0100

    Set tag kind for Python imports to externvar and map them in the symbol list.
    
    This fixes 'Go to Tag definition' for parsed Python imports as before the import
    statement was chosen as the definition while we prefer the class definition as
    target.

 src/symbols.c             | 2 +-
 tagmanager/ctags/python.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit c4b0f0f74dc370ee43a14f76af3f4ba9fab48139
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Feb 8 10:23:30 2014 +0100

    Add new symbol list category "Extern variables"
    
    This is a requirement for an upcoming Python parser fix. This new category
    will be currently only used by Python, C and D parsers. Before this change,
    in C & D extern variables were sorted into the category "Other", now they
    have their own category.

 src/symbols.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit c3aeb731945b6502bebc9e55375a45a75da3d5f8
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Feb 2 21:53:27 2014 +0100

    Minimal update of Spanish translation to fix misstranslated string.

 po/es.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 465378d72a5d3672750dc9ba87792f2208adcc00
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Jan 30 23:20:48 2014 +0100

    Update of Italian translation

 po/it.po | 782 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 401 insertions(+), 381 deletions(-)

commit 986c59aecb06f3e727d7242368422745f6917775
Author: Matthew Brush <matt@geany.org>
Date:   Tue Jan 28 17:16:50 2014 -0800

    Use GeanyFiletypeGroupID enum in a few places
    
    Also move the `group_menus` global variable to the top of the file
    with the other globals.

 src/filetypes.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 6a85a50d21b6297fe1ea51ecc8792f6a1f81cf58
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jan 29 01:34:26 2014 +0100

    Replace bare CTags parser ID numbers with an enumeration
    
    Avoid using magic numbers in the source for better readability and
    easier maintenance.

 HACKING                        |   9 +--
 src/filetypes.c                | 126 +++++++++++++++++++++--------------------
 tagmanager/ctags/parsers.h     |  51 +----------------
 tagmanager/src/Makefile.am     |   1 +
 tagmanager/src/tm_parser.h     |  75 ++++++++++++++++++++++++
 tagmanager/src/tm_tagmanager.h |   1 +
 wscript                        |   2 +-
 7 files changed, 149 insertions(+), 116 deletions(-)

commit 576be4ca3b16326d3c6812c51db0062a9140d9fa
Author: Matthew Brush <matt@geany.org>
Date:   Mon Jan 27 18:11:34 2014 -0800

    Reformat builtin filetype initialization code into tabular format
    
    * Add an initialization function ft_init()
    * Add a function-like macro to call ft_init() with shorter arguments
    * Search and replace old code with FT_INIT() usage
    * Layout into columns and add documentation above

 src/filetypes.c | 527 ++++++++++----------------------------------------------
 1 file changed, 88 insertions(+), 439 deletions(-)

commit c674f0660ab9571c9071b84fc9eb38e1c6a60d4d
Author: Matthew Brush <matt@geany.org>
Date:   Mon Jan 27 17:04:38 2014 -0800

    Cleanup filetype_make_title() a bit and use it more
    
    * Adds TITLE_NONE, TITLE_SCRIPT and TITLE_DOCUMENT.
    * Only a few filetype titles were tweaked but we should review the
      rest as we could use TITLE_SCRIPT and TITLE_DOCUMENT a lot more
      probably.
    * Make filetype_make_title() not care about GeanyFiletype type and
      return result instead of internally setting ft state.

 src/filetypes.c | 139 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 73 insertions(+), 66 deletions(-)

commit 8449b5f9b17e38d36065096287518d4443e3e41b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Jan 26 22:31:51 2014 +0100

    Minor update of German translation

 po/de.po | 707 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 356 insertions(+), 351 deletions(-)

commit d40932ce4d05e57573a6d6c8f89f4aea8c42d4f3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jan 2 18:07:35 2014 +0100

    C++: mitigate matching error on generics containing an expression
    
    Mitigate parse error with generics like `foo<X<Y> x;` by avoiding
    matching past a semicolon (";") or open curly brace ("{"), which
    can't be part of the generic.  This isn't a proper fix, but mitigates
    the impact of such constructs.

 tagmanager/ctags/c.c            | 10 ++++++++++
 tests/ctags/bug1563476.cpp.tags |  2 ++
 2 files changed, 12 insertions(+)

commit f227076dc425052b85091e495b04f6d5b7a3f965
Author: elextr <elextr@gmail.com>
Date:   Thu Jan 23 21:07:37 2014 +1100

    Improve Asciidoc title parsing
    
    1) Prevent parsing titles inside delimited blocks
    2) Always detect -- lines as open block delimiters not titles
    3) Support single line titles

 tagmanager/ctags/asciidoc.c | 94 +++++++++++++++++++++++++++++----------------
 1 file changed, 61 insertions(+), 33 deletions(-)

commit c2dcec7107514c0632d8f657c3325b3963cf22a6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jan 18 15:15:11 2014 +0100

    Don't use G_LIKELY() in macros commonly used in g_return_if_fail()
    
    g_return_if_fail() puts itself its condition in a G_LIKELY() clause,
    and nested G_LIKELY() lead to warnings about shadowed variables, as
    well as not being of any use.
    
    Also, hiding G_LIKELY() in a macro may lead to unexpected use of it
    which may hint the compiler incorrectly.

 src/document.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7473e4b1d94acd502c0aeb5e17d0b62235414294
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jan 18 15:12:22 2014 +0100

    Add defensive checks for function receiving a GeanyDocument argument
    
    Always check the passed-in GeanyDocument argument is a valid one, not
    to possibly work on an invalid document.

 src/build.c       | 12 +++++++++++-
 src/dialogs.c     |  4 +++-
 src/document.c    |  2 ++
 src/filetypes.c   |  2 ++
 src/keybindings.c |  8 ++++----
 src/navqueue.c    |  3 ++-
 src/printing.c    |  3 +--
 src/search.c      |  6 +++---
 src/sidebar.c     |  2 ++
 src/symbols.c     |  4 +++-
 src/templates.c   | 12 +++++++++---
 src/tools.c       |  4 ++--
 src/ui_utils.c    | 14 ++++++++++++++
 13 files changed, 58 insertions(+), 18 deletions(-)

commit c4549b1e73fd2ea588dbaa5323b3fbf6960f5522
Author: elextr <elextr@gmail.com>
Date:   Wed Jan 22 09:45:02 2014 +1100

    Add new automake products to .gitignore
    
    Newer automake creates .dirstamp and config.h.in~

 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit 5d62030667b917a942ff05562807ef761a120728
Author: elextr <elextr@gmail.com>
Date:   Wed Jan 22 08:59:14 2014 +1100

    Fix "leaks" of geany_run_script (bug 975)
    
    In build_run_cmd() the script was not deleted when any one of
    several errors occurred.  The errors are not related to script
    contents so it makes no sense to leave the script.
    
    Also fixes failure to delete script if a working dir was set.

 src/build.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit df4770362fff8f17513447e905db731d99a0d949
Merge: 7c6f48e 05dda6b
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Mon Jan 20 07:41:53 2014 -0800

    Merge pull request #205 from aphirst/fortran-keywords
    
    Corrections and Amendments to the Fortran "filetype" files

commit 05dda6b001ac71d0fc8592f480e30b8a52e2def5
Author: Adam Hirst <adam@aphirst.karoo.co.uk>
Date:   Mon Jan 20 15:21:36 2014 +0000

    Updated keywords and intrinsic functions in accordance with the Fortran 2008 standard.

 data/filetypes.fortran | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 10ac2816af2d57326251d7a4101273f068cc13f4
Author: Adam Hirst <adam@aphirst.karoo.co.uk>
Date:   Mon Jan 20 15:20:12 2014 +0000

    Removed years-old typo from the keyword list.

 data/filetypes.f77 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7c6f48e4f56999eef6e5f29b4106c3e1d05ffe47
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jan 17 18:26:23 2014 +0100

    Workaround a slowness in multi-column combo boxes under GTK3
    
    Always set the combo boxes' wrap-width after their models are fully
    filled to work around dramatic slowness described in GTK bug
    https://bugzilla.gnome.org/show_bug.cgi?id=722388

 data/geany.glade | 2 --
 src/dialogs.c    | 2 +-
 src/prefs.c      | 9 ++++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

commit 5975931be8b43086da947728406408e6dc332445
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 14 22:26:54 2014 +0100

    Add a section on how to add a test for a parser in HACKING

 HACKING | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit 7205b83abf4fe88a2445e0a9323a5789a74bbae6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 14 21:14:37 2014 +0100

    Update NEWS for Rust filetype

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e5495627924c5505425d1699fdc7380ae0465670
Merge: 1a5554c 416c3da
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 14 21:09:10 2014 +0100

    Merge branch 'SiegeLord/rust'
    
    Closes PR#181.

commit 416c3daecc649b63c96503f5c43de37b19220b11
Author: SiegeLord <slabode@aim.com>
Date:   Fri Oct 18 17:33:33 2013 -0400

    Clean up Rust ctag tests and make them more comprehensive

 tests/ctags/test_input.rs      | 72 +++++++++++++++++++++++++++++++++++-------
 tests/ctags/test_input.rs.tags | 11 ++++++-
 tests/ctags/test_input2.rs     |  5 +--
 3 files changed, 71 insertions(+), 17 deletions(-)

commit 370666865bea7ccb73689990231af87446cfe19a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 17 20:13:33 2013 -0400

    Add Rust tests to the makefile

 tests/ctags/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

commit 09cb24c7c718fe587d1f3f97feff811c05a8ab72
Author: dobkeratops <dobkeratopsgit@gmail.com>
Date:   Thu Oct 17 20:08:57 2013 -0400

    Add Rust ctag tests

 tests/ctags/test_input.rs       | 90 +++++++++++++++++++++++++++++++++++++++++
 tests/ctags/test_input.rs.tags  | 33 +++++++++++++++
 tests/ctags/test_input2.rs      | 43 ++++++++++++++++++++
 tests/ctags/test_input2.rs.tags | 19 +++++++++
 4 files changed, 185 insertions(+)

commit 828df0ab5fc6a2a25a3b1a524a34c442dc01921f
Author: SiegeLord <slabode@aim.com>
Date:   Wed Oct 16 18:27:10 2013 -0400

    Add shebang filetype detection for Rust

 src/filetypes.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3d7ade4e0232f4292b3d966e20f012afb4a2856e
Author: SiegeLord <slabode@aim.com>
Date:   Wed Oct 16 17:19:29 2013 -0400

    Integrate the Rust lexer with the rest of Geany's functionality

 data/filetype_extensions.conf   |  2 +-
 data/filetypes.Rust.conf        | 61 -----------------------------------------
 data/filetypes.rust             | 31 +++++++++++++++------
 src/document.c                  |  1 +
 src/editor.c                    |  7 +++++
 src/highlighting.c              | 14 ++++++++++
 src/highlightingmappings.h      | 35 +++++++++++++++++++++++
 src/symbols.c                   | 16 +++++++++++
 tagmanager/ctags/makefile.win32 |  2 +-
 wscript                         |  1 +
 10 files changed, 99 insertions(+), 71 deletions(-)

commit a08557321296e9fa63dae7b25a2bf71a31a92b39
Author: SiegeLord <slabode@aim.com>
Date:   Thu Oct 17 20:22:48 2013 -0400

    Use :: as the context separator for Rust

 src/symbols.c | 1 +
 1 file changed, 1 insertion(+)

commit aa7e938164dc14cb1d866effb0c11b42ec11ff6e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Oct 18 15:06:09 2013 +0200

    Update our Scintilla patch for the addition of Rust lexer

 scintilla/scintilla_changes.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 36537c4dcd7d3f78075289128c0e0a4a13544880
Author: SiegeLord <slabode@aim.com>
Date:   Sun Jan 12 13:57:03 2014 -0500

    Update Rust Scintilla lexer to Scintilla revision 4946:4d9978010c3a

 scintilla/lexers/LexRust.cxx | 177 +++++++++++++++++++++++--------------------
 1 file changed, 95 insertions(+), 82 deletions(-)

commit 4d33223c9877c81bdb5da0bacb31392e843f4d33
Author: SiegeLord <slabode@aim.com>
Date:   Wed Oct 16 12:25:57 2013 -0400

    Import the Rust lexer from Scintilla

 scintilla/Makefile.am        |   1 +
 scintilla/lexers/LexRust.cxx | 768 +++++++++++++++++++++++++++++++++++++++++++
 scintilla/makefile.win32     |   1 +
 scintilla/src/Catalogue.cxx  |   1 +
 4 files changed, 771 insertions(+)

commit b17b4be1260e8828f62c56c87cf8bf886cbbf3b4
Author: dobkeratops <dobkeratopsgit@gmail.com>
Date:   Thu Oct 17 20:07:18 2013 -0400

    Added the Rust filetype

 data/filetypes.rust | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/filetypes.c     |  9 +++++++++
 src/filetypes.h     |  1 +
 3 files changed, 61 insertions(+)

commit ad59468f3e4efb8e49503a1e5e687196f5013ede
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jan 12 13:50:45 2014 +0100

    rust: Don't use fileEOF() as it behaves unexpectedly
    
    fileEOF() actually returns TRUE anywhere after the last newline when
    using the file*() API, which includes a last line without newline.
    This is an implementation detail which makes this function not usable
    with the rest of the file*() API.  fileEOF() should actually probably
    be called iFileEOF(), but that's outside the scope of this parser.
    
    However, even if fileEOF() did work properly with fileGetc(), the very
    last byte in the input would have been omitted because we actually
    read ahead by one byte, which means the actual read reaches EOF one
    byte before our "current byte" does.
    
    Checking whether we reached EOF by checking whether our current byte
    isn't equal to `EOF` fixes it, and isn't worse since it's actually how
    fileEOF() is implemented anyway.

 tagmanager/ctags/rust.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit c84eb2c1c978bf1af165630208f0df596e07065e
Author: SiegeLord <slabode@aim.com>
Date:   Thu Oct 17 20:00:42 2013 -0400

    Add a Rust ctags generator.
    
    Thanks to Colomban Wendling for reviewing and finding and fixing many issues.

 tagmanager/ctags/Makefile.am |   1 +
 tagmanager/ctags/parsers.h   |   4 +-
 tagmanager/ctags/rust.c      | 909 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 913 insertions(+), 1 deletion(-)

commit 1a5554c41cffce0c90252c1f6503aae369659b88
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jan 10 18:33:04 2014 +0100

    Add our stock icons manually
    
    Although GtkIconFactory implements GtkBuildable properly and works just
    fine, Glade can't handle it and keeps removing it upon save.  So, drop
    the automatic setup to a manual one so the UI description is editable
    with Glade again, and which also has the small advantage of not
    repeating the stock ID strings.

 data/geany.glade |  7 -------
 src/ui_utils.c   | 25 ++++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 8 deletions(-)

commit 17a7469b6870461766c9872791f743156e038760
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jan 9 17:50:30 2014 +0100

    Avoid a few unnecessary widget lookups

 src/search.c   | 13 +++++--------
 src/ui_utils.c | 10 ++++------
 2 files changed, 9 insertions(+), 14 deletions(-)

commit 680a556fffa5311d227f476e8e154d20da638414
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jan 9 17:34:50 2014 +0100

    Find when activating the find entry in the replace dialog

 src/search.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit ee891e189eef1c168349a9420a28af02e5127738
Author: Sam Lin <itrs.lin@gmail.com>
Date:   Fri Dec 13 21:56:25 2013 +0800

    Update zh_TW.po
    
    fix typo

 po/zh_TW.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dd7c20a19470f588eaea6196d864142458d3d5ee
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jan 9 02:13:54 2014 +0100

    python: Improve access reporting
    
    See:
    * http://www.python.org/dev/peps/pep-0008/#method-names-and-instance-variables
    * http://www.python.org/dev/peps/pep-0008/#designing-for-inheritance

 tagmanager/ctags/python.c | 50 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 13 deletions(-)

commit 625c7b829d45a72951fe75b8fe6cf7aab4189fb6
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Dec 24 18:29:40 2013 +0200

    fix unexisting keys assigned to "Send selection to -> ..."

 src/tools.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 5412f73d02f0d40b96d3e2a666e09faaa44ddbf9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jan 9 02:12:44 2014 +0100

    python: Don't duplicate the kind names

 tagmanager/ctags/python.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 8d5c7fbdc1dcf773d1463a39c5a62e344aca8dca
Author: kuroidoruido <katsuo49@hotmail.fr>
Date:   Tue Jan 7 18:24:05 2014 +0100

    Update filetypes.sql
    
    Add loop and replace keywords

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 99e07cd294b1447f2741de033dd93c4cf33f1144
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Fri Dec 27 12:00:28 2013 +0100

    Swedish translation has also been updated for 1.24

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a7884ee2f8b746e70cc2d71cf898a4d5a95172e0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 24 19:28:20 2013 +0100

    JavaScript: fix parsing of files starting with a shebang
    
    Closes #1016.

 tagmanager/ctags/js.c       | 16 ++++++++++++++++
 tests/ctags/Makefile.am     |  1 +
 tests/ctags/shebang.js      |  3 +++
 tests/ctags/shebang.js.tags |  2 ++
 4 files changed, 22 insertions(+)

commit e13cd014be208085a43cb637b67840add68b8bbb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Dec 22 20:47:33 2013 +0100

    Fix portability of make rules to build documentation
    
    Support for "$<" automatic variable in non-suffix rules is a GNU Make
    extension: don't use it.

 doc/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 4c8d2fb9286227861c62d2ef1c80d6627d032e3d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 19 20:36:07 2013 +0100

    Fix handling of --list-documents when no other instance are running
    
    Properly exit when passed --list-documents, even if no other instance
    were already running.  This makes this option behave the same in any
    case, making it easier to use in e.g. scripts.

 NEWS       |  2 ++
 src/main.c | 30 ++++++++++++++++--------------
 2 files changed, 18 insertions(+), 14 deletions(-)

commit 3693889c48b68e9e791bde9df5a83486b02081c4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 17 21:47:00 2013 +0100

    Update NEWS

 NEWS | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 3 deletions(-)

commit 0eec7764af5cbcf70e10e44d2eb7b486e5c7cd53
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 17 16:17:21 2013 +0100

    Fix truncation of the data retrieved with --list-documents
    
    Do not truncate the document list to the size of the buffer used for
    communication.
    
    Since we now read multiple times, we need to make sure to always send
    ETX so a reader don't hang reading the next chunk if the data sent had
    exactly the size of the buffer.

 src/socket.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

commit c0a233fcc3860aa98a38754d1d5e69e51e991ac5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 17 16:09:56 2013 +0100

    Fix a typo in the documentation's markup

 doc/geany.txt | 1 +
 1 file changed, 1 insertion(+)

commit f94650b48ee10b4356675fde5d0b56d3e3135d0b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 17 15:54:07 2013 +0100

    Autotools: use the target file as the base rule for building documentation
    
    This allows automatic building of the file when required, and allows
    user to request building that specific file.

 doc/Makefile.am | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit 9a236fb04e8d5f4eb6dc340e23e51f1ff013fe3c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 17 15:50:07 2013 +0100

    Autotools: fix building the documentation in VPATH builds

 doc/Makefile.am | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit dec7b939fb07dd29bd61d9625a88503183ab14b6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 17 15:42:34 2013 +0100

    Autotools: always put object files in the source file's directory
    
    Enable Automake option "subdir-object" to put all object files next to
    their source file rather than in the directory containing the Makefile.
    
    This is quite expected, and will be the future behavior of Automake in
    all cases, so enabling it now avoids future unexpected change.

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0592b4410cd24eaad3ebb6547620dbc0b8b4d1c1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 17 15:41:22 2013 +0100

    Autotools: enable Automake warnings

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 98b82550a8344c2615c986fb235096e7d517911a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 5 20:31:07 2013 +0100

    Plug a few possible small memory leaks

 src/keyfile.c | 6 +++---
 src/toolbar.c | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

commit ddf67a8586302e1dced6dbb6062e5f1797a18a9e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 5 20:18:27 2013 +0100

    VTE: properly use the default value for invalid configured colors

 src/keyfile.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 4aff511b018f43bcefa108269c78c974848b27c4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 5 20:16:54 2013 +0100

    Remove unnecessary allocation for VTE color settings

 src/keyfile.c | 10 ++++------
 src/prefs.c   |  4 ++--
 src/vte.c     | 16 +++++-----------
 src/vte.h     |  4 ++--
 4 files changed, 13 insertions(+), 21 deletions(-)

commit 69f1cc7136dcb44bba21c9d6a4a54c2c7219f27f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Dec 4 15:49:47 2013 +0100

    Remove useless rotate_rgb()

 src/highlighting.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

commit 4ce6409e898b3b7d9b63f98b8e4017a138533dde
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Dec 4 15:46:05 2013 +0100

    Remove useless utils_invert_color()

 src/highlighting.c |  2 +-
 src/utils.c        | 12 ------------
 src/utils.h        |  2 --
 3 files changed, 1 insertion(+), 15 deletions(-)

commit 898097063098b5ec73611f5d0359d963922b9dd3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Dec 4 15:31:17 2013 +0100

    Unify color parsing
    
    Change utils_parse_color() to use gdk_color_parse() and follow its
    syntax, additionally supporting our "0x" prefix as a synonym for the
    "#" prefix;  and use this everywhere.
    
    Also add utils_color_to_bgr() and utils_parse_color_to_bgr() to provide
    conversion to the 24 bits BGR format used by Scintilla.

 src/highlighting.c |  2 +-
 src/keyfile.c      |  4 ++--
 src/prefs.c        |  2 +-
 src/sciwrappers.c  |  2 +-
 src/tools.c        | 12 ++--------
 src/utils.c        | 65 +++++++++++++++++++++++-------------------------------
 src/utils.h        |  6 ++++-
 src/win32.c        |  2 +-
 8 files changed, 40 insertions(+), 55 deletions(-)

commit 1590007862ce13b14e3af6e0f4f1d1b5afb73554
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Dec 4 14:59:05 2013 +0100

    Remove an unnecessary allocation

 src/prefs.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 3522e81d7344c584a78c2f52cf8bcd32f14dd38d
Merge: f07b545 3759562
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 3 03:09:41 2013 +0100

    Merge branch 'wip/color-parsing-improvements'

commit f07b5457d6505ce8127c4b823b18ee42ffbc7730
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 2 23:19:44 2013 +0100

    Simplify fold toggling code using higher-level Scintilla API

 src/editor.c | 41 ++++++++++++-----------------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

commit 3759562d7c3b53b19f363a47413a8b04b75661a7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 2 22:58:54 2013 +0100

    Simplify reading highlighting colors with new utils_parse_color()
    
    Drop redundant code converting # and short formats to hex colors now
    utils_parse_color() can parse them.

 src/highlighting.c | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

commit ebde42617a5c4e57ae0d717b56a03201f51e0988
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 2 22:53:35 2013 +0100

    Accept colors with only 1 digit per channel in utils_parse_color()
    
    AKA short HTML color notation.

 src/utils.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

commit 11a2f0ee91be81991c9d1b3dfe9b8b9680ca3abf
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 2 22:44:40 2013 +0100

    Properly validate input in utils_parse_color()

 src/utils.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

commit 507005ca549a4f6b7c45c1c27b4a219ca6b03f7e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 2 22:38:11 2013 +0100

    Rename utils_strtod() to utils_parse_color()
    
    Rename the function to a more sensible name, and remove unnecessary
    arguments.  Now, format (# or 0x) is auto-detected.

 src/highlighting.c |  2 +-
 src/sciwrappers.c  |  2 +-
 src/utils.c        | 33 ++++++++++++++-------------------
 src/utils.h        |  2 +-
 src/win32.c        |  2 +-
 5 files changed, 18 insertions(+), 23 deletions(-)

commit f99e627bb0d28821168a44553f92fd5dd60eafe3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 23 00:45:39 2013 +0100

    Fix folding of the very last line in a level when unfolding children
    
    Fix an off-by-one mistake resulting on the very last line of a nested
    folded level not to be unfolded when recursively unfolding it's parent.
    
    This was only visible when the last fold point was only one line long,
    otherwise unfolding the (N-1)th line was enough.
    
    Closes #1007.

 src/editor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit cff36e7497be16cefede1b393207e61709c71c2e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 20 18:41:11 2013 +0100

    R: properly display sources and libraries in the symbol list

 src/symbols.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 10893c4ada3be907a97dd4e472de029442e687bc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 20 18:40:22 2013 +0100

    R: fix invalid memory access in the tag parser

 tagmanager/ctags/r.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

commit 1dfc1077c7f52070ceb65fe97ea2a8da3cc5c93e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 18 22:22:57 2013 +0100

    Fix crash in fallback mime icon loading code under GTK3

 src/ui_utils.c | 3 +++
 1 file changed, 3 insertions(+)

commit b63eb87599a6f9f8a44d7b94e94e31a26bbf2910
Author: Roland Pallai <rpallai@magex.hu>
Date:   Thu Nov 14 00:53:40 2013 +0100

    "Enter in replace entry does Replace & Find instead of Replace" setting
    in General/Misc/Search.

 data/geany.glade | 17 +++++++++++++++++
 doc/geany.txt    |  3 +++
 src/search.c     |  7 ++++++-
 src/search.h     |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

commit cebc20a47c0b9955259c4e3a740cd48af58e1623
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 11 18:54:08 2013 +0100

    Use proper argument list

 tagmanager/ctags/cobol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bbc0fa3b69eb4f939a70b9ff27411e146a59400d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 11 18:52:45 2013 +0100

    Don't depend on an implementation detail of S_ISREG and S_ISDIR

 tagmanager/src/tm_file_entry.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 660c441b4af272fe4e40eb6a6cda2badb8f17eac
Author: Arthur Rosenstein <artros.misc@gmail.com>
Date:   Wed Nov 6 16:28:09 2013 +0000

    Don't prompt for reload confirmation if keeping edit history
    
    No work is lost in that case (except for the redo stack, which is
    normal), so the extra confirmation step seems bothersome.

 src/callbacks.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 322fa65ff555be84dee05761665fe87d0daa9432
Author: Arthur Rosenstein <artros.misc@gmail.com>
Date:   Wed Nov 6 16:17:26 2013 +0000

    Maintain undo stack when reloading a document

 src/document.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 3 deletions(-)

commit 1b338d9d7dd23c1dc0828408e6687a9b47e94fc1
Author: Arthur Rosenstein <artros.misc@gmail.com>
Date:   Wed Nov 6 14:52:54 2013 +0000

    Add UNDO_RELOAD action

 src/document.c        | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 src/documentprivate.h |  8 ++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

commit 6f6dfda8a8e6af4a84897db543885a9261481ba4
Author: Arthur Rosenstein <artros.misc@gmail.com>
Date:   Wed Nov 6 14:28:43 2013 +0000

    Add documentation for keep_edit_history_on_reload option

 doc/geany.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 9a03d32449b5d8c831d2b53a264db56ab57e8699
Author: Arthur Rosenstein <artros.misc@gmail.com>
Date:   Wed Nov 6 14:16:11 2013 +0000

    Add keep_edit_history_on_reload option
    
    When this option is set, the undo stack is maintained when reloading a
    document.

 src/document.h | 1 +
 src/keyfile.c  | 2 ++
 2 files changed, 3 insertions(+)

commit 1b1a1da4edfbf7168dd9afa8593cab77aca7f3a3
Author: Arthur Rosenstein <artros.misc@gmail.com>
Date:   Wed Nov 6 12:44:14 2013 +0000

    Clear redo stack when adding undo action
    
    This fixes a bug in Geany where modifying the document does not clear the
    redo actions stack.

 src/document.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

commit 1f2279aefe165b874a42457f4a24af498f92dc27
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 10 01:41:01 2013 +0100

    Always use proper functions argument lists

 src/dialogs.c                 | 4 ++--
 src/document.c                | 4 ++--
 src/editor.c                  | 2 +-
 src/filetypes.c               | 4 ++--
 src/highlighting.c            | 2 +-
 src/keybindings.c             | 2 +-
 src/main.c                    | 2 +-
 src/navqueue.c                | 8 ++++----
 src/notebook.c                | 4 ++--
 src/prefix.c                  | 2 +-
 src/sidebar.c                 | 2 +-
 src/win32.c                   | 2 +-
 tagmanager/src/tm_workspace.c | 2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)

commit 0a5378134a0f93569d86890762963e6b48bb758f
Author: Arthur Rosenstein <artros.misc@gmail.com>
Date:   Wed Nov 6 12:36:07 2013 +0000

    Add document_undo_clear_stack()
    
    This function clears a single undo/redo stack.

 src/document.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

commit 39fa004619d211a84ea46a5e45f7470106d19b9c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 7 23:07:33 2013 +0100

    Fasten utils_tidy_path() a little and fix possible leaks in it
    
    Fix possible leaks with bad paths, and also speed up some part of the
    function by avoiding unnecessary allocations and string length
    computations.

 src/utils.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

commit c074817b8b2bd63b8f2881a7b79636dd15febf4d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 7 22:57:40 2013 +0100

    Fix 2 unlikely memory leaks

 src/build.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1d8dd84a47b7993f14ba4737c3fcd23f60697cee
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 7 21:28:23 2013 +0100

    Fix some small type issues in printf formats

 src/build.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 5c22c9d73e14f77959d0de27c8363a1fe8fe8940
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 4 17:42:05 2013 +0100

    R has braces

 src/editor.c | 1 +
 1 file changed, 1 insertion(+)

commit 7b2f39a852bc29feb196710d5752faae70a50832
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 4 16:01:29 2013 +0100

    Remove an unused variable and plug a theoretical memory leak

 src/build.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b2f4717ad301777ca9cfb77fca38f4dc8d3d90a6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 3 23:35:00 2013 +0100

    Plug a memory leak on Windows

 src/build.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit 5918532ab23fdd310266792b999e3133de996747
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 3 22:28:02 2013 +0100

    Explicit a valid cast

 src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cb588a1b82d0e85c0cdb9e422d073b4dc9b04a30
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 3 22:25:01 2013 +0100

    Plug a possible memory leak

 src/main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 0cb139638f18c8b633ce7ad5bd3fb0a4f0dfc869
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 3 22:18:50 2013 +0100

    Plug a memory leak

 src/templates.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bc6c345153f2020fb64827e5a8442e4ecc2794e9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 3 22:18:26 2013 +0100

    Remove an unused variable that could be leaked

 src/build.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 6e46cca735fc4ab19c629f5a2d47aad2180cb302
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 3 01:52:27 2013 +0100

    Fix mismatching allocation and deallocation
    
    When allocation with g_malloc(), the memory should be freed using
    g_free(), not plain free().
    
    Also, use g_try_malloc() instead of g_malloc() where the code carefully
    handles allocation failures itself.

 tagmanager/ctags/sort.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 47609ec102eb31dcd7d558a7cb8a1bcdbffff81d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 3 01:52:12 2013 +0100

    Plug a possible memory leak

 src/utils.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 02852b33b07491d99ad44f6f58fd654bee76244e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 3 01:51:03 2013 +0100

    Simplify utils_get_hex_from_color() and plug a possible memory leak in it

 src/utils.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

commit fd18b7455c154a51b91c45c5216c9ecc047b4227
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 2 22:10:32 2013 +0100

    Plug a possible memory leak
    
    There is no need to check doc->real_path since the usage is NULL-safe,
    and if it actually is empty or NULL it isn't a bug in the caller itself
    anyway, and this could leak.

 src/editor.c | 2 --
 1 file changed, 2 deletions(-)

commit 6a19a4488d7037591083001f11f9f4fe2065aafa
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 31 13:54:31 2013 +0000

    Add info on how g_spawn is broken on Windows

 src/win32.c | 3 +++
 1 file changed, 3 insertions(+)

commit ef331759b01a415ba4d09b4940aa052f9ceedf7c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 20 15:19:56 2013 +0200

    If we write C99, we better make sure we compile as such

 configure.ac | 1 +
 1 file changed, 1 insertion(+)

commit 131b608d5b430df6bb960ecdd63611cb5cda4be8
Author: Matthew Brush <matt@geany.org>
Date:   Sun Oct 20 05:59:21 2013 -0700

    Update HACKING a bit for C99 standard

 HACKING | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

commit 7d79df7975dab3aa6a2c824cf5a504069c291077
Merge: b645ecc 635b7c2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 16 15:45:01 2013 +0200

    Merge branch 'scintilla-update-336'

commit 635b7c24a6898fe92768b1fa593a1a468e96adb9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 16 15:36:57 2013 +0200

    Update Scintilla to version 3.3.6

 scintilla/gtk/PlatGTK.cxx         |  14 +---
 scintilla/gtk/ScintillaGTK.cxx    |  23 +++---
 scintilla/include/ILexer.h        |   2 +
 scintilla/include/Platform.h      |  18 -----
 scintilla/include/SciLexer.h      |  22 ++++++
 scintilla/include/Scintilla.h     |   4 +
 scintilla/include/Scintilla.iface |  32 ++++++++
 scintilla/lexers/LexCPP.cxx       |   8 ++
 scintilla/lexers/LexOthers.cxx    |  13 ++-
 scintilla/lexers/LexPascal.cxx    |  21 ++---
 scintilla/lexers/LexPerl.cxx      |  28 ++++---
 scintilla/lexers/LexSQL.cxx       | 162 ++++++++++++++++++++++++++++++--------
 scintilla/lexlib/StyleContext.h   |   4 +-
 scintilla/lexlib/SubStyles.h      |  25 ++++--
 scintilla/lexlib/WordList.cxx     |  40 +++++-----
 scintilla/scintilla_changes.patch |   5 +-
 scintilla/src/Document.cxx        |   2 +-
 scintilla/src/Editor.cxx          |  45 ++++++-----
 scintilla/src/ScintillaBase.cxx   |  30 ++++++-
 scintilla/src/ScintillaBase.h     |   2 +-
 scintilla/src/ViewStyle.cxx       |   4 +-
 scintilla/src/ViewStyle.h         |   2 +-
 scintilla/version.txt             |   2 +-
 23 files changed, 354 insertions(+), 154 deletions(-)

commit b645eccf6e4a83a513a689034181cb96d51d5dff
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 15 16:01:02 2013 +0200

    Do not ignore keys inside inherited groups
    
    When inheriting a group in a filetypes file, do not ignore local keys.
    This allows for partial overrides of the parent group, like:
    
    	[settings=Parent]
    	key=value
    
    All keys from Parent's group "settings" would be imported, but now the
    "key" key wouldn't be ignored anymore and would override a "key" key
    from the group copied from Parent if it exists.

 src/filetypes.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

commit 01e7fe4b79d0697ac2d03ab5ba18bd92a664ffc2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 15 15:56:44 2013 +0200

    Use GIcon for the filetype icon rather than rendered pixbuf
    
    This allows to re-use the icon more easily since it's not rendered at
    a particular size but simply an icon description.  It also allows for
    implicit icon updating when the theme changes if the display code
    implements it (and GTK widgets does).

 src/dialogs.c   |  6 ++----
 src/filetypes.c | 23 ++---------------------
 src/filetypes.h |  4 +---
 src/main.c      |  4 ++++
 src/sidebar.c   | 18 +++++++++---------
 src/ui_utils.c  | 49 ++++++++-----------------------------------------
 src/ui_utils.h  |  2 +-
 7 files changed, 27 insertions(+), 79 deletions(-)

commit d29b5912fff974b79ef767e7afc75d7ffbc64192
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 15 02:39:24 2013 +0200

    Read filetype's mime type from the configuration files
    
    This allows custom filetypes to define a mime type, hence the icon
    displayed for this filetype;  as well as moving ones for built-in
    filetypes out of the code to the configuration files.

 data/filetypes.Go.conf          |  6 +++-
 data/filetypes.Graphviz.conf    |  3 ++
 data/filetypes.Scala.conf       |  3 ++
 data/filetypes.abc              |  2 ++
 data/filetypes.actionscript     |  3 ++
 data/filetypes.ada              |  3 ++
 data/filetypes.c                |  3 ++
 data/filetypes.caml             |  3 ++
 data/filetypes.cmake            |  3 ++
 data/filetypes.cobol            |  3 ++
 data/filetypes.cpp              |  3 ++
 data/filetypes.cs               |  3 ++
 data/filetypes.css              |  3 ++
 data/filetypes.d                |  3 ++
 data/filetypes.diff             |  3 ++
 data/filetypes.docbook          |  3 ++
 data/filetypes.erlang           |  3 ++
 data/filetypes.f77              |  3 ++
 data/filetypes.fortran          |  3 ++
 data/filetypes.haskell          |  3 ++
 data/filetypes.html             |  3 ++
 data/filetypes.java             |  3 ++
 data/filetypes.javascript       |  3 ++
 data/filetypes.latex            |  3 ++
 data/filetypes.lua              |  3 ++
 data/filetypes.makefile         |  3 ++
 data/filetypes.markdown         |  3 ++
 data/filetypes.matlab           |  3 ++
 data/filetypes.objectivec       |  3 ++
 data/filetypes.pascal           |  3 ++
 data/filetypes.perl             |  3 ++
 data/filetypes.php              |  3 ++
 data/filetypes.po               |  3 ++
 data/filetypes.python           |  3 ++
 data/filetypes.restructuredtext |  3 ++
 data/filetypes.ruby             |  3 ++
 data/filetypes.sh               |  3 ++
 data/filetypes.sql              |  3 ++
 data/filetypes.tcl              |  3 ++
 data/filetypes.txt2tags         |  3 ++
 data/filetypes.vala             |  3 ++
 data/filetypes.verilog          |  3 ++
 data/filetypes.vhdl             |  3 ++
 data/filetypes.xml              |  3 ++
 data/filetypes.yaml             |  3 ++
 doc/geany.txt                   |  4 +++
 src/filetypes.c                 | 79 ++++++++++++++---------------------------
 src/filetypes.h                 |  2 ++
 src/sidebar.c                   |  5 +--
 src/ui_utils.c                  |  2 +-
 50 files changed, 173 insertions(+), 56 deletions(-)

commit 48fe855b50528ef27c45160959e324c08b2e0676
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Oct 13 18:55:16 2013 +0200

    Adjust test case tags file for fixed Python parser (class arglist assignment)

 tests/ctags/cython_sample.pyx.tags | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3443e288fe608306606f6b6a846886a377e46aff
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Oct 13 18:52:56 2013 +0200

    Add flag to tm_tags_find() to indicate the tags array may not be sorted
    
    tm_tags_find() relies on a sorted tags array to be passed in but in
    tm_source_file_set_tag_arglist() we don't have a sorted array yet and
    sorting it on demand seems more heavy than the alternative:
    make tm_tags_find() search the array linear if the new flag is set.
    
    This fixes a bug in the Python parser when assigning the argument list
    of __init__() methods to their class' argument list which annoyed me
    for years already.
    
    Also add a test case for this.

 tagmanager/src/tm_source_file.c            |  3 ++-
 tagmanager/src/tm_tag.c                    | 37 ++++++++++++++++++++++++------
 tagmanager/src/tm_tag.h                    | 12 ++++++----
 tagmanager/src/tm_workspace.c              |  7 +++---
 tests/ctags/Makefile.am                    |  1 +
 tests/ctags/py_constructor_arglist.py      | 28 ++++++++++++++++++++++
 tests/ctags/py_constructor_arglist.py.tags | 16 +++++++++++++
 7 files changed, 89 insertions(+), 15 deletions(-)

commit a408938e957939594f549bc2bf5867699ece973d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Oct 13 12:54:58 2013 +0100

    Set group for Clojure filetype

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 49056ba984ef9c9ad90713e437f82962cb91baa7
Author: Yosef Or Boczko <yoseforb@gmail.com>
Date:   Sun Oct 13 13:31:37 2013 +0300

    Updated Hebrew translation

 po/he.po | 252 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 131 insertions(+), 121 deletions(-)

commit b3b6d4efade37d608894ecd897d77975b32601b8
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Oct 11 16:47:04 2013 +0100

    Fix missing warning section

 HACKING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 15fb2f321ad400ca911c8b69a9b1a78b3baa3b51
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Oct 11 16:41:16 2013 +0100

    Improve custom filetype formatting/links

 doc/geany.txt | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

commit 18d27364ac9c526527fc7e56ee7f2a4e6effdb4d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Oct 11 16:23:07 2013 +0100

    Update notes for adding a custom filetype

 HACKING | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

commit 40cd633d5fc6f0bea1fda6edd03ee41e7604ae43
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Fri Oct 11 09:56:08 2013 +0200

    Update of Slovenian translation by Jože Klepec

 po/sl.po | 2981 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1532 insertions(+), 1449 deletions(-)

commit d51079d5987a8e3f63c6ddd5bf8c0a58608a8705
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 10 12:40:07 2013 +0100

    Fix mingw-gcc 'ordered comparison of pointer with integer zero' warning

 src/build.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1ab97fe2e0c4222900bb6e4e8d54655cfefd8756
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 24 23:58:16 2013 +0200

    Plug a memory leak when reading misnamed tag files
    
    Don't leak the file name if we can't determine to which filetype it
    belongs.  Thanks to Pavel Roschin for spotting this.
    
    Also, remove an useless second function indirection that simply made
    the code harder to understand.  This will make Matthew happy ;)

 src/symbols.c | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

commit 8f11c62dc9004a15088abfbe3c607ef4e194323b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 24 16:26:57 2013 +0200

    Fix some module-specific globals not declared static
    
    This prevents the symbol to be exported and possibly conflict with
    another one.

 tagmanager/ctags/php.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e4eacef82b58f202bca379d8b4ca4df72662b578
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 24 16:23:48 2013 +0200

    Plug a memory leak
    
    Thanks to Pavel Roschin for spotting it.

 src/keybindings.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit af3421e688af3a8a81ffdaca1701dbeb49b5ebaa
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 23 21:54:30 2013 +0200

    Plug a memory leak
    
    Do not evaluate a macro argument multiple times if it gets passed an
    expression, especially if that expression allocates memory.
    
    Thanks to Pavel Roschin for spotting the leak.

 src/build.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

commit 32b971cf1cb79891956a006da8432e4f22e3d515
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 23 16:52:55 2013 +0200

    JavaScript: fix parsing of regular expressions in a return statement

 tagmanager/ctags/js.c      |  9 +++++----
 tests/ctags/regexp.js      | 11 +++++++++++
 tests/ctags/regexp.js.tags |  2 ++
 3 files changed, 18 insertions(+), 4 deletions(-)

commit c427ddb656a64c77d6e1421ab92b72630fbc94fc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Sep 19 19:40:56 2013 +0200

    SQL: fix single-line comment marker
    
    Closes [bugs:#997].

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b428042278634f9c0b9311b951a0de33fa785f30
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Sep 19 14:09:45 2013 +0100

    Add sci_word_start_position, sci_word_end_position wrappers

 src/editor.c      | 14 +++++++-------
 src/sciwrappers.c | 15 +++++++++++++++
 src/sciwrappers.h |  2 ++
 3 files changed, 24 insertions(+), 7 deletions(-)

commit 6d2f26c494d9459dfbb023655cbe046365424f52
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Sep 19 13:49:46 2013 +0100

    Don't ignore word matches that vary only by case
    
    The user needs to see all case variants, even when they want searching
    to be done case-insensitively (which isn't supported yet).

 src/editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dcfbf22cf291b48ad511135c612ca57c8d3e99da
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Sep 19 13:37:23 2013 +0100

    Don't allocate initial size based on autocompletion_max_entries
    
    The user may have set that too high.

 src/editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 798849b64cb3f21066814450e06d69fb5e3c707a
Merge: 3f27961 8d20c59
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Sep 18 15:23:06 2013 +0200

    Merge branch 'scintilla-update-335'

commit 8d20c5961197dfd256dc7558f4eb0c5c3f51c153
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Sep 18 15:15:53 2013 +0200

    Update NEWS

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b07d1a1ecc05f74f0a614a431763e2dafa2de995
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Sep 18 15:15:05 2013 +0200

    Update Scintilla to version 3.3.5

 scintilla/gtk/Converter.h              |  13 +
 scintilla/gtk/PlatGTK.cxx              |  24 +-
 scintilla/gtk/ScintillaGTK.cxx         |  15 +-
 scintilla/include/SciLexer.h           |  14 +
 scintilla/include/Scintilla.h          |   6 +
 scintilla/include/Scintilla.iface      |  35 ++
 scintilla/lexers/LexAda.cxx            |   2 +-
 scintilla/lexers/LexAsm.cxx            |   2 +-
 scintilla/lexers/LexCOBOL.cxx          |   8 +-
 scintilla/lexers/LexD.cxx              |   8 +-
 scintilla/lexers/LexForth.cxx          |  16 +-
 scintilla/lexers/LexHTML.cxx           |  19 +-
 scintilla/lexers/LexLaTeX.cxx          |   8 +-
 scintilla/lexers/LexLisp.cxx           |   6 +-
 scintilla/lexers/LexNsis.cxx           |   2 +
 scintilla/lexers/LexOthers.cxx         |   2 +-
 scintilla/lexers/LexPerl.cxx           |   2 +-
 scintilla/lexers/LexPython.cxx         |   2 +-
 scintilla/lexers/LexR.cxx              |   2 +-
 scintilla/lexers/LexYAML.cxx           |   2 +-
 scintilla/lexlib/Accessor.cxx          |   2 +-
 scintilla/lexlib/CharacterSet.cxx      |   2 +-
 scintilla/lexlib/LexerBase.cxx         |   2 +-
 scintilla/lexlib/LexerModule.cxx       |   2 +-
 scintilla/lexlib/LexerNoExceptions.cxx |   2 +-
 scintilla/lexlib/LexerNoExceptions.h   |   4 +-
 scintilla/lexlib/LexerSimple.cxx       |   2 +-
 scintilla/lexlib/StyleContext.cxx      |   2 +-
 scintilla/lexlib/WordList.cxx          |   4 +-
 scintilla/scintilla_changes.patch      |   5 +-
 scintilla/src/AutoComplete.cxx         |   2 +-
 scintilla/src/CaseConvert.cxx          | 256 ++++++------
 scintilla/src/Catalogue.cxx            |  11 +-
 scintilla/src/CellBuffer.cxx           |   4 +-
 scintilla/src/Decoration.cxx           |   4 +-
 scintilla/src/Document.cxx             |  23 +-
 scintilla/src/Document.h               |   3 +
 scintilla/src/Editor.cxx               | 737 +++++++++++++++++----------------
 scintilla/src/Editor.h                 |  31 +-
 scintilla/src/ExternalLexer.cxx        |   2 +-
 scintilla/src/FontQuality.h            |  13 +
 scintilla/src/KeyMap.h                 |   4 +-
 scintilla/src/LineMarker.h             |   1 -
 scintilla/src/Partitioning.h           |   9 +
 scintilla/src/PositionCache.cxx        | 165 +++++---
 scintilla/src/PositionCache.h          |  41 +-
 scintilla/src/RunStyles.cxx            |   5 +-
 scintilla/src/ScintillaBase.cxx        |   2 +-
 scintilla/src/SplitVector.h            |   8 +
 scintilla/src/UniConversion.cxx        |  17 +
 scintilla/src/UniConversion.h          |  17 +
 scintilla/src/UnicodeFromUTF8.h        |  13 +
 scintilla/src/ViewStyle.cxx            | 139 +++++--
 scintilla/src/ViewStyle.h              |  63 ++-
 scintilla/src/XPM.cxx                  |   2 +-
 scintilla/version.txt                  |   2 +-
 56 files changed, 1084 insertions(+), 705 deletions(-)

commit 3f27961ed760fb4d9ab26cf6d40ff7965e9cd818
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Sep 11 21:27:44 2013 +0200

    Correct an ambiguous German translation

 po/de.po | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit d7041a0523f1e89312a8fafb70ac394f6248d914
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Fri Sep 6 16:44:24 2013 +0200

    Adding path for config on Windows7+

 doc/geany.txt | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

commit 4786796e9aff75e67d8a6abdd61f5bbe7e1a7e66
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 20 11:54:01 2013 +0200

    Fix build (oops, sorry)

 src/printing.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1fe7b4848ee47e7cc198082ccb49bb398a6bfb21
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Aug 19 14:07:27 2013 +0200

    Fix printing under Windows
    
    For some reason the Scintilla widget's Pango context don't have a
    resolution set on Windows, so we get an invalid one.  Fix this by
    correctly peek the resolution from the map if the context doesn't
    have one by itself.
    
    https://developer.gnome.org/pango/stable/pango-Cairo-Rendering.html#pango-cairo-context-get-resolution
    
    Thanks to Matthew Brush for debugging this!
    
    Closes #961.

 src/printing.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit 791cad305952f9f5cbab742a4f228563db72ab0c
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Tue Aug 20 11:39:37 2013 +0200

    Update of Italian translation Giuseppe Penone

 po/it.po | 3113 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1564 insertions(+), 1549 deletions(-)

commit 0c2dac1e2032ce272ac0febeb9b681fecda8d103
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Mon Aug 19 17:58:24 2013 +0200

    Update of German translation

 po/de.po | 802 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 402 insertions(+), 400 deletions(-)

commit 4e924817b36e491d3f04aa7f4857bd175c8f3d7e
Author: Matthew Brush <matt@geany.org>
Date:   Sun Aug 18 19:53:16 2013 -0700

    Use empty string on win32 when no print command
    
    In the preferences dialog it would show a single
    quote because the print command couldn't be found
    and the NULL prematurely terminated the g_strconcat()
    call, leaving a single quote in the print command
    entry.
    
    Thanks to Lex for finding where the problem was.

 src/keyfile.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 82f82ed372a21d1f1648e79ddc27029d5d9d2ea7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Aug 18 00:29:04 2013 +0200

    Use GLib's portable version gethostname(): g_get_host_name()
    
    Drop our own portability layer and use GLib's one instead (which
    actually does exactly the same as our own).
    
    Thanks to Matthew for spotting this.

 configure.ac   |  2 +-
 src/keyfile.c  |  4 +---
 src/socket.c   |  3 +--
 src/utils.c    | 13 -------------
 src/utils.h    |  2 --
 src/win32.c    | 12 ------------
 src/win32.h    |  2 --
 win32-config.h |  3 ---
 wscript        |  1 -
 9 files changed, 3 insertions(+), 39 deletions(-)

commit 978fca130f6d768354bd745509ace5d24947ad31
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 16 14:45:57 2013 +0200

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

 scintilla/scintilla_changes.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f934d2cf945dd23e9fe73dc7626719a18c439c26
Author: Fitorec <chanerec@gmail.com>
Date:   Thu Jun 14 08:34:21 2012 -0500

    Update the `create_php_tags.php` script
    
    * Uses more recent URL (as updated in other PR)
    * Downloads the funcsummary.txt file by itself
    * Support running the script from any directory
    
    Closes #47

 scripts/create_php_tags.php | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 05c9f10dd8d437a4ad078d5bd8a4eb738e79674d
Author: TheHappyMarquis <iouri_novak@hotmail.com>
Date:   Sat Oct 6 12:27:27 2012 +0300

    Restore HTML filetype doublestring/hstring to original color
    
    Closes #74 and #75

 data/filetypes.common | 2 +-
 data/filetypes.html   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 7d4a2928b7d020c9d7e330550550f55422b4877b
Author: Hoàng Minh Thắng <p@banphim.net>
Date:   Sun Jan 13 18:57:46 2013 +0700

    Add Clojure filetype
    
    Includes changes in referenced pull request comments.
    
    Closes #92

 data/filetypes.Clojure.conf | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

commit 4c3730caf782d4286e8a84bd0a2c2766013f7c8f
Author: Igor Shaula <gentoo90@gmail.com>
Date:   Fri Apr 12 23:14:08 2013 +0300

    LexPowerShell fixes and improvements
    
    * fix here-string highlighting
    * add doccomment keyword highlighting
    * add #region folding
    
    Closes #132

 data/filetypes.powershell          |  4 +++
 scintilla/lexers/LexPowerShell.cxx | 51 ++++++++++++++++++++++++++++++++++++--
 src/highlightingmappings.h         | 32 +++++++++++++-----------
 3 files changed, 71 insertions(+), 16 deletions(-)

commit df589a9d52086b22fe1dc7591482f5aa8f9bbc0e
Author: Igor Shaula <gentoo90@gmail.com>
Date:   Wed Apr 10 20:54:59 2013 +0300

    Add PowerShell filetype
    
    Windows PowerShell is a command-line shell and associated scripting language
    which comes out of the box with Windows 7/Server 2008/8/Server 2012.
    
    Original lexer from Scintilla is used.

 data/filetype_extensions.conf      |   1 +
 data/filetypes.powershell          |  55 ++++++++++
 scintilla/Makefile.am              |   1 +
 scintilla/lexers/LexPowerShell.cxx | 201 +++++++++++++++++++++++++++++++++++++
 scintilla/makefile.win32           |   1 +
 scintilla/scintilla_changes.patch  |   2 +-
 scintilla/src/Catalogue.cxx        |   1 +
 src/filetypes.c                    |   6 ++
 src/filetypes.h                    |   1 +
 src/highlighting.c                 |   2 +
 src/highlightingmappings.h         |  30 ++++++
 11 files changed, 300 insertions(+), 1 deletion(-)

commit d44dfdb9ac76924c94964545e1f600201e27903c
Author: Matthew Brush <matt@geany.org>
Date:   Thu Aug 9 16:53:33 2012 -0700

    Save configuration when plugin manager dialog is closed
    
    Closes #62

 src/plugins.c | 2 ++
 1 file changed, 2 insertions(+)

commit ef7b092ef952abccf023b336c0bd3f03429ea552
Author: Antoine Turmel <geekshadow@gmail.com>
Date:   Thu Aug 15 22:42:38 2013 +0200

    Adding .properties file under Conf markup
    
    See http://en.wikipedia.org/wiki/.properties
    
    Closes #162

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1a185d87a4e40a2b361bfa6c469190b7a3cfd927
Author: Benjamin Chrétien <chretien@lirmm.fr>
Date:   Sat Jun 15 17:38:08 2013 +0900

    Add CUDA C/C++ support
    
    Closes #147

 data/filetype_extensions.conf |  5 ++--
 data/filetypes.CUDA.conf      | 60 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 2 deletions(-)

commit 706abfbf38c602fe1ec99d2b25e9ca150f3f24d0
Author: YosefOr <yosefor3@walla.com>
Date:   Sun Mar 10 17:48:27 2013 +0200

    Add detection of PKGBUILD files as Shell scripts
    
    Closes #120

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9e22ec85359ef97c1995f233f615767bb97a341a
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Fri Mar 22 18:14:43 2013 +0100

    Added Graphviz custom filetype
    
    Closes #125

 data/filetype_extensions.conf |  3 ++-
 data/filetypes.Graphviz.conf  | 59 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

commit b11a3adb7bc4f04d3cfc7b7a40cf8e3704dde523
Author: Ypnose <linuxien@legtux.org>
Date:   Fri Mar 22 19:49:59 2013 +0100

    Add detection support for various Shell scripts
    
    * Add shebang detection of mksh and tcsh.
    * Add file extension detection of mksh, tcsh, and the various
    "profile" shell scripts.
    
    Closes #126

 data/filetype_extensions.conf | 2 +-
 src/filetypes.c               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 01b7191d661c5a2abbf521eeccaa9dcb0ed4adf0
Author: Edward Hutchins <eahutchins@gmail.com>
Date:   Sat Jun 29 10:09:50 2013 -0700

    Added hashbang detection for node=>javascript.
    
    Closes #149

 src/filetypes.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 03e3ba798748bcc5186dedaaaa5871faf6527322
Author: Felix Totir <axeoth@yahoo.fr>
Date:   Fri Feb 1 18:02:10 2013 +0100

    Added keywords for Matlab classes syntax highlight
    
    Closes #136

 data/filetypes.matlab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a1e920527086984ebfe2643e3daa6c6fa22bf7d0
Author: John Long <a@88k.us>
Date:   Sat May 4 19:11:30 2013 -0500

    Update PHP source repo for tags and tags file
    
    The new tags file seems to have lots of new symbols. It needs testing
    by PHP programmers.
    
    Closes #137

 data/php.tags               | 6551 ++++++++++++++++++++++++++++---------------
 scripts/create_php_tags.php |    4 +-
 2 files changed, 4297 insertions(+), 2258 deletions(-)

commit c615d8431fa2cf808ec692f1c605834186a39c08
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Aug 15 17:52:13 2013 +0100

    Don't call getenv twice

 src/symbols.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 17f9dac0c683375422996a78be8cea20a2fd23f1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Aug 15 14:49:16 2013 +0200

    Update our Scintilla patch for Batch lexer

 scintilla/scintilla_changes.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6063e077c37230d03ca4d7fd1844e9a3dea25a77
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 9 00:59:49 2013 +0200

    PHP: Recognize vertical tab (\v) and form-feed (\f) as whitespaces
    
    Even though PHP doesn't handle those very well (it emits warnings about
    "unexpected character"), it still counts them as whitespaces, so
    properly handle them as such.

 tagmanager/ctags/php.c           | 18 +++++++++---------
 tests/ctags/Makefile.am          |  1 +
 tests/ctags/whitespaces.php      | 34 ++++++++++++++++++++++++++++++++++
 tests/ctags/whitespaces.php.tags |  9 +++++++++
 4 files changed, 53 insertions(+), 9 deletions(-)

commit 0101365b1f23a804ebfca875a31846d441a09ca4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 9 00:59:20 2013 +0200

    PHP: Add strings tests

 tests/ctags/Makefile.am      |  1 +
 tests/ctags/strings.php      | 24 ++++++++++++++++++++++++
 tests/ctags/strings.php.tags |  9 +++++++++
 3 files changed, 34 insertions(+)

commit a114d1c3e2ea28a5595e3e50d14065089c26a73d
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Thu Aug 15 14:43:36 2013 +0200

    Update of German trnaslation to fix a double use of accelerator

 po/de.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 09e7d8398fd168fd0aabfd908ffbdf429d7fc53e
Author: exbb2 <kudahkukarek@gmail.com>
Date:   Sun Jul 21 19:45:28 2013 +0300

    Haskell filetype improvements and support for Literal Haskell
    
    Closes #155 and also closes #139

 data/filetype_extensions.conf |  2 +-
 data/filetypes.haskell        | 20 +++++++++++++++-----
 src/editor.c                  |  4 +++-
 src/highlighting.c            | 11 +++++++++--
 src/highlightingmappings.h    |  4 +++-
 5 files changed, 31 insertions(+), 10 deletions(-)

commit b518770dea6daeba90f5c16a9b194f16b7de39c9
Author: canou <canou@server.fake>
Date:   Mon Aug 12 21:51:00 2013 +0200

    Add support for DOS, OS/2 and Windows batch files
    
    * Uses existing LexOthers.cxx from Scintilla already in use by Geany
    * "identifier" style mapping goes to "string" for better presentation
    even if it's semantically incorrect, we'll change it back if it causes
    issues for anyone.
    * Filetype configuration and keywords taken from Don Ho's Notepad++.
    
    Closes #160

 data/filetype_extensions.conf |  1 +
 data/filetypes.batch          | 40 ++++++++++++++++++++++++++++++++++++++++
 scintilla/src/Catalogue.cxx   |  1 +
 src/filetypes.c               |  6 ++++++
 src/filetypes.h               |  1 +
 src/highlighting.c            |  2 ++
 src/highlightingmappings.h    | 21 +++++++++++++++++++++
 7 files changed, 72 insertions(+)

commit a08f595b359361c5c0c28cb52fed4fd0f3daa231
Author: Fabio Ticconi <fabio.ticconi@gmail.com>
Date:   Fri Jul 26 16:46:15 2013 +0100

    Erlang filetype and snippets improvements
    
    * Add .hrl Erlang "header" file
    * Add some useful snippets
    * Add template for Erlang files as per EDocs guidelines
    
    Closes #157

 data/filetype_extensions.conf   |  2 +-
 data/snippets.conf              | 11 +++++++++++
 data/templates/files/module.erl | 10 ++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

commit 0998f1c19c4a199c14920a3802172d820859be08
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Aug 11 14:10:57 2013 +0100

    Make code more readable by renaming poorly named macros NZV and NVL
    
    Closes #159

 plugins/classbuilder.c          |  2 +-
 plugins/export.c                |  2 +-
 plugins/filebrowser.c           | 10 +++++-----
 plugins/htmlchars.c             |  2 +-
 plugins/saveactions.c           | 10 +++++-----
 src/build.c                     | 38 +++++++++++++++++++-------------------
 src/callbacks.c                 |  6 +++---
 src/dialogs.c                   | 12 ++++++------
 src/editor.c                    | 20 ++++++++++----------
 src/filetypes.c                 | 14 +++++++-------
 src/highlighting.c              |  8 ++++----
 src/keyfile.c                   |  4 ++--
 src/main.c                      |  4 ++--
 src/msgwindow.c                 |  4 ++--
 src/plugins.c                   |  8 ++++----
 src/printing.c                  |  4 ++--
 src/project.c                   | 12 ++++++------
 src/search.c                    | 20 ++++++++++----------
 src/sidebar.c                   |  4 ++--
 src/socket.c                    |  2 +-
 src/symbols.c                   |  8 ++++----
 src/templates.c                 |  8 ++++----
 src/toolbar.c                   |  4 ++--
 src/tools.c                     | 12 ++++++------
 src/ui_utils.c                  |  2 +-
 src/utils.c                     | 14 +++++++-------
 src/utils.h                     | 11 ++++++++---
 src/vte.c                       |  4 ++--
 tagmanager/src/tm_symbol.c      | 12 ++++++------
 tagmanager/src/tm_tag.c         | 14 +++++++-------
 tagmanager/src/tm_work_object.h |  2 +-
 31 files changed, 141 insertions(+), 136 deletions(-)

commit db140bb614e56a08546c2bc4eb58359dfe7d2c7c
Author: Antoine Turmel <geekshadow@gmail.com>
Date:   Tue Aug 13 10:12:43 2013 +0200

    Adding .xul and .dtd extensions with XML
    
    See: http://en.wikipedia.org/wiki/.xul and http://en.wikipedia.org/wiki/.dtd
    
    Closes #161

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5dbad33a240b6a922259881d1ac76007ed13f77a
Merge: cba7fcf 992ee22
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Aug 14 04:52:34 2013 -0700

    Merge pull request #158 from duncannz/master
    
    Add various HTML5 keywords

commit cba7fcfe9559c01a97d044db29654530938c5290
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Aug 12 15:18:20 2013 +0100

    Fix full hashing on 64-bit platforms

 tagmanager/src/tm_workspace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6d334853370ca3c7091e82f6ea082633f426982b
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Aug 11 14:53:35 2013 +0100

    Fix warning 'comparison between signed and unsigned integer expressions'
    
    With gcc on Windows.

 src/socket.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 0c7cf8df103232a5ccee7da4e46d611b35eae033
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Aug 11 14:31:30 2013 +0100

    Fix gcc warning 'cast to pointer from integer of different size'

 tagmanager/src/tm_workspace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c4f98d85cbd04b876b1925f69b1a8aff0004e7cf
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Aug 11 10:54:19 2013 +0100

    Use proper string comparison for portability

 src/dialogs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit cc9e56e9bc1624dcebd4c2cae9010edd9acb1936
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Aug 8 17:23:42 2013 +0200

    PHP: Fix parsing of anonymous functions using the "use" keyword
    
    http://www.php.net/manual/en/language.namespaces.php#104136

 tagmanager/ctags/php.c                   | 30 ++++++++++++++++++++++++++++--
 tests/ctags/anonymous_functions.php      |  7 +++++++
 tests/ctags/anonymous_functions.php.tags |  2 ++
 3 files changed, 37 insertions(+), 2 deletions(-)

commit fb7bd34592e2905b83aee43c1a396354dfd6867a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Aug 8 16:52:54 2013 +0200

    PHP: Fix parsing of anonymous functions returning a reference

 tagmanager/ctags/php.c                   | 14 ++++++++------
 tests/ctags/Makefile.am                  |  1 +
 tests/ctags/anonymous_functions.php      | 24 ++++++++++++++++++++++++
 tests/ctags/anonymous_functions.php.tags |  7 +++++++
 4 files changed, 40 insertions(+), 6 deletions(-)

commit 9fbe2bc3193a2c1ee5af43c7b40fa3e69372433c
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Thu Aug 8 11:42:48 2013 +0200

    splitwindow: Change wording for keybinding to by in sync with tools-menu entries. Should fix #102

 plugins/splitwindow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f15f61768d190dbddb58a7e25b72be035f7cffda
Author: elextr <elextr@gmail.com>
Date:   Mon Aug 5 12:13:42 2013 +1000

    Fix sign comparison warning
    
    Since the previous line ensured len is < 100, just casting it is fine.

 src/editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 992ee22ce7ca53fc470036f90f03111ad2849362
Author: Duncan de Wet <duncandewet@gmail.com>
Date:   Wed Jul 31 17:39:11 2013 +1200

    Add various HTML5 keywords

 data/filetypes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0b010e2f45b2e874fc91ebbbabf176fc887290a9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jul 22 11:15:02 2013 +0200

    Bash: Fix handling of quoted HereDoc delimiters
    
    Imported from upstream Scintilla bb784e214430498e91c9935bbc841c798629212f
    
    Closes [bugs:#952]

 scintilla/lexers/LexBash.cxx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit 458f4f2e75d1a48eae2cb3d3f08c01e11dcb8243
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 21 13:50:25 2013 +0200

    Don't warn when trying to close a document when none are open
    
    When using the document close keybinding, it is legitimate for the
    callback to be called even if there are no documents open, so properly
    check for this.
    
    Closes [bugs:#941]

 src/callbacks.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit f0f3a6cd9926b2b36406986fad9c4e866b379b1d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 21 11:52:17 2013 +0200

    Update Scintilla to version 3.3.4

 scintilla/Makefile.am                  |    7 +
 scintilla/gtk/PlatGTK.cxx              |    2 +-
 scintilla/gtk/ScintillaGTK.cxx         |   91 +-
 scintilla/include/ILexer.h             |    2 +
 scintilla/include/Platform.h           |    6 +
 scintilla/lexers/LexAda.cxx            |   15 -
 scintilla/lexers/LexHaskell.cxx        |   41 +-
 scintilla/lexers/LexLua.cxx            |   35 +-
 scintilla/lexers/LexOthers.cxx         |    5 +-
 scintilla/lexers/LexPerl.cxx           |  118 +-
 scintilla/lexers/LexRuby.cxx           |    2 +-
 scintilla/lexlib/CharacterCategory.cxx | 3303 ++++++++++++++++++++++++++++++++
 scintilla/lexlib/CharacterCategory.h   |   31 +
 scintilla/lexlib/LexAccessor.h         |    6 +
 scintilla/lexlib/StyleContext.h        |  150 +-
 scintilla/makefile.win32               |    3 +
 scintilla/scintilla_changes.patch      |    2 +-
 scintilla/src/CaseConvert.cxx          |  630 ++++++
 scintilla/src/CaseConvert.h            |   47 +
 scintilla/src/CaseFolder.cxx           |   68 +
 scintilla/src/CaseFolder.h             |   45 +
 scintilla/src/CellBuffer.cxx           |   14 +-
 scintilla/src/CellBuffer.h             |    2 +-
 scintilla/src/Document.cxx             |  115 +-
 scintilla/src/Document.h               |   20 +-
 scintilla/src/Editor.cxx               |  222 +--
 scintilla/src/Editor.h                 |   46 +-
 scintilla/src/PositionCache.cxx        |    1 +
 scintilla/src/ScintillaBase.cxx        |    1 +
 scintilla/src/Selection.cxx            |    1 +
 scintilla/src/UnicodeFromUTF8.h        |   19 +
 scintilla/src/ViewStyle.cxx            |    7 +-
 scintilla/version.txt                  |    2 +-
 33 files changed, 4605 insertions(+), 454 deletions(-)

commit 7d1cd77eefdad27d228e9452443dbc415906d43b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 21 11:33:40 2013 +0200

    update-scintilla.sh: Fix displaying of the message for new files

 scripts/update-scintilla.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e0ef859c7fd77215a4cde375fc96ab37731e97e1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 19 17:09:57 2013 +0200

    Verilog: Fix parsing initializers
    
    Import upstream CTags fix for parsing Verilog initalizers
    (fixes parsing of test bug2747828.v).

 tagmanager/ctags/verilog.c    | 1 +
 tests/ctags/bug2747828.v.tags | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

commit c7e0fba6ca61ababf570953627436ca4756667bb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 19 16:35:34 2013 +0200

    ObjectiveC: Fix re-parsing
    
    Import upstream CTags fix for proper reinitialization of the ObjectiveC
    parser, fixing parsing after the first call.

 tagmanager/ctags/objc.c | 65 +++++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 29 deletions(-)

commit 8d3085b61c7b86457acb35c4b298d5afcea17082
Author: elextr <elextr@gmail.com>
Date:   Thu Jul 18 13:00:06 2013 +1000

    Add C++ member pointer operator to scope autocomplete operators
    
    C++ member pointers use the syntax ->* so the scope autocomplete
    list was showing after -> then disappearing when * was typed.
    Fixes #907 h.

 src/editor.c | 2 ++
 1 file changed, 2 insertions(+)

commit cac1115ced305f4828cbc49f08c12d95e05d9e85
Author: elextr <elextr@gmail.com>
Date:   Thu Jul 18 12:36:42 2013 +1000

    Prevent reading past start of Scintilla buffer
    
    A quick check seemed to show Scintilla does not check the minimum
    value is positive, so just check here to be safe and log message
    if it fails.

 src/editor.c | 1 +
 1 file changed, 1 insertion(+)

commit 6e902613b38372486b831be121af7579f377a7c5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jul 16 18:37:58 2013 +0200

    Improve some test ordering
    
    Spotted by Daniel Marjamäki, thanks.

 src/symbols.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 768f86bf5ee1de2feff2f7231b6a5c3301943166
Author: Yosef Or Boczko <yoseforb@gmail.com>
Date:   Mon Jul 15 14:00:25 2013 +0300

    Updated Hebrew translation
    
    Signed-off-by: Frank Lanitz <frank@frank.uvena.de>

 po/he.po | 443 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 220 insertions(+), 223 deletions(-)

commit b016e132fd3578c71f3362399b91562e2f6623c8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jul 15 17:42:00 2013 +0200

    Java: Report enums and fix parsing them

 src/symbols.c                   |  1 +
 tagmanager/ctags/c.c            | 29 +++++++++++++++++++++--------
 tests/ctags/enum.java.tags      | 10 ++++++++++
 tests/ctags/java_enum.java      |  5 +++++
 tests/ctags/java_enum.java.tags | 11 +++++++++++
 5 files changed, 48 insertions(+), 8 deletions(-)

commit 80ad5c145900ac29b9fefdab5b84345b2e26268c
Merge: 66396e7 3dc5422
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jul 15 15:48:00 2013 +0200

    Merge branch 'aeberspaecher/cython/ndarray-fix'

commit 3dc54228608b01bccd4d198cec852912000730ad
Author: Alexander Eberspächer <alex.eberspaecher@gmail.com>
Date:   Mon Jul 8 14:27:28 2013 +0200

    Add test for complex datatype Cython tag generation

 tests/ctags/Makefile.am             |  1 +
 tests/ctags/cython_sample2.pyx      | 11 +++++++++++
 tests/ctags/cython_sample2.pyx.tags |  3 +++
 3 files changed, 15 insertions(+)

commit e6878e5cbf47f1e7a000952380f1d6a3a7a63aa2
Author: Alexander Eberspächer <alex.eberspaecher@gmail.com>
Date:   Mon Jul 8 13:08:05 2013 +0200

    Fix ctags for complex Cython type declarations
    
    Cython allows the use NumPy arrays on a C level. In that context, a
    typical return type declaration could be e.g. "cpdef
    numpy.ndarray[dtype=double, ndim=1] name". This now generates a tag for
    the function. Previously, the equal sign prevented that.

 tagmanager/ctags/python.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 66396e7ca7e892d734daf9b6579b3dce9a742548
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jul 15 00:49:12 2013 +0200

    PHP: Fix infinite loop reading an identifier ending at EOF
    
    Bit-wise operation is inappropriate here because `c` might be negative,
    since EOF is generally represented as -1.  Since -1 is stored as all
    bits at 1 on most common architectures, the test will evaluate to true,
    hence entering an infinite loop.

 tagmanager/ctags/php.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9ae90f3f877117c8d4fd7f03d2222aa19acc60bf
Author: Yosef Or Boczko <yoseforb@gmail.com>
Date:   Thu Jul 4 11:30:41 2013 +0300

    Fix the my last name and update the my e-mail
    
    Signed-off-by: Frank Lanitz <frank@frank.uvena.de>

 THANKS      | 2 +-
 po/he.po    | 4 ++--
 src/about.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit b39f90c94d54dd80e1f025e90c03fbf6455fadb9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 14 20:34:44 2013 +0200

    C++11, C#: Fix parsing of enums with a base type inside classes

 tagmanager/ctags/c.c             | 16 ++++++++--------
 tests/ctags/Makefile.am          |  1 +
 tests/ctags/cxx11enum.cpp        |  9 +++++++++
 tests/ctags/cxx11enum.cpp.tags   | 19 +++++++++++++++++++
 tests/ctags/keyword_enum.cs.tags |  4 +++-
 5 files changed, 40 insertions(+), 9 deletions(-)

commit af5dfba9d8ab0f6af737f7ac17ad1df675e550ba
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 14 03:00:34 2013 +0200

    C#: Correctly parse enums with a base type specifier
    
    See CSharp Language Specification 14.1.

 tagmanager/ctags/c.c           | 3 ++-
 tests/ctags/bug1515910.cs.tags | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

commit d91c532f958dbb88c047f5bf9858f5b53f28a5a7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 13 23:00:43 2013 +0200

    Remove a few dead assignments
    
    Spotted by clang --analyze.

 src/editor.c  | 4 +---
 src/symbols.c | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

commit f23b7267cffcb615a4f970d824b38c04d58fc426
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 13 22:13:07 2013 +0200

    Fix possible dereference of NULL pointer
    
    Use g_set_error() instead of doing it manually and forgetting to check
    whether the pointer is NULL or not before dereferencing it.
    
    Spotted by clang --analyze.

 src/utils.c | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

commit f0e590022b89ede69cd00ef270c05aa39cd3ed46
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jul 12 15:39:57 2013 +0200

    Fix the test suite with Automake < 1.13
    
    The test suite uses a LOG_COMPILER, which requires the parallel-tests
    Automake test driver which is the default only since version 1.13, so
    explicitly enable it so it is used by earlier versions too.
    
    Moreover, the parallel-tests test diver was introduced by Automake
    1.11, as was the option, so we need to depend on it too.  It was
    released 2009-05-17, which is 2 months after GTK 2.16, the minimum GTK
    version we depend on (2009-03-13).  If this is a problem, we could
    also rework the Automake test layout to use the older and a little
    deprecated serial-tests test driver that is the historical one.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4ec7757f2b18be981e60dbdd0cc1575f9e88e967
Author: Asier Iturralde Sarasola <asier.iturralde@gmail.com>
Date:   Sat Jul 6 15:11:25 2013 +0200

    Updated Basque translation
    
    Signed-off-by: Frank Lanitz <flanitz@bgc-jena.mpg.de>

 po/eu.po | 225 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 122 insertions(+), 103 deletions(-)

commit 4bfac4fcdacb93f58d36496769c5f03e7603788a
Merge: d1f2005 436e0bf
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 3 19:27:19 2013 +0200

    Merge branch 'wip/better-php-parser'

commit 436e0bf3f3cf8461c3e2e7c146b18ede3edc2b56
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 3 19:13:11 2013 +0200

    PHP: add PHP 5.5 keywords

 data/filetypes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f842ed9aac47d1c51115df4f1b3880435fbdc115
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 3 19:08:07 2013 +0200

    Tests: add PHP case sensitivity test

 tests/ctags/Makefile.am               |  1 +
 tests/ctags/case_sensitivity.php      | 40 +++++++++++++++++++++++++++++++++++
 tests/ctags/case_sensitivity.php.tags | 17 +++++++++++++++
 3 files changed, 58 insertions(+)

commit 4de97daa8ce4622d5ff9d366291a29839ed960e1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 3 18:58:43 2013 +0200

    Tests: add test for PHP 5.5 additional usage of the "class" keyword

 tests/ctags/Makefile.am              |  1 +
 tests/ctags/php5_5_class_kw.php      | 19 +++++++++++++++++++
 tests/ctags/php5_5_class_kw.php.tags |  5 +++++
 3 files changed, 25 insertions(+)

commit ad37ced1c240f8c724eac40e237a6285ca13cb43
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 3 18:57:18 2013 +0200

    PHP: recognize PHP 5.5 keywords finally and yield as such

 tagmanager/ctags/php.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 9b1890b6054b0083860569fb3a066dbf2648b7fa
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 27 00:42:28 2013 +0200

    PHP: add support for "<script language=php>" open and close tags
    
    http://www.php.net/manual/en/language.basic-syntax.phptags.php

 tagmanager/ctags/php.c    | 113 ++++++++++++++++++++++++++++++++++++++++------
 tests/ctags/mode.php      |  73 ++++++++++++++++++++++++++++++
 tests/ctags/mode.php.tags |   6 +++
 3 files changed, 179 insertions(+), 13 deletions(-)

commit 3235f57bc9f45823e7d6278e48e62876ebddd869
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jun 26 21:48:31 2013 +0200

    Tests: fix PHP tests results

 tests/ctags/classes.php.tags     | 10 +++++-----
 tests/ctags/mode.php.tags        |  6 ------
 tests/ctags/namespaces.php.tags  | 18 +++++++++++-------
 tests/ctags/namespaces2.php.tags | 18 +++++++++++-------
 tests/ctags/simple.php.tags      |  7 ++++---
 tests/ctags/traits.php.tags      | 10 ++++++----
 6 files changed, 37 insertions(+), 32 deletions(-)

commit e3fad4a745fa2f1c8bbee9620876787f6bb029ca
Merge: c986eee d1f2005
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 3 19:26:06 2013 +0200

    Merge branch 'master' into wip/better-php-parser

commit d1f2005738fbf01694a9fd52521446b0fd755f01
Merge: d4398d7 3ba9bd3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jun 26 16:37:12 2013 +0200

    Merge branch 'sql-parser-update'

commit 3ba9bd34db028c73d2198dd3382e4c1176105ec7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jun 26 15:31:42 2013 +0200

    SQL: Show variables in the symbol list

 src/symbols.c | 1 +
 1 file changed, 1 insertion(+)

commit 08fe915ce8b4ed180f16e43becdfa8c177d02032
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 24 21:49:59 2013 +0200

    SQL: report scope as such, not as part of the tag name

 tagmanager/ctags/sql.c          | 81 +++++++++++++++++++++--------------------
 tests/ctags/3184782.sql.tags    |  8 ++--
 tests/ctags/bug1570779.sql.tags |  6 +--
 tests/ctags/bug1938565.sql.tags |  4 +-
 tests/ctags/bug1944150.sql.tags |  2 +-
 tests/ctags/bug823000.sql.tags  |  4 +-
 tests/ctags/db-trig.sql.tags    |  4 +-
 tests/ctags/random.sql.tags     | 20 +++++-----
 tests/ctags/readlob.sql.tags    |  8 ++--
 tests/ctags/readlong.sql.tags   |  2 +-
 tests/ctags/refcurs.sql.tags    |  6 +--
 11 files changed, 73 insertions(+), 72 deletions(-)

commit d4398d7fd0c028bf51b58b229c6b4d4a7b4b96f1
Author: elextr <elextr@gmail.com>
Date:   Wed Jun 26 14:52:52 2013 +1000

    Add some more explanation to indentation documentation
    
    Explain operation of tabs and spaces setting.
    Explain relation of autoindent settings and indentation type.
    Add note regarding filetypes to match braces.

 doc/geany.txt | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

commit f02b70949adf2659ebc833a2c8075595a7625ff3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 25 15:06:16 2013 +0200

    tests: Add a missing test file (oops)
    
    I forgot to add the files in 32074064ab91104d7bdfbb5dc0dcd97faf7f7f11,
    oops.

 tests/ctags/procedure_pointer_module.f90      | 19 +++++++++++++++++++
 tests/ctags/procedure_pointer_module.f90.tags |  5 +++++
 2 files changed, 24 insertions(+)

commit 18bc2d92c11a1bea2f244b57ee16d94d1bcbf64d
Author: Yosef Or Boczko <yosefor3@walla.com>
Date:   Wed Sep 19 09:00:50 2012 +0300

    Fix GTK3 build under Windows

 src/socket.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 750ac6e9781bbfcb751e9a34bdcbbe8007c00046
Author: John Long <a@88k.us>
Date:   Wed May 22 09:37:57 2013 -0500

    Add 'self' to list of PHP keywords

 data/filetypes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fbc6bdc85004988a63c9860950763578870bed10
Author: Edwin Lee <leeed2001@gmail.com>
Date:   Tue Mar 12 14:22:16 2013 -0500

    Add some missing Fortran file extensions
    
    Updated Fortran file extensions to include f08 (Fortran 2008) and all
    the preprocessor Fortran extensions.

 data/filetype_extensions.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3ec664f544d940b470ed09e2351a9e1de4966bfa
Merge: 4a199f8 3207406
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 24 23:09:36 2013 +0200

    Merge Fortran fixes from Alexander Eberspächer
    
    Closes PR#145 and PR#146 by cherry-picking their commits.

commit 32074064ab91104d7bdfbb5dc0dcd97faf7f7f11
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 24 23:06:48 2013 +0200

    tests: Add a test for Fortran procedure pointers
    
    Test file from Alexander Eberspächer.

 tests/ctags/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 194ef6010d25e04bf69f705cf94818f68a55f3fa
Author: Alexander Eberspächer <alex.eberspaecher@gmail.com>
Date:   Tue Jun 11 17:41:37 2013 +0200

    Tagmanger: recognize Fortran procedure pointers as variables
    
    Add a keyword for procedure pointers and treat declarations such as
    'procedure(subprogram_to_point_to), pointer :: my_pointer' just like
    declarations of a real or integer variable.

 tagmanager/ctags/fortran.c | 4 ++++
 1 file changed, 4 insertions(+)

commit e4f82f28b70ba5582c13d7543c930cd185e70938
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 24 22:53:54 2013 +0200

    tests: Add a test for forall Fortran issue
    
    Test file from Alexander Eberspächer.

 tests/ctags/Makefile.am            |  1 +
 tests/ctags/forall_module.f90      | 26 ++++++++++++++++++++++++++
 tests/ctags/forall_module.f90.tags |  5 +++++
 3 files changed, 32 insertions(+)

commit 2f31f7477b2b81ae9bc323a016a36e7f970ed2a9
Author: Alexander Eberspächer <alex.eberspaecher@gmail.com>
Date:   Tue Jun 11 15:09:05 2013 +0200

    Fix tag generation for Fortran with 'forall' blocks
    
    * Add 'forall' as a keyword
    * Add a check that allows 'forall' as a secondary keyword in
      'end' statements.

 tagmanager/ctags/fortran.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 8b11f9b0efc32cd3da892b6e464cd9d1355543ec
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 24 20:24:48 2013 +0200

    SQL: generalize support for SQL Server square brackets quoting
    
    This fixes test case tests/ctags/bug1944150.sql.

 tagmanager/ctags/sql.c          | 92 ++++++++++++++++++++---------------------
 tests/ctags/bug1944150.sql.tags |  2 +-
 2 files changed, 45 insertions(+), 49 deletions(-)

commit 76a7d3c902582b756c7db6283eb2bc23bb6dfdc9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 24 18:04:46 2013 +0200

    SQL: Update parser from upstream CTags

 tagmanager/ctags/read.c                |   10 +
 tagmanager/ctags/read.h                |    1 +
 tagmanager/ctags/sql.c                 | 3549 +++++++++++++++++++-------------
 tests/ctags/3184782.sql.tags           |    9 +-
 tests/ctags/bug1938565.sql.tags        |    4 +-
 tests/ctags/bug823000.sql.tags         |    4 +-
 tests/ctags/db-trig.sql.tags           |    1 +
 tests/ctags/ingres_procedures.sql.tags |    5 +
 tests/ctags/random.sql.tags            |   20 +-
 tests/ctags/refcurs.sql.tags           |    6 +-
 10 files changed, 2164 insertions(+), 1445 deletions(-)

commit 4a199f8505abeb648fa711d148e894cc158f2580
Merge: fa0f92d ac344e5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 24 17:54:41 2013 +0200

    Merge branch 'ctags-tests'

commit ac344e5d83b0b8cabfa429eaecafd93fd3ca350e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 23 20:15:51 2013 +0200

    Improve error log when a tag parser test fails

 tests/ctags/runner.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8037fa5d10c83d85946ec90c009148a9262f3a71
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 23 15:13:13 2013 +0200

    Import all test cases from upstream CTags that work for us
    
    The test results were auto-generated and not manually checked, so they
    may be inaccurate.  They should be fixed if appropriate if they start
    to fail, e.g. when modifying the relevant parser.
    
    CTags' tests that didn't pass weren't imported, but probably should be
    added an the relevant parser fixed.

 tests/ctags/1795612.js                        |   29 +
 tests/ctags/1795612.js.tags                   |    5 +
 tests/ctags/1850914.js                        |   24 +
 tests/ctags/1850914.js.tags                   |    4 +
 tests/ctags/1878155.js                        |   19 +
 tests/ctags/1878155.js.tags                   |    4 +
 tests/ctags/1880687.js                        |  191 +
 tests/ctags/1880687.js.tags                   |   30 +
 tests/ctags/2023624.js                        |   15 +
 tests/ctags/2023624.js.tags                   |    3 +
 tests/ctags/3184782.sql                       |   41 +
 tests/ctags/3184782.sql.tags                  |    7 +
 tests/ctags/3470609.js                        |   48 +
 tests/ctags/3470609.js.tags                   |   13 +
 tests/ctags/3526726.tex                       | 2984 +++++++++
 tests/ctags/3526726.tex.tags                  |  155 +
 tests/ctags/68hc11.asm                        |   23 +
 tests/ctags/68hc11.asm.tags                   |   11 +
 tests/ctags/Makefile.am                       |  220 +
 tests/ctags/Package.pm                        |   57 +
 tests/ctags/Package.pm.tags                   |   10 +
 tests/ctags/angle_bracket.cpp                 |   16 +
 tests/ctags/angle_bracket.cpp.tags            |    4 +
 tests/ctags/array-spec.f90                    |   10 +
 tests/ctags/array-spec.f90.tags               |    3 +
 tests/ctags/array_ref_and_out.cs              |   33 +
 tests/ctags/array_ref_and_out.cs.tags         |    6 +
 tests/ctags/array_spec.f90                    |   15 +
 tests/ctags/array_spec.f90.tags               |    9 +
 tests/ctags/attributes.cs                     |   22 +
 tests/ctags/attributes.cs.tags                |    7 +
 tests/ctags/auto.f                            |    7 +
 tests/ctags/auto.f.tags                       |    5 +
 tests/ctags/bit_field.c                       |   35 +
 tests/ctags/bit_field.c.tags                  |   26 +
 tests/ctags/bracematch.js                     |   45 +
 tests/ctags/bracematch.js.tags                |    7 +
 tests/ctags/bug1020715.c                      |   52 +
 tests/ctags/bug1020715.c.tags                 |    2 +
 tests/ctags/bug1020715.cpp                    |    6 +
 tests/ctags/bug1020715.cpp.tags               |    2 +
 tests/ctags/bug1086609.c                      |   41 +
 tests/ctags/bug1086609.c.tags                 |    2 +
 tests/ctags/bug1093123.cpp                    |    7 +
 tests/ctags/bug1093123.cpp.tags               |    2 +
 tests/ctags/bug1111214-j-chan.v               |    8 +
 tests/ctags/bug1111214-j-chan.v.tags          |    4 +
 tests/ctags/bug1111214.v                      |   17 +
 tests/ctags/bug1111214.v.tags                 |    2 +
 tests/ctags/bug1201689.c                      |   35 +
 tests/ctags/bug1201689.c.tags                 |    2 +
 tests/ctags/bug1447756.java                   |    9 +
 tests/ctags/bug1447756.java.tags              |    3 +
 tests/ctags/bug1458930.c                      |    3 +
 tests/ctags/bug1458930.c.tags                 |    3 +
 tests/ctags/bug1466117.c                      |   10 +
 tests/ctags/bug1466117.c.tags                 |    8 +
 tests/ctags/bug1491666.c                      |   13 +
 tests/ctags/bug1491666.c.tags                 |    6 +
 tests/ctags/bug1515910.cs                     |   15 +
 tests/ctags/bug1515910.cs.tags                |   10 +
 tests/ctags/bug1548443.cpp                    |    9 +
 tests/ctags/bug1548443.cpp.tags               |    5 +
 tests/ctags/bug1563476.cpp                    |   16 +
 tests/ctags/bug1563476.cpp.tags               |    3 +
 tests/ctags/bug1570779.sql                    |   14 +
 tests/ctags/bug1570779.sql.tags               |    5 +
 tests/ctags/bug1575055.cpp                    |    4 +
 tests/ctags/bug1575055.cpp.tags               |    4 +
 tests/ctags/bug1585745.cpp                    |    8 +
 tests/ctags/bug1585745.cpp.tags               |    7 +
 tests/ctags/bug1611054.cs                     |    8 +
 tests/ctags/bug1611054.cs.tags                |    4 +
 tests/ctags/bug1691412.java                   |   17 +
 tests/ctags/bug1691412.java.tags              |    4 +
 tests/ctags/bug1742588.rb                     |    7 +
 tests/ctags/bug1742588.rb.tags                |    4 +
 tests/ctags/bug1743330.v                      |    9 +
 tests/ctags/bug1743330.v.tags                 |    2 +
 tests/ctags/bug1764143.h                      |   27 +
 tests/ctags/bug1764143.h.tags                 |    3 +
 tests/ctags/bug1764148.py                     |    2 +
 tests/ctags/bug1764148.py.tags                |    2 +
 tests/ctags/bug1770479.cpp                    |   17 +
 tests/ctags/bug1770479.cpp.tags               |    3 +
 tests/ctags/bug1773926.cpp                    |   12 +
 tests/ctags/bug1773926.cpp.tags               |    5 +
 tests/ctags/bug1777344.java                   |    7 +
 tests/ctags/bug1777344.java.tags              |   10 +
 tests/ctags/bug1799340.cpp                    |    3 +
 tests/ctags/bug1799340.cpp.tags               |    4 +
 tests/ctags/bug1799343-1.cpp                  |   10 +
 tests/ctags/bug1799343-1.cpp.tags             |    6 +
 tests/ctags/bug1799343-2.cpp                  |   27 +
 tests/ctags/bug1799343-2.cpp.tags             |   14 +
 tests/ctags/bug1800065.cs                     |    5 +
 tests/ctags/bug1800065.cs.tags                |    4 +
 tests/ctags/bug1809024.py                     |   10 +
 tests/ctags/bug1809024.py.tags                |    2 +
 tests/ctags/bug1830343.cs                     |    8 +
 tests/ctags/bug1830343.cs.tags                |    3 +
 tests/ctags/bug1830344.cs                     |   10 +
 tests/ctags/bug1830344.cs.tags                |    3 +
 tests/ctags/bug1856363.py                     |    9 +
 tests/ctags/bug1856363.py.tags                |    2 +
 tests/ctags/bug1906062.py                     |    7 +
 tests/ctags/bug1906062.py.tags                |    2 +
 tests/ctags/bug1907083.cpp                    |    5 +
 tests/ctags/bug1907083.cpp.tags               |    5 +
 tests/ctags/bug1924919.cpp                    |    5 +
 tests/ctags/bug1924919.cpp.tags               |    4 +
 tests/ctags/bug1938565.sql                    |   18 +
 tests/ctags/bug1938565.sql.tags               |    4 +
 tests/ctags/bug1944150.sql                    |    7 +
 tests/ctags/bug1944150.sql.tags               |    2 +
 tests/ctags/bug1950327.js                     |   41 +
 tests/ctags/bug1950327.js.tags                |   14 +
 tests/ctags/bug1988026.py                     |    9 +
 tests/ctags/bug1988026.py.tags                |    5 +
 tests/ctags/bug1988027.py                     |   14 +
 tests/ctags/bug1988027.py.tags                |    2 +
 tests/ctags/bug1988130.py                     |    7 +
 tests/ctags/bug1988130.py.tags                |    3 +
 tests/ctags/bug2049723.java                   |    6 +
 tests/ctags/bug2049723.java.tags              |    4 +
 tests/ctags/bug2075402.py                     |    2 +
 tests/ctags/bug2075402.py.tags                |    3 +
 tests/ctags/bug2117073.java                   |   12 +
 tests/ctags/bug2117073.java.tags              |    4 +
 tests/ctags/bug2374109.vhd                    |    9 +
 tests/ctags/bug2374109.vhd.tags               |    3 +
 tests/ctags/bug2411878.cs                     |    3 +
 tests/ctags/bug2411878.cs.tags                |    3 +
 tests/ctags/bug2747828.v                      |    1 +
 tests/ctags/bug2747828.v.tags                 |    3 +
 tests/ctags/bug2777310.js                     |    4 +
 tests/ctags/bug2777310.js.tags                |    4 +
 tests/ctags/bug2781264.rb                     |   12 +
 tests/ctags/bug2781264.rb.tags                |    4 +
 tests/ctags/bug2886870.tex                    |  351 ++
 tests/ctags/bug2886870.tex.tags               |   39 +
 tests/ctags/bug2888482.js                     |   12 +
 tests/ctags/bug2888482.js.tags                |    3 +
 tests/ctags/bug3036476.js                     |   20 +
 tests/ctags/bug3036476.js.tags                |    5 +
 tests/ctags/bug3168705.py                     |    9 +
 tests/ctags/bug3168705.py.tags                |    4 +
 tests/ctags/bug3571233.js                     |   56 +
 tests/ctags/bug3571233.js.tags                |   11 +
 tests/ctags/bug507864.c                       |    2 +
 tests/ctags/bug507864.c.tags                  |    4 +
 tests/ctags/bug538629.asm                     |    1 +
 tests/ctags/bug538629.asm.tags                |    2 +
 tests/ctags/bug556645.c                       |   39 +
 tests/ctags/bug556645.c.tags                  |    2 +
 tests/ctags/bug556646.c                       |   42 +
 tests/ctags/bug556646.c.tags                  |   22 +
 tests/ctags/bug565813.f90                     |   42 +
 tests/ctags/bug565813.f90.tags                |    7 +
 tests/ctags/bug612019.pas                     |   33 +
 tests/ctags/bug612019.pas.tags                |    4 +
 tests/ctags/bug612621.pl                      |   57 +
 tests/ctags/bug612621.pl.tags                 |    3 +
 tests/ctags/bug620288.f                       |   98 +
 tests/ctags/bug620288.f.tags                  |    3 +
 tests/ctags/bug639639.h                       |   46 +
 tests/ctags/bug639639.h.tags                  |    3 +
 tests/ctags/bug639644.hpp                     |   41 +
 tests/ctags/bug639644.hpp.tags                |    3 +
 tests/ctags/bug665086.cpp                     |   32 +
 tests/ctags/bug665086.cpp.tags                |    4 +
 tests/ctags/bug670433.f90                     |   40 +
 tests/ctags/bug670433.f90.tags                |    5 +
 tests/ctags/bug699171.py                      |    8 +
 tests/ctags/bug699171.py.tags                 |    3 +
 tests/ctags/bug722501.sql                     |   24 +
 tests/ctags/bug722501.sql.tags                |    2 +
 tests/ctags/bug726712.f90                     |   72 +
 tests/ctags/bug726712.f90.tags                |    4 +
 tests/ctags/bug726875.f90                     |   28 +
 tests/ctags/bug726875.f90.tags                |    4 +
 tests/ctags/bug734933.f90                     |   39 +
 tests/ctags/bug734933.f90.tags                |   12 +
 tests/ctags/bug762027.v                       |   27 +
 tests/ctags/bug762027.v.tags                  |    3 +
 tests/ctags/bug814263.java                    |    6 +
 tests/ctags/bug814263.java.tags               |    4 +
 tests/ctags/bug823000.sql                     |   80 +
 tests/ctags/bug823000.sql.tags                |    4 +
 tests/ctags/bug842077.pl                      |   33 +
 tests/ctags/bug842077.pl.tags                 |    2 +
 tests/ctags/bug849591.cpp                     |   56 +
 tests/ctags/bug849591.cpp.tags                |    2 +
 tests/ctags/bug852368.cpp                     |   34 +
 tests/ctags/bug852368.cpp.tags                |    2 +
 tests/ctags/bug858165.f90                     |   25 +
 tests/ctags/bug858165.f90.tags                |    6 +
 tests/ctags/bug872494.cpp                     |   43 +
 tests/ctags/bug872494.cpp.tags                |    4 +
 tests/ctags/bug877956.f90                     |   54 +
 tests/ctags/bug877956.f90.tags                |    4 +
 tests/ctags/bug960316.v                       |   53 +
 tests/ctags/bug960316.v.tags                  |    7 +
 tests/ctags/bug961001.v                       |   26 +
 tests/ctags/bug961001.v.tags                  |    9 +
 tests/ctags/byte.f                            |    7 +
 tests/ctags/byte.f.tags                       |   11 +
 tests/ctags/char-selector.f90                 |   19 +
 tests/ctags/char-selector.f90.tags            |   11 +
 tests/ctags/classes.php                       |   38 +
 tests/ctags/classes.php.tags                  |    8 +
 tests/ctags/common.f                          |    4 +
 tests/ctags/common.f.tags                     |    5 +
 tests/ctags/continuation.f90                  |    6 +
 tests/ctags/continuation.f90.tags             |    5 +
 tests/ctags/countall.sql                      |   43 +
 tests/ctags/countall.sql.tags                 |    8 +
 tests/ctags/cpp_destructor.cpp                |    6 +
 tests/ctags/cpp_destructor.cpp.tags           |    4 +
 tests/ctags/cython_sample.pyx                 |   46 +
 tests/ctags/cython_sample.pyx.tags            |   12 +
 tests/ctags/db-trig.sql                       |   31 +
 tests/ctags/db-trig.sql.tags                  |    2 +
 tests/ctags/debian_432872.f90                 |    8 +
 tests/ctags/debian_432872.f90.tags            |    3 +
 tests/ctags/directives.c                      |   69 +
 tests/ctags/directives.c.tags                 |   20 +
 tests/ctags/dopbl2.f                          |  227 +
 tests/ctags/dopbl2.f.tags                     |    2 +
 tests/ctags/enum.c                            |    5 +
 tests/ctags/enum.c.tags                       |    5 +
 tests/ctags/enum.java                         |   20 +
 tests/ctags/enum.java.tags                    |    3 +
 tests/ctags/events.cs                         |  192 +
 tests/ctags/events.cs.tags                    |   15 +
 tests/ctags/extern_variable.h                 |    4 +
 tests/ctags/extern_variable.h.tags            |    5 +
 tests/ctags/format.pl                         |   15 +
 tests/ctags/format.pl.tags                    |    3 +
 tests/ctags/func_typedef.h                    |    1 +
 tests/ctags/func_typedef.h.tags               |    2 +
 tests/ctags/general.cs                        |   46 +
 tests/ctags/general.cs.tags                   |   15 +
 tests/ctags/hex2dec.sql                       |   50 +
 tests/ctags/hex2dec.sql.tags                  |    3 +
 tests/ctags/implied_program.f                 |    6 +
 tests/ctags/implied_program.f.tags            |    2 +
 tests/ctags/indexer.cs                        |   37 +
 tests/ctags/indexer.cs.tags                   |    5 +
 tests/ctags/infinite_loop.java                |    2 +
 tests/ctags/infinite_loop.java.tags           |    2 +
 tests/ctags/ingres_procedures.sql             |   63 +
 tests/ctags/ingres_procedures.sql.tags        |    2 +
 tests/ctags/initialization.f90                |   16 +
 tests/ctags/initialization.f90.tags           |    4 +
 tests/ctags/interface_indexers.cs             |   49 +
 tests/ctags/interface_indexers.cs.tags        |    6 +
 tests/ctags/interface_properties.cs           |   64 +
 tests/ctags/interface_properties.cs.tags      |    9 +
 tests/ctags/internal.cs                       |    6 +
 tests/ctags/internal.cs.tags                  |    3 +
 tests/ctags/intro.tex                         |   40 +
 tests/ctags/intro.tex.tags                    |   10 +
 tests/ctags/intro_orig.tex                    |  346 ++
 tests/ctags/intro_orig.tex.tags               |   38 +
 tests/ctags/invalid_name.f90                  |   12 +
 tests/ctags/invalid_name.f90.tags             |    5 +
 tests/ctags/java_enum.java                    |   15 +
 tests/ctags/java_enum.java.tags               |    4 +
 tests/ctags/jsFunc_tutorial.js                |  524 ++
 tests/ctags/jsFunc_tutorial.js.tags           |   71 +
 tests/ctags/keyword_abstract.cs               |   51 +
 tests/ctags/keyword_abstract.cs.tags          |    8 +
 tests/ctags/keyword_catch_try.cs              |   33 +
 tests/ctags/keyword_catch_try.cs.tags         |    4 +
 tests/ctags/keyword_class.cs                  |   49 +
 tests/ctags/keyword_class.cs.tags             |    9 +
 tests/ctags/keyword_const.cs                  |   26 +
 tests/ctags/keyword_const.cs.tags             |    9 +
 tests/ctags/keyword_delegate.cs               |   57 +
 tests/ctags/keyword_delegate.cs.tags          |   12 +
 tests/ctags/keyword_enum.cs                   |   31 +
 tests/ctags/keyword_enum.cs.tags              |   12 +
 tests/ctags/keyword_event.cs                  |  180 +
 tests/ctags/keyword_event.cs.tags             |   22 +
 tests/ctags/keyword_explicit.cs               |   27 +
 tests/ctags/keyword_explicit.cs.tags          |    7 +
 tests/ctags/keyword_extern.cs                 |   15 +
 tests/ctags/keyword_extern.cs.tags            |    4 +
 tests/ctags/keyword_implicit.cs               |   30 +
 tests/ctags/keyword_implicit.cs.tags          |    7 +
 tests/ctags/keyword_interface.cs              |   73 +
 tests/ctags/keyword_interface.cs.tags         |    9 +
 tests/ctags/keyword_namespace.cs              |   31 +
 tests/ctags/keyword_namespace.cs.tags         |    9 +
 tests/ctags/keyword_out.cs                    |   17 +
 tests/ctags/keyword_out.cs.tags               |    4 +
 tests/ctags/keyword_override.cs               |   44 +
 tests/ctags/keyword_override.cs.tags          |   10 +
 tests/ctags/keyword_params.cs                 |   28 +
 tests/ctags/keyword_params.cs.tags            |    5 +
 tests/ctags/keyword_private.cs                |   25 +
 tests/ctags/keyword_private.cs.tags           |    8 +
 tests/ctags/keyword_protected.cs              |   20 +
 tests/ctags/keyword_protected.cs.tags         |    6 +
 tests/ctags/keyword_public.cs                 |   21 +
 tests/ctags/keyword_public.cs.tags            |    6 +
 tests/ctags/keyword_sealed.cs                 |   19 +
 tests/ctags/keyword_sealed.cs.tags            |    6 +
 tests/ctags/keyword_static.cs                 |   47 +
 tests/ctags/keyword_static.cs.tags            |   10 +
 tests/ctags/keyword_struct.cs                 |   29 +
 tests/ctags/keyword_struct.cs.tags            |    7 +
 tests/ctags/keyword_virtual.cs                |   72 +
 tests/ctags/keyword_virtual.cs.tags           |   19 +
 tests/ctags/keyword_volatile.cs               |   14 +
 tests/ctags/keyword_volatile.cs.tags          |    5 +
 tests/ctags/labels.sql                        |    8 +
 tests/ctags/labels.sql.tags                   |    2 +
 tests/ctags/lanus.for                         |   47 +
 tests/ctags/lanus.for.tags                    |    6 +
 tests/ctags/line_directives.c                 |   12 +
 tests/ctags/line_directives.c.tags            |    4 +
 tests/ctags/local.c                           |   22 +
 tests/ctags/local.c.tags                      |    3 +
 tests/ctags/macros.c                          |    7 +
 tests/ctags/macros.c.tags                     |    6 +
 tests/ctags/masm.asm                          |   33 +
 tests/ctags/masm.asm.tags                     |   12 +
 tests/ctags/matlab_backtracking.m             |  101 +
 tests/ctags/matlab_backtracking.m.tags        |    2 +
 tests/ctags/matlab_test.m                     |    4 +
 tests/ctags/matlab_test.m.tags                |    4 +
 tests/ctags/maze.erl                          |  127 +
 tests/ctags/maze.erl.tags                     |    6 +
 tests/ctags/misc_types.f                      |   32 +
 tests/ctags/misc_types.f.tags                 |    4 +
 tests/ctags/misc_types.f90                    |   43 +
 tests/ctags/misc_types.f90.tags               |   15 +
 tests/ctags/mode.php                          |   52 +
 tests/ctags/mode.php.tags                     |   11 +
 tests/ctags/moniker.x68.asm                   |  116 +
 tests/ctags/moniker.x68.asm.tags              |   16 +
 tests/ctags/namelist.f                        |    4 +
 tests/ctags/namelist.f.tags                   |    2 +
 tests/ctags/namespace.cpp                     |   10 +
 tests/ctags/namespace.cpp.tags                |    7 +
 tests/ctags/namespaces.php                    |   73 +
 tests/ctags/namespaces.php.tags               |   10 +
 tests/ctags/namespaces2.php                   |   60 +
 tests/ctags/namespaces2.php.tags              |    8 +
 tests/ctags/no_terminator.js                  |   32 +
 tests/ctags/no_terminator.js.tags             |    6 +
 tests/ctags/numlib.f90                        |   57 +
 tests/ctags/numlib.f90.tags                   |    2 +
 tests/ctags/objectivec_implementation.mm      |  125 +
 tests/ctags/objectivec_implementation.mm.tags |   12 +
 tests/ctags/objectivec_interface.mm           |   64 +
 tests/ctags/objectivec_interface.mm.tags      |   24 +
 tests/ctags/objectivec_property.mm            |   13 +
 tests/ctags/objectivec_property.mm.tags       |    4 +
 tests/ctags/objectivec_protocol.mm            |    6 +
 tests/ctags/objectivec_protocol.mm.tags       |    3 +
 tests/ctags/property.cs                       |   50 +
 tests/ctags/property.cs.tags                  |    8 +
 tests/ctags/prototype.h                       |    2 +
 tests/ctags/prototype.h.tags                  |    3 +
 tests/ctags/pure_elem.f95                     |   37 +
 tests/ctags/pure_elem.f95.tags                |    5 +
 tests/ctags/random.sql                        |  100 +
 tests/ctags/random.sql.tags                   |   12 +
 tests/ctags/readlob.sql                       |   39 +
 tests/ctags/readlob.sql.tags                  |   10 +
 tests/ctags/readlong.sql                      |   41 +
 tests/ctags/readlong.sql.tags                 |    9 +
 tests/ctags/recursive.f95                     |   68 +
 tests/ctags/recursive.f95.tags                |    7 +
 tests/ctags/refcurs.sql                       |   75 +
 tests/ctags/refcurs.sql.tags                  |    6 +
 tests/ctags/regexp.js                         |   38 +
 tests/ctags/regexp.js.tags                    |   15 +
 tests/ctags/secondary_fcn_name.js             |   40 +
 tests/ctags/secondary_fcn_name.js.tags        |    6 +
 tests/ctags/semicolon.f90                     |    5 +
 tests/ctags/semicolon.f90.tags                |    4 +
 tests/ctags/signature.cpp                     |    9 +
 tests/ctags/signature.cpp.tags                |    5 +
 tests/ctags/simple.bas                        |   22 +
 tests/ctags/simple.bas.tags                   |    8 +
 tests/ctags/simple.cbl                        |   30 +
 tests/ctags/simple.cbl.tags                   |   19 +
 tests/ctags/simple.html                       |   29 +
 tests/ctags/simple.html.tags                  |    8 +
 tests/ctags/simple.js                         |  101 +
 tests/ctags/simple.js.tags                    |   25 +
 tests/ctags/simple.ksh                        |    7 +
 tests/ctags/simple.ksh.tags                   |    3 +
 tests/ctags/simple.lua                        |   16 +
 tests/ctags/simple.lua.tags                   |    3 +
 tests/ctags/simple.mak                        |   19 +
 tests/ctags/simple.mak.tags                   |   15 +
 tests/ctags/simple.php                        |   49 +
 tests/ctags/simple.php.tags                   |   11 +
 tests/ctags/simple.pl                         |   11 +
 tests/ctags/simple.pl.tags                    |    5 +
 tests/ctags/simple.py                         |   63 +
 tests/ctags/simple.py.tags                    |   27 +
 tests/ctags/simple.rb                         |   29 +
 tests/ctags/simple.rb.tags                    |   10 +
 tests/ctags/simple.sh                         |   10 +
 tests/ctags/simple.sh.tags                    |    4 +
 tests/ctags/simple.tcl                        |   10 +
 tests/ctags/simple.tcl.tags                   |    7 +
 tests/ctags/spurious_label_tags.c             |   17 +
 tests/ctags/spurious_label_tags.c.tags        |    2 +
 tests/ctags/sql_single_quote.sql              |   18 +
 tests/ctags/sql_single_quote.sql.tags         |    4 +
 tests/ctags/state_machine.v                   |   61 +
 tests/ctags/state_machine.v.tags              |    7 +
 tests/ctags/static_array.c                    |    3 +
 tests/ctags/static_array.c.tags               |    2 +
 tests/ctags/stdcall.f                         |  178 +
 tests/ctags/stdcall.f.tags                    |   22 +
 tests/ctags/strings.rb                        |   68 +
 tests/ctags/strings.rb.tags                   |   14 +
 tests/ctags/structure.f                       |   29 +
 tests/ctags/structure.f.tags                  |   10 +
 tests/ctags/tabindent.py                      |    3 +
 tests/ctags/tabindent.py.tags                 |    2 +
 tests/ctags/test.py                           |   10 +
 tests/ctags/test.py.tags                      |    4 +
 tests/ctags/test.vhd                          | 8174 +++++++++++++++++++++++++
 tests/ctags/test.vhd.tags                     |  358 ++
 tests/ctags/traffic_signal.v                  |   49 +
 tests/ctags/traffic_signal.v.tags             |   14 +
 tests/ctags/traits.php                        |   47 +
 tests/ctags/traits.php.tags                   |    7 +
 tests/ctags/union.f                           |   21 +
 tests/ctags/union.f.tags                      |    4 +
 tests/ctags/value.f                           |    9 +
 tests/ctags/value.f.tags                      |    4 +
 441 files changed, 21649 insertions(+)

commit c1deb7457f72e7900d6e166e59e6d1ed0552ed9a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 23 15:08:27 2013 +0200

    Add a test infrastructure for tag parsers

 .gitignore              |  6 ++++++
 Makefile.am             |  2 +-
 configure.ac            |  2 ++
 tests/Makefile.am       |  2 ++
 tests/ctags/Makefile.am | 15 +++++++++++++++
 tests/ctags/runner.sh   | 25 +++++++++++++++++++++++++
 6 files changed, 51 insertions(+), 1 deletion(-)

commit fa0f92def2bf584ed1f6ae836e509f38324f8b6c
Author: elextr <elextr@gmail.com>
Date:   Sun Jun 23 17:31:20 2013 +1000

    Prevent C++ static_assert from stopping parsing
    
    For some conditions static_assert was stopping further parsing.
    For example:
    static_assert(a<1,"too small");
    would stop all further parsing.  Now static_assert is recognised
    and content of the parens is ignored.

 tagmanager/ctags/c.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 79db59d0190be414a9d379bdd7c01b127d3a85d4
Author: Matthew Brush <matt@geany.org>
Date:   Sat Jun 15 12:45:45 2013 -0700

    Add API docs for search_show_find_in_files_dialog()
    
    This function is used in File Browser plugin and in Tree Browser,
    GProject, and GeanyPrj plugins from Geany-Plugins.

 src/search.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit c1b511d942aafbdecfddae54f8e16a8498d86987
Merge: 13ec6ff ce3cfa2
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 10 00:27:14 2013 -0700

    Merge pull request #144 from krofna/patch-1
    
    break is keyword in pascal

commit 13ec6ffbea8155f563a8a6b5a86a5b674684697a
Author: Matthew Brush <matt@geany.org>
Date:   Sun Jun 9 15:16:54 2013 -0700

    Add new API function plugin_builder_connect_signals()

 plugins/geanyfunctions.h |  2 ++
 src/plugindata.h         |  3 +-
 src/plugins.c            |  3 +-
 src/pluginutils.c        | 82 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/pluginutils.h        |  3 ++
 5 files changed, 91 insertions(+), 2 deletions(-)

commit ce3cfa25da6b3763808f5bc77460260dcbf09cfa
Author: Mislav Blažević <krofnica996@gmail.com>
Date:   Sun Jun 9 21:52:13 2013 +0300

    break is keyword in pascal

 data/filetypes.pascal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e949ff8872ca87c9626299ab04260177bad84057
Author: Ilario Pierbattista <ulven101@gmail.com>
Date:   Sat Jun 8 15:46:53 2013 +0300

    Add "strictfp" Java keyword
    
    Closes #936.

 data/filetypes.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b7fbb78ca7bf89709bc5bd43d4b373eb646470d5
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Fri Jun 7 21:27:09 2013 +0300

    import cxx_compiler to enable C++ compiler detection change

 wscript | 1 +
 1 file changed, 1 insertion(+)

commit 8c10f6a90dc4f5dae68b412634567d32645b5792
Author: Braden Walters <vc@braden-walters.info>
Date:   Sat Mar 16 00:48:53 2013 -0400

    Parse Java annotations with parameters
    
    Closes #924.

 tagmanager/ctags/c.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit bc926a3ff02ae1085244d1fc57f0eca2bbbd7dcc
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Fri Jun 7 11:04:00 2013 +0200

    Update of Italian translation

 po/it.po | 3662 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1913 insertions(+), 1749 deletions(-)

commit 42c00f2f508b40c33b838e3cd8b694c1f5abf188
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Thu Jun 6 20:19:15 2013 +0300

    sync C++ compiler detection under Windows with the C compiler detection

 wscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0af6130fea95937c8c79eadde0d0565d0d8deef2
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Jun 6 20:59:01 2013 +0200

    Update of Swedish translation

 po/sv.po | 56 +++++++++++++++++++++-----------------------------------
 1 file changed, 21 insertions(+), 35 deletions(-)

commit 8498957cf1ce9f056ce200079661cb83a628e358
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 6 16:31:26 2013 +0200

    Update Scintilla to version 3.3.3

 NEWS                              |   3 +
 scintilla/gtk/PlatGTK.cxx         |   6 +-
 scintilla/gtk/ScintillaGTK.cxx    |  70 ++++++++++++----------
 scintilla/include/Platform.h      |  20 +++----
 scintilla/include/SciLexer.h      |  20 +++++++
 scintilla/include/Scintilla.iface |  22 +++++++
 scintilla/lexers/LexCPP.cxx       |   4 +-
 scintilla/lexlib/Accessor.cxx     |   2 +-
 scintilla/lexlib/Accessor.h       |   2 +-
 scintilla/lexlib/LexAccessor.h    |  12 ++--
 scintilla/lexlib/OptionSet.h      |   6 +-
 scintilla/lexlib/StyleContext.h   |   2 +-
 scintilla/scintilla_changes.patch |   5 +-
 scintilla/src/CallTip.cxx         |   2 +-
 scintilla/src/CallTip.h           |   2 +-
 scintilla/src/CellBuffer.cxx      |   6 +-
 scintilla/src/CellBuffer.h        |   6 +-
 scintilla/src/Decoration.cxx      |   4 +-
 scintilla/src/Decoration.h        |   4 +-
 scintilla/src/Document.cxx        |  30 +++++-----
 scintilla/src/Document.h          |  64 ++++++++++----------
 scintilla/src/Editor.cxx          | 121 ++++++++++++++++----------------------
 scintilla/src/Editor.h            |  75 ++++++++++++-----------
 scintilla/src/KeyMap.cxx          |   2 +-
 scintilla/src/KeyMap.h            |   2 +-
 scintilla/src/PerLine.cxx         |   6 +-
 scintilla/src/PerLine.h           |   6 +-
 scintilla/src/RESearch.h          |   2 +-
 scintilla/src/RunStyles.cxx       |   8 +--
 scintilla/src/RunStyles.h         |   8 +--
 scintilla/src/ScintillaBase.cxx   |   5 +-
 scintilla/src/ScintillaBase.h     |   4 +-
 scintilla/version.txt             |   2 +-
 33 files changed, 283 insertions(+), 250 deletions(-)

commit 6b406d04dca1913b93e3031ae8b19a66cef4e80c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jun 6 16:07:08 2013 +0200

    Add a note in the Scintilla update script to add files to the build system

 scripts/update-scintilla.sh | 2 ++
 1 file changed, 2 insertions(+)

commit 2fdcad6290d487d83d0135ada240db36c2368cbf
Author: elextr <elextr@gmail.com>
Date:   Thu Jun 6 13:10:06 2013 +1000

    Allow Javascript new operator to apply to any object constructor
    
    js.c only allowed keywords 'function' 'Function' or 'Object' after
    'new' but js syntax allows any constructor function:
    
    var name = new constructor_function( args );
    
    ie an identifier where js.c allowed only keywords.
    So changed js.c to allow any identifier as well as the keywords.

 tagmanager/ctags/js.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

commit 467639c7c9af73dfce32eb05ef0d1f673a4b333c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jun 5 20:34:10 2013 +0200

    Fix inclusion of some build files to the generated tarballs

 Makefile.am           | 1 +
 scintilla/Makefile.am | 1 +
 2 files changed, 2 insertions(+)

commit fe0280037d9b964e56c405b1efedbcea5cec762e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 2 22:42:47 2013 +0200

    Indentation width detection: try not to get fooled by comments
    
    C-style multiline comments, used among others in C, C++ and Java, are
    often continued on next lines with an additional space followed by an
    asterisk:
    
      1.    /* first comment line
      2.     * continuation line (asterisk is aligned with previous line)
      3.     * last line */
    
    This fools the indentation with detection because lines 2 and 3 from
    the above example have an extra space in what is considered being the
    line indentation.  In this example, the algorithm would detect an
    indentation width of 5 rather than 4, because here most lines have an
    indent of 5 -- although they actually have an indent of 4 plus a space
    for alignment.  This is not a problem in most situations because there
    generally are fewer comment continuation lines than actual code lines
    which have a indent multiple of the actual indent width, but with some
    code with a lot of comments (e.g. short functions with verbose
    documentation comments) this might start to fool the algorithm and
    give wrong, annoying, results.
    
    So, try to detect these continuation lines and avoid taking them into
    account.

 src/document.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 8afff838c1127067e621ec49652d715427d3e141
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 1 20:07:12 2013 +0200

    Improve scrolling to display a plugin's keybindings
    
    When scrolling the keybinding list to display a particular row, which
    is used to display a particular plugin's keybindings, consistently
    scroll so the row is on the top left.  This makes it easier to see the
    row in question since it's always at the same location, and it shows
    more child keybindings.

 src/prefs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d3b88fb5b14d4fc9b4de52cea02888308f7864f6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 1 01:56:31 2013 +0200

    Fix a leak searching for the keybinding group row

 src/prefs.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 44fcdf1b7ccb76de124253b8f77d3a5f0f4206e4
Author: Matthew Brush <matt@geany.org>
Date:   Sat May 25 17:02:49 2013 -0700

    Minor tweak to plugin manager button spacing

 src/plugins.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 169a2f49577457b2c1484fcf4e5ebf6c222547c0
Author: Pavel Roschin <roshin@scriptumplus.ru>
Date:   Sun May 19 20:00:01 2013 +0400

    Keybindings for plugins

 src/keybindings.c | 38 ++++++++++++++++++++++++++------------
 src/keybindings.h |  2 ++
 src/plugins.c     | 14 +++++++++++++-
 src/prefs.c       | 23 +++++++++++++++++++++++
 src/prefs.h       |  2 ++
 5 files changed, 66 insertions(+), 13 deletions(-)

commit 0dc9e4ec382e8057753c3debea4b4462e0a6944d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat May 25 17:48:49 2013 +0200

    Import fix from upstream Scintilla to fix crash upon DnD with GTK3
    
    This imports Scintilla commit e488315f2d30e1795f0899779bac948da41b4eef
    from HG, "Bug: [#1481]. Incorrect event copying on GTK+ 3.x."

 scintilla/gtk/ScintillaGTK.cxx | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

commit 6cff31488e2376e34d77c2fe5b2bc8875cab9096
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat May 25 17:45:07 2013 +0200

    Import fix from upstream Scintilla to fix crash on drag and drop
    
    This imports Scintilla commit 06f36a3217229ec2c2a360e370ae1b07597ce7b6
    from HG, "Fix crashes with SelectionText instances that did not have \0
    terminators."

 scintilla/gtk/ScintillaGTK.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 60f3800e0ca41ee8ea2c191e98181529d3bdd863
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 22 15:58:58 2013 +0200

    Small update of the French translation

 po/fr.po | 492 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 242 insertions(+), 250 deletions(-)

commit ca404a01d4ccc04d06a5533f0a797d7f25e81fff
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 22 15:14:31 2013 +0200

    Don't mark as translatable strings that are never visible
    
    In the file properties dialog there are a few label for which the
    default value is never visible to the user, and then don't need to be
    translated.  These strings are only useful to recognize and select the
    label in e.g. Glade UI.

 data/geany.glade | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 7a07323f8a2053b24dfb7fd0f28994967bfd9109
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Wed May 22 09:41:43 2013 +0200

    Update of German translation

 NEWS     |    2 +-
 po/de.po | 3062 +++++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 1657 insertions(+), 1407 deletions(-)

commit 572a0f808cb4c58a57a309cae9d47920c8366069
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Wed May 22 09:19:21 2013 +0200

    Updating NEWS-file a bit with recent changes done by frlan

 NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

commit b5c0ff0cbae2d91fc35e01bc901f8884b51839de
Author: Yosef Or Boczko <yosefor3@walla.com>
Date:   Wed May 22 09:48:51 2013 +0300

    Updated Hebrew translation
    
    for the commit "Use Glade to create the File Properties dialog"
    
    Signed-off-by: Frank Lanitz <flanitz@bgc-jena.mpg.de>

 po/he.po | 1219 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 629 insertions(+), 590 deletions(-)

commit 8f9f73e0efaea169d11bc000c8db72b5fb8c66f3
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Tue May 21 15:40:56 2013 +0200

    Adding comment (postgres) as a SQL-keyword.

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f6e9ac094a9e75ff3c2d30d8b60536f6b3e574ba
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 22 04:22:53 2013 +0200

    Remove use of some of our own deprecated Scintilla wrappers
    
    Remove most obvious calls to our very own deprecated Scintilla wrapper
    functions sci_get_text(), sci_get_text_range() and
    sci_get_selected_text().
    
    Some calls are still left, but they either really benefit from these
    functions or the fix would be more complex.

 src/callbacks.c | 14 ++++----------
 src/document.c  |  4 +---
 src/symbols.c   | 10 ++--------
 src/tools.c     |  8 +++-----
 src/vte.c       |  3 +--
 5 files changed, 11 insertions(+), 28 deletions(-)

commit 788a57f6fcf6bdb152847aedfaaf09aadc7cce43
Merge: 55fe6d8 4bac371
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 22 03:38:38 2013 +0200

    Merge branch 'scintilla-update'

commit 4bac3717eaaaa0ab4d915694ec9a47524c42372a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 22 03:33:46 2013 +0200

    Update for new Scintilla styles

 data/filetypes.c           |  1 +
 data/filetypes.haskell     |  4 ++++
 src/highlighting.c         |  5 ++++-
 src/highlightingmappings.h | 43 ++++++++++++++++++++++++-------------------
 4 files changed, 33 insertions(+), 20 deletions(-)

commit f5588043b7e6bbd9dff5ac37eb37b00a503d192a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 22 03:23:57 2013 +0200

    Update Scintilla to version 3.3.2

 scintilla/gtk/PlatGTK.cxx          |  122 ++---
 scintilla/gtk/ScintillaGTK.cxx     |  236 +++-----
 scintilla/include/SciLexer.h       |    9 +
 scintilla/include/Scintilla.h      |   13 +
 scintilla/include/Scintilla.iface  |   38 ++
 scintilla/lexers/LexCPP.cxx        |   15 +-
 scintilla/lexers/LexHaskell.cxx    | 1063 +++++++++++++++++++++++++++++-------
 scintilla/lexers/LexLaTeX.cxx      |    6 +-
 scintilla/lexers/LexOthers.cxx     |    4 +-
 scintilla/lexlib/LexerModule.cxx   |    2 +-
 scintilla/lexlib/PropSetSimple.cxx |   23 +-
 scintilla/lexlib/PropSetSimple.h   |    1 -
 scintilla/lexlib/StyleContext.h    |    4 +-
 scintilla/lexlib/WordList.cxx      |   51 +-
 scintilla/lexlib/WordList.h        |   12 +-
 scintilla/scintilla_changes.patch  |    3 +-
 scintilla/src/CallTip.cxx          |   22 +-
 scintilla/src/CallTip.h            |    2 +-
 scintilla/src/CellBuffer.cxx       |   24 +-
 scintilla/src/CellBuffer.h         |    4 +-
 scintilla/src/ContractionState.cxx |    2 +
 scintilla/src/Decoration.cxx       |    2 +
 scintilla/src/Document.cxx         |  228 +++-----
 scintilla/src/Document.h           |   25 +-
 scintilla/src/Editor.cxx           |  333 +++++++----
 scintilla/src/Editor.h             |   33 +-
 scintilla/src/Indicator.cxx        |    3 +
 scintilla/src/KeyMap.cxx           |   34 +-
 scintilla/src/KeyMap.h             |    4 +-
 scintilla/src/PerLine.cxx          |   21 +-
 scintilla/src/PerLine.h            |    2 -
 scintilla/src/PositionCache.cxx    |  114 ++--
 scintilla/src/PositionCache.h      |   15 +-
 scintilla/src/RESearch.cxx         |   75 +--
 scintilla/src/RESearch.h           |    5 +-
 scintilla/src/RunStyles.cxx        |   36 ++
 scintilla/src/RunStyles.h          |    2 +
 scintilla/src/Selection.cxx        |   12 +-
 scintilla/src/SplitVector.h        |    3 +-
 scintilla/src/Style.cxx            |   27 +-
 scintilla/src/Style.h              |    5 +-
 scintilla/src/ViewStyle.cxx        |  200 +++----
 scintilla/src/ViewStyle.h          |   31 +-
 scintilla/src/XPM.cxx              |  179 +-----
 scintilla/src/XPM.h                |   43 +-
 scintilla/version.txt              |    2 +-
 46 files changed, 1767 insertions(+), 1323 deletions(-)

commit 55fe6d8b6611d40d84ce0abca2921cd14182c63b
Author: Yosef Or Boczko <yosefor3@walla.com>
Date:   Tue May 21 00:52:37 2013 +0300

    Updated Hebrew translation
    
    Signed-off-by: Frank Lanitz <flanitz@bgc-jena.mpg.de>

 po/he.po | 985 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 502 insertions(+), 483 deletions(-)

commit 72c809f633c20ba4f552fa199defc9b0ddd8da09
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 20 04:08:31 2013 +0200

    Use Glade to create the File Properties dialog

 data/geany.glade | 605 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/dialogs.c    | 302 +++------------------------
 2 files changed, 638 insertions(+), 269 deletions(-)

commit 5608b29bd5e37993567b549f06d9a3586783c33e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 20 01:14:38 2013 +0200

    Small update of the French translation

 po/fr.po | 2959 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1600 insertions(+), 1359 deletions(-)

commit 2e9a1753d7b11e2f7acf630fe2a4895727130b72
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 20 01:47:25 2013 +0200

    Fix internationalization of the File Properties dialog title

 src/dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9652a34ef0d7df831d2636e499fea8ee91d83121
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun May 19 22:58:25 2013 +0200

    Add ellipsis to menu items requiring further user input
    
    This is a very common paradigm used by GNOME, KDE, MacOSX, Windows,
    etc., and following it makes our UI more consistent with these and
    easier to use by their users.
    
    https://developer.gnome.org/hig-book/stable/menus-design.html.en#menu-item-type-command
    
    Closes #3613494.

 data/geany.glade       | 66 +++++++++++++++++++++++++++++++++++---------------
 plugins/classbuilder.c |  6 ++---
 plugins/export.c       |  4 +--
 plugins/filebrowser.c  |  2 +-
 plugins/htmlchars.c    |  2 +-
 src/build.c            |  6 ++---
 src/sidebar.c          |  2 +-
 src/symbols.c          |  2 +-
 8 files changed, 59 insertions(+), 31 deletions(-)

commit 4807ba6ce5b669d0e3265631138c226a54ac04bf
Author: Adam Dingle <adam@yorba.org>
Date:   Sat May 18 12:01:47 2013 -0400

    file browser: Fix capitalization in menu item
    
    Closes #3613558.

 plugins/filebrowser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8916a8e09224fc9a12dc604305b6ab1c054f4bb0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun May 19 16:13:51 2013 +0200

    Merge NEWS from 1.23.1 release

 NEWS | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 9ebc082cfc239df5a2b44456a43fdd0663dec692
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Fri May 17 10:25:13 2013 +0200

    Adding owner and serial to list of keywords for SQL

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cd390c0d481a8d9032f8b5433dcfcdada91dfbd6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 15 18:25:08 2013 +0200

    Fix some widgets packing issues under GTK3 in the preference dialog

 data/geany.glade | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit c2d2fddca3854efd7ab6711a25f451a2b5cc596d
Author: elextr <elextr@gmail.com>
Date:   Wed May 15 14:03:08 2013 +1000

    Return a non-printing sequence for no context separators
    
    Function symbols_get_context_separator() returns the symbol
    separator for the language, but some languages do not have
    symbol context separators, for example markup languages like
    Asciidoc.  To prevent the symbols pane wrongly detecting and
    acting on a valid character sequence as a separator, return a
    non-printing character which should not occur.
    
    Options "" and NULL not used as they break some code and would
    need an ABI bump.
    
    Other languages can be added as they are identified.

 src/symbols.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 989a1f2ccb2f8768b575288d6e7535cb52ad1853
Author: elextr <elextr@gmail.com>
Date:   Sat May 11 11:42:16 2013 +1000

    Mark Geany.txt with filetype
    
    Since we have a reStructuredText filetype, mark doc file so it
    automatically opens with the right filetype.

 doc/geany.txt | 1 +
 1 file changed, 1 insertion(+)

commit deede0595eb63e9a27b6213477e0413e8b3c054f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri May 10 00:10:46 2013 +0200

    Fix notebook tab switching with keyboard if some pages are hidden
    
    When switching the current notebook tab, we need to take only visible
    pages into account.  If we don't and we try switching to an invisible
    page, nothing happens.
    
    In practice, the issue is visible on the message window notebook if one
    of the tabs are hidden due to one of the "msgwin_*_visible" settings.

 src/keybindings.c | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

commit a025b7c63f38b3458bb4615daabf823cc9f24df9
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Tue May 7 16:29:41 2013 +0200

    SQL: Adding elsif and raise to list of keywords

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 854eccf16d8c4cff76a6195a45c545bce470ca63
Merge: 1e10325 223b250
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu May 2 05:20:24 2013 -0700

    Merge pull request #127 from duncannz/master
    
    Added some missing SQL keywords

commit 1e1032505d16a26d018a66908bef54c8e899c4bb
Author: elextr <elextr@gmail.com>
Date:   Thu May 2 17:51:12 2013 +1000

    Make save actions use something bigger than a pointer for a buffer
    
    At commit 160e5e stamp was changed from a gchar[512] to a gchar*
    but the copy loop still used stamp and sizeof(stamp) as the buffer.
    Now gchar[512] buffer is used again.

 plugins/saveactions.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 5c37ca87f0a6fc612a083cfb74212970cd4f11c7
Author: elextr <elextr@gmail.com>
Date:   Tue Apr 30 14:07:22 2013 +1000

    Fix Asciidoc parser recognition of open block as underline
    
    Asciidoc overloads lines of dash (-) for heading underline and
    open block delimiting (--).  This made the parser recognise list
    continuation blocks as headings.  Now requires more than two
    underline characters for a heading.

 tagmanager/ctags/asciidoc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit dbddf0b4302f4436785b58386c4629c3e7c8c114
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Apr 28 19:22:45 2013 +0200

    Update of Hebrew translation

 po/he.po | 1929 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 962 insertions(+), 967 deletions(-)

commit d9ead8591a7782fbdacabacd9b97a5cf0dbeb269
Author: Matthew Brush <matt@geany.org>
Date:   Sat Apr 27 11:42:04 2013 -0700

    Make editor-related View menu items document-sensitive again
    
    They used to be because their parent menu item (Editor) was
    document-sensitive but now they are in the top of the View
    menu they need to be invdividually made so.
    
    TODO: should they really be/have been document-sensitive? They
    can still change the pref without a document open and their
    equivalent options in the Preferences dialog are not
    document-sensitive? Same goes for existing "Change Font" item.

 src/ui_utils.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit bb58d7cba452ed1d1ef62a259afb7918e7cf04fc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Apr 27 18:57:42 2013 +0200

    Python: remove duplicate keywords
    
    Remove False, None and True from "identifiers" since they already are
    in "primary".

 data/filetypes.python | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f3852dc13c01289e50c66989473b271424a7e4cc
Merge: 0f614dd 564ef98
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Apr 27 18:38:26 2013 +0200

    Merge branch 'scintilla-update'

commit 564ef98f9cd6bef30798f9688cd264f3387c445d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Apr 27 18:30:17 2013 +0200

    Update for new Scintilla styles

 data/filetypes.haskell     | 2 ++
 src/highlighting.c         | 5 +++++
 src/highlightingmappings.h | 4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)

commit e88c03d266e1b8d4279a76481d03c54a76fd961d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Apr 27 16:09:29 2013 +0200

    Update Scintilla to version 3.3.1

 scintilla/Makefile.am              |   1 +
 scintilla/gtk/PlatGTK.cxx          |  15 +-
 scintilla/gtk/ScintillaGTK.cxx     |  21 +-
 scintilla/include/ILexer.h         |  21 +-
 scintilla/include/Platform.h       |   8 +-
 scintilla/include/SciLexer.h       |   4 +
 scintilla/include/Scintilla.h      |  26 ++
 scintilla/include/Scintilla.iface  |  79 ++++++
 scintilla/lexers/LexCPP.cxx        | 162 ++++++++---
 scintilla/lexers/LexHTML.cxx       |  15 +-
 scintilla/lexers/LexHaskell.cxx    | 351 ++++++++++++++----------
 scintilla/lexers/LexLaTeX.cxx      | 539 +++++++++++++++++++++++++++++++++++++
 scintilla/lexers/LexMatlab.cxx     |  87 +++++-
 scintilla/lexers/LexOthers.cxx     | 301 +--------------------
 scintilla/lexers/LexPO.cxx         |  66 ++++-
 scintilla/lexers/LexRuby.cxx       |   2 +-
 scintilla/lexlib/LexAccessor.h     |  39 ++-
 scintilla/lexlib/LexerBase.cxx     |   2 +-
 scintilla/lexlib/LexerModule.cxx   |   4 +-
 scintilla/lexlib/StyleContext.h    | 117 ++++++--
 scintilla/lexlib/SubStyles.h       | 162 +++++++++++
 scintilla/makefile.win32           |   1 +
 scintilla/src/AutoComplete.cxx     | 119 +++++++-
 scintilla/src/AutoComplete.h       |   6 +
 scintilla/src/CellBuffer.cxx       | 114 +++++++-
 scintilla/src/CellBuffer.h         |   8 +
 scintilla/src/ContractionState.cxx |   2 +-
 scintilla/src/Document.cxx         |  58 +++-
 scintilla/src/Document.h           |  13 +-
 scintilla/src/Editor.cxx           | 387 ++++++++++++++++++--------
 scintilla/src/Editor.h             |  58 +++-
 scintilla/src/LineMarker.cxx       |   5 +-
 scintilla/src/PositionCache.h      |   4 +
 scintilla/src/RunStyles.h          |   2 +
 scintilla/src/ScintillaBase.cxx    | 140 ++++++++--
 scintilla/src/ScintillaBase.h      |   1 +
 scintilla/src/UniConversion.h      |  13 +
 scintilla/src/ViewStyle.cxx        |  34 ++-
 scintilla/src/ViewStyle.h          |  13 +-
 scintilla/version.txt              |   2 +-
 40 files changed, 2281 insertions(+), 721 deletions(-)

commit 2dd389a14af88c54fe581cda2aa669b15e091248
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Feb 13 15:39:50 2013 +0100

    Fix our Scintilla patch
    
    It got corrupted for some reason I don't get, but it's now fixed.

 scintilla/scintilla_changes.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0f614dd8857d6b5da1b362770de913b5b54a7d28
Author: Matthew Brush <matt@geany.org>
Date:   Fri Apr 26 23:56:16 2013 -0700

    Remove reference to removed "menu_view_editor1" (oops)

 src/ui_utils.c | 1 -
 1 file changed, 1 deletion(-)

commit 1ee35c68cdbef76d4a38bb7e52524c0cb175d1fe
Author: Matthew Brush <matt@geany.org>
Date:   Fri Apr 26 15:26:55 2013 -0700

    Flatten-out the View menu
    
    Rationale:
    ----------
    * Existing View menu already contained Editor-related options
      like "Change Font" and Zoom controls, so it makes sense to
      group all of the View-related items together.
    * Anecdotally, some users have been unable to easily discover
      the Color Schemes changer dialog because it was nested under
      a submenu.
    * Distinction between "Editor" (Scintilla) and "Editor" (All
      of Geany) is likely non-obvious to most users, especially
      new users exploring the menus.
    * There's not very many items to cause scrolling on low-res
      monitors, and the View menu still has less items than the
      Document menu.

 data/geany.glade | 164 +++++++++++++++++++++++++------------------------------
 1 file changed, 75 insertions(+), 89 deletions(-)

commit e0245df56854e07d395796fc3a0c07355381afa5
Author: Matthew Brush <matt@geany.org>
Date:   Fri Apr 26 14:55:48 2013 -0700

    Make "Create" button default for New Project dialog
    
    So it activates when you press the enter/return key in one of the
    entries.

 src/project.c | 5 +++++
 1 file changed, 5 insertions(+)

commit a3da0467d4808ec729667b866f13eda2e480d43e
Author: Atanas Beloborodov <arrtedone@gmail.com>
Date:   Thu Apr 25 10:55:45 2013 +0300

    Add version check around deprecated g_thread_init() call.
    
    g_thread_init has been deprecated since GLib version 2.32

 src/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 9edd4f4a907a213347003c525629c4476df733c2
Author: Enrico Troeger <enrico.troeger@uvena.de>
Date:   Wed Apr 24 22:05:56 2013 +0200

    For now disable detecion of MSVC on Windows

 wscript | 5 +++++
 1 file changed, 5 insertions(+)

commit 0d6101f0cafbfa1b8b5942f1a49e840551f0e9c8
Merge: ea87576 666f471
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Apr 24 12:45:19 2013 -0700

    Merge pull request #133 from gentoo90/waf
    
    Update waf to version 1.7.10 and fix wscript to fit new API

commit ea87576ee48412057a58caa576542534ad5fd3e4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 22 20:24:20 2013 +0200

    Remove use of global variables in custom commands code

 src/tools.c | 80 ++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 48 insertions(+), 32 deletions(-)

commit 5868c6991c74ce75991c73748b85fa83774141bc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 22 20:20:53 2013 +0200

    Fix leaks upon symbol list updating

 src/symbols.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

commit 776c77d6b68e35d762593c9513192871aebbb837
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Apr 20 15:48:14 2013 +0200

    Use GLib version of C99's snprintf()

 src/highlighting.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 659276730a4f94dd6072475878c5a7423bf01fae
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Apr 20 15:46:15 2013 +0200

    Don't use deprecated gtk_icon_set_render_icon() on GTK3

 src/ui_utils.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit e8443b19f7a6230c8a4f68058f8b1b0175325fc0
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Tue Apr 2 11:26:01 2013 +0400

    rewrite_reflow: Remove a check inside line breaking implementation that caused breaking to occur too early

 src/editor.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 7e732bddc8f9d37230fce81829de1de26b0cb46d
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Mon Mar 26 15:54:15 2012 +0400

    rewrite_reflow: Remove no longer used `sci_lines_split` function that wrapped SCI_LINESSPLIT

 src/sciwrappers.c | 6 ------
 src/sciwrappers.h | 1 -
 2 files changed, 7 deletions(-)

commit cc5e6d2a19e3ac434621d2d7ed867fd4caaff19b
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Mon Mar 26 15:51:44 2012 +0400

    rewrite_reflow: Reimplement `split_line` function to achieve consistency with the "Line breaking" option

 src/keybindings.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 6 deletions(-)

commit 40fb3aa64dba110b8c0d97676dc7c6045c465c3a
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Mon Mar 26 15:49:55 2012 +0400

    rewrite_reflow: Create `sci_get_position_from_col` function to wrap Scintilla's SCI_FINDCOLUMN command.

 src/editor.c      | 2 +-
 src/sciwrappers.c | 6 ++++++
 src/sciwrappers.h | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

commit 390646a412120375c63db41773950b0f32b68390
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Mon Mar 26 15:44:50 2012 +0400

    rewrite_reflow: Extract `split_line` function
    
    Extract `split_line` function from `reflow_lines` to reimplement it in
    the future without using SCI_SPLITLINES to achieve the
    behaviour consistent with the "Line breaking" option.

 src/keybindings.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

commit 57dca0230347c1b2df72168f2cc50a314cc5f498
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Apr 17 23:24:38 2013 +0200

    Documentation: Adding a short note about finding Geany at Windows inside application menu

 doc/geany.txt | 3 +++
 1 file changed, 3 insertions(+)

commit 971f147c087e7b6c2c15e95c4247dd73b7063d20
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Apr 17 23:16:06 2013 +0200

    Documentation: Replace some \t with space

 doc/geany.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit c986eeee99a103dfa90acd866cb46be6d5c95ed2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 17 17:07:47 2013 +0200

    PHP: show namespaces and traits in the symbol list

 src/symbols.c          | 2 ++
 tagmanager/ctags/php.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 8b3142ef4db44c48d48f60c44771b75edd74b576
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 17 17:07:18 2013 +0200

    PHP: use "::" as the scope separator

 src/symbols.c          | 1 +
 tagmanager/ctags/php.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 377f75f29164d22f08d484c9a696f2bcca1be0f6
Author: Frank Lanitz <flanitz@bgc-jena.mpg.de>
Date:   Tue Apr 16 13:05:43 2013 +0200

    Adding *.aux and *.bib as default (La)TeX file types

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 33c84f739db61e12ee8638e75e386db2b8b2480f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 11 20:13:29 2013 +0200

    PHP: parse traits
    
    http://www.php.net/manual/en/language.oop5.traits.php

 tagmanager/ctags/php.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

commit 77c45aa82b6e13e728887122beb7f1e1e272c700
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 11 19:40:22 2013 +0200

    PHP: support non-ASCII characters in identifiers
    
    http://www.php.net/manual/en/language.variables.basics.php

 tagmanager/ctags/php.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 38c561620046592111b421fb6332f3c37eb1f0a9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 11 19:34:27 2013 +0200

    PHP: leave PHP mode inside single line comments
    
    If "?>" appears in a single-line PHP comment it leaves PHP mode.
    http://www.php.net/manual/en/language.basic-syntax.comments.php

 tagmanager/ctags/php.c | 49 +++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

commit 387d6e190993dd034b977b5c3c87da926a17b5d2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 11 02:58:27 2013 +0200

    PHP: don't include the leading "$" in variable names

 tagmanager/ctags/php.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

commit b5cd5343fa1b3aaedf60a110ca4c0850a5e68d0e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 10 22:48:39 2013 +0200

    PHP: fix parsing functions arguments list containing comment or strings
    
    Instead of hand-parsing the argument list and possibly choking inside
    comments, strings, heredoc, etc., use the normal token mechanism and
    simply convert the tokens to a string representation as the argument
    list.  This technique might perhaps lead to some missing characters in
    the argument list representation in the (unlikely) case a token
    appearing in the argument list is reported as a generic type for which
    it is impossible to know the correct string representation, but this
    could always be fixed by adding a specific token type and is anyway
    less problematic than maybe breaking further parsing of the document.

 tagmanager/ctags/php.c | 61 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 10 deletions(-)

commit 444745f71ef72d973094df036c1ad0d50003c7ee
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 15 19:16:55 2013 +0200

    Added new macro for reading last character of vString.
    
    Import of CTags revision 719.

 tagmanager/ctags/vstring.h | 1 +
 1 file changed, 1 insertion(+)

commit 8086129c9c26c49700798bdb27da85b75cc1ca49
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 10 19:27:21 2013 +0200

    PHP: parse namespaces
    
    PHP namespaces don't work anything like a block, so the implementation
    is specific and not combined with scope management.  Namespaces cannot
    be nested, and they may apply either to the rest of the file (until the
    next namespace declaration, if any) or to a specific block.
    
    Namespaces applying to the rest of the file:
    
    	namespace Foo;
    	/* code in namespace Foo */
    	namespace Bar\Baz;
    	/* code in namespace Bar\Baz */
    
    Namespaces applying to blocks:
    
    	namespace Foo {
    		/* code in namespace Foo */
    	}
    	namespace Bar\Baz {
    		/* code in namespace Bar\Baz */
    	}
    	namespace {
    		/* code in root namespace */
    	}

 tagmanager/ctags/php.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 96 insertions(+), 5 deletions(-)

commit c2e4111aaf9a7bc2833568fa7248833f201c7c8b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Apr 10 18:54:11 2013 +0200

    PHP: parse HereDoc and NowDoc strings

 tagmanager/ctags/php.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)

commit 258c4fa65d7dc154e0da0c8b29eaf874af4f166e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 9 23:07:14 2013 +0200

    PHP: generate tags for local variables (disabled by default)

 tagmanager/ctags/php.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 1c3fd55818e55e35e214ef0feb043e3782c155f5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 9 22:57:07 2013 +0200

    PHP: fix generating variable tags for rvalues
    
    Only generate tags for variable declarations without assignments inside
    classes and interfaces not to get fooled by rvalues.
    
    This prevents generation of a "$bar" tag for something like:
    
    	$foo = $bar;
    
    while still generating "$bar" tag for:
    
    	class Foo {
    		var $bar;
    	}

 tagmanager/ctags/php.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit af47ccf98dbdb9b960cc5c3389423b9d6f9cfbe5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 9 20:33:33 2013 +0200

    PHP: report anonymous functions as functions rather than variables
    
    Generate a full function tag for anonymous functions:
    
    	$anon = function($arg1, $arg2) {
    		/* ... */
    	};

 tagmanager/ctags/php.c | 50 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 13 deletions(-)

commit 5798f47ea0436a03903140829b118aaed2d1ae0b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 9 20:30:57 2013 +0200

    PHP: make some arguments const

 tagmanager/ctags/php.c | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

commit bdb98f0132af9b50e73a920d4856fe1f821fd185
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 9 19:41:50 2013 +0200

    PHP: fix parsing of functions returning a reference
    
    Fix parsing of functions declarations with a leading ampersand (&),
    used to make the function return a reference:
    
    	function &foo($arg1, $arg2) {
    		/* ... */
    	}

 tagmanager/ctags/php.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit d283eb243cba5c83c2762d01aa025f357d7d2ad1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 9 19:18:02 2013 +0200

    PHP: parse and report interfaces

 tagmanager/ctags/php.c | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

commit 23339dd509947f8e4322793580943607d4a77fc4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 9 19:05:31 2013 +0200

    PHP: report class inheritance

 tagmanager/ctags/php.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

commit f5d315809d0f219ad0e1770e0601b8c64f552ac6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 9 17:39:57 2013 +0200

    PHP: report visibility and implementation type
    
    Report visibility (private/protected/public) and implementation
    (abstract or not) for every tag for which it makes sense.

 tagmanager/ctags/php.c | 114 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 103 insertions(+), 11 deletions(-)

commit be07870e975525fc94b8ff42a3b53de696ff5893
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Apr 6 01:25:45 2013 +0200

    Rewrite the PHP parser as a non-regex parser
    
    Rewrite the PHP parser as a real parser, not using regexes.  This is
    more complex but allows for better parsing.
    
    Visible changes:
    * Scope reporting;
    * Variables inside functions are no longer reported (this is a
      deliberate choice, but can be easily changed);
    * Only the PHP part is parsed (e.g. it doesn't report JavaScript
      functions anymore);
    * Function arguments spanning several lines are properly reported;
    * Interfaces are not yet parsed.
    
    Otherwise the new parser should behave like the old one, at least
    where it used to be right.  Parsing of more constructs and reporting
    more details is planned.

 tagmanager/ctags/php.c | 958 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 770 insertions(+), 188 deletions(-)

commit 4e03e466e738fac4fc3930e78d650263a905fece
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 14 18:57:37 2013 -0700

    Improve Statusbar Template documentation
    
    Mainly listing the available placeholders instead of pointing the
    poor user deep into Geany's code.

 doc/geany.html | 807 +++++++++++++++++++++++++++++++--------------------------
 doc/geany.txt  |  89 ++++---
 2 files changed, 499 insertions(+), 397 deletions(-)

commit d452d0b737dd38843b887542b04a806e1bdcb56e
Author: Matthew Brush <matt@geany.org>
Date:   Sun Apr 14 17:08:09 2013 -0700

    Cleanup statusbar template code a bit
    
    * Unhardcode "pos" and "style" statusbar messages which were only
    enabled when GEANY_DEBUG is defined and make them real possible
    format chars.
    
    * Move needless global "statusbar_template" into UIPrefs structure
    with the other UI preferences, removing (now) pointless ui_finalize()
    function.
    
    * Rename "add_statusbar_statistics" to "create_statusbar_statistics"
    and make it return a gchar* instead of passing in a GString argument
    to update. Fixes a one-time "leak" of the GString and makes the code a
    little easier to follow.
    
    * Move the default statusbar template string to the top of the file
    and use it as the default for the various preferences so the user has
    something to base their customizations off of. TODO: check that the
    N_() translations stuff works OK.

 src/main.c     |  1 -
 src/ui_utils.c | 67 ++++++++++++++++++++++++++++++----------------------------
 src/ui_utils.h |  3 +--
 3 files changed, 36 insertions(+), 35 deletions(-)

commit 666f471c785c4cf33f5980d74854d7abfa408be1
Author: Igor Shaula <gentoo90@gmail.com>
Date:   Sun Apr 14 15:02:36 2013 +0300

    Update waf to version 1.7.10 and fix wscript to fit new API

 .gitignore                    |   1 +
 data/filetype_extensions.conf |   2 +-
 waf                           | Bin 76329 -> 90923 bytes
 wscript                       |  37 +++++++++++++++++++------------------
 4 files changed, 21 insertions(+), 19 deletions(-)

commit 029d78536cb2bb8c56abf53e9b261610e4d13ffe
Author: Enrico Troeger <enrico.troeger@uvena.de>
Date:   Sun Apr 14 13:22:41 2013 +0200

    Don't try to set std_out and std_err if they are NULL

 src/win32.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 5412a244ba903624053cdaf7393732bc3af689ea
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Apr 12 18:07:30 2013 +0200

    Fix crash with bulk pattern replacements (introduced with c83a93e)
    
    "regex_match_text" and "regex_matches" being globals, performing
    several searches and then the replacements separately lead to them
    having unexpected values, resulting in incorrect behavior and crash.
    
    Fix this by removing the globals and instead make the search functions
    return match details.  Not only this fixes the issue, but also make the
    code a lot more maintainable by not having globals introducing side
    effects (proof of them being an issue is that c83a93e inadvertently
    broke things bad).

 src/document.c |  26 +++++----
 src/document.h |   4 +-
 src/search.c   | 182 ++++++++++++++++++++++++++++++++++++---------------------
 src/search.h   |  27 +++++++--
 4 files changed, 157 insertions(+), 82 deletions(-)

commit 920969ebb1858aaaa2ff22573eae6c25a510b95f
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Apr 11 20:19:04 2013 +0200

    Update of Lithuanian translation

 po/lt.po | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

commit d453fe33fe4139a7d90682cc60ac067ddc222b14
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 1 00:21:49 2013 +0200

    Add support for loading Vi and CTags tag files
    
    This allows to load tag files in the CTags format, which is compatible
    with Vi format.
    
    References:
     * http://ctags.sourceforge.net/FORMAT
     * http://ctags.sourceforge.net/ctags.html#TAG%20FILE%20FORMAT

 doc/geany.txt                 |  23 +++--
 tagmanager/src/tm_tag.c       | 226 +++++++++++++++++++++++++++++++++++-------
 tagmanager/src/tm_tag.h       |  13 ++-
 tagmanager/src/tm_workspace.c |  21 ++--
 4 files changed, 233 insertions(+), 50 deletions(-)

commit 223b2507f2e0cd2d13bab6d75e0bc73337307584
Author: Duncan de Wet <duncandewet@gmail.com>
Date:   Fri Mar 29 18:38:33 2013 +1300

    Added some more SQL keywords

 data/filetypes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 99d06abea8254d72b4817588578f7702d826f3c7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Mar 25 15:54:12 2013 +0000

    Use widget parameter in on_find_usage() for consistency

 src/symbols.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 4fcce9cc003816b78d6d3ad21edecd8e4961536e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Mar 25 15:41:52 2013 +0000

    Add symbol list Find in Files popup menu item

 src/search.c  | 22 ++++++++++++++++------
 src/search.h  |  2 ++
 src/symbols.c | 12 +++++++++++-
 3 files changed, 29 insertions(+), 7 deletions(-)

commit 2da51eb8299d14bc9e0c762b332edd849ceb325d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Mar 17 16:51:22 2013 +0000

    Note: Find Usage can be used from the symbol list popup menu

 doc/geany.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 235b8613fb8fabf16b9bc3a8fe5b26b98a26eb80
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 24 18:47:55 2013 +0100

    Use GSlice to allocate find_range() elements

 src/search.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 2c11c3c5e7fd3574e71489e007e38b622417036a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 24 18:34:29 2013 +0100

    Fix cursor position and selection after comment toggling
    
    Fix the selection start position after uncommenting if it was inside
    the comment marker;  and fix the selection end position if it was in
    the indentation or before or inside the comment marker.
    
    Improved fix for #3576431.

 src/editor.c | 43 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

commit 4f78efc9f117ce7d91f13c0c8841eea2df87136f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Dec 26 19:14:48 2012 +0100

    Unify algorithm for searching all matches inside a range
    
    Instead of re-implementing the search-all algorithm everywhere it is
    needed, move it to a re-usable function.  This is useful because some
    care is required to avoid improper rematches and endless loop, so
    avoiding duplication is important (especially if something has to be
    fixed someday).

 src/search.c | 108 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 61 insertions(+), 47 deletions(-)

commit c83a93eb65ea102ebe1f577593a3d9a9c4152aaf
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 24 03:20:17 2012 +0100

    Fix search/replace for the replacement not to change search results
    
    Fix the search & replace algorithm to make sure a replacement won't
    possibly affect the next one (e.g. in case of lookahead and lookbehind
    regular expressions).
    
    To do so, first find all occurrences and only then perform replacements,
    instead of doing both together.
    
    This fixes searching/replacing of any pattern that may be affected by
    its replacement (e.g. patterns that look for something not a character
    in the match range), including:
    
     * Start/end of line:
       Before this change, searching with regular expression "^A" and
       replacing with an empty string on the input "AA" would have resulted
       in an empty output ("^A" matching again after removing the first
       one).  Now it properly only removes the leading "A".
     * Lookahead/lookbehind:
       Pattern "(?<=a)b" with empty replacement and input "abb" would have
       resulted in the output "a" instead of "ab".
     * And more generally, many patterns matching non-characters like
       positions or out-of-match characters.

 src/search.c | 74 ++++++++++++++++++++++++++++--------------------------------
 1 file changed, 34 insertions(+), 40 deletions(-)

commit 01916596638a0bfef54386d2e24fc762ff7217c9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 24 15:38:30 2013 +0100

    Fix swapped tooltips between "run in VTE"/"skip run script"

 data/geany.glade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e18d75b23b33def5cef4ea35ba495e5544cd2c87
Author: Lex <elextr@gmail.com>
Date:   Sat Mar 23 11:58:45 2013 +1100

    Change signal used to kill executions to SIGTERM
    
    The originally used SIGQUIT has problems:
    1) see the deleted comment
    2) some xterm alternatives ignore it, so they don't stop
    
    Changed to SIGTERM which is the canonical "terminate" signal.
    
    Removed associated unneeded ignore of SIGQUIT.

 src/build.c | 5 +----
 src/main.c  | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

commit 0d84e129bdb96cb3c7b3c8756264f791efe71425
Author: Lex <elextr@gmail.com>
Date:   Sat Mar 23 11:48:09 2013 +1100

    Add to description of "Newline strips trailing spaces"
    
    Add description of interaction between this action and indentation
    since it is not obvious.

 doc/geany.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit b1fb2ab053acb084483630c31d6f88621000c563
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Mar 20 23:13:40 2013 +0100

    Fix various line length computation issues for the last line
    
    The last line doesn't have EOL characters, so computing
    (line_length() - eol_length()) is wrong on the last line.
    
    Instead, use (line_end_pos() - line_start_pos()) as suggests
    Scintilla's documentation.
    
    Closes PR#124

 src/editor.c | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

commit 2cdfeed69e8f7d3ace144df6b3bf2eee00103b93
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Mar 20 21:20:09 2013 +0100

    Adding hint for installation via sudo to documentation

 doc/geany.txt | 4 ++++
 1 file changed, 4 insertions(+)

commit 57940e67a30238eaeba85714fcba7750663e7d75
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Mar 16 18:08:51 2013 +0100

    Windows: use absolute path to the icons directory

 src/main.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 68f3a9fe5a73fa3c98a62e56d5e96307ee9e8b71
Author: Igor Shaula <gentoo90@gmail.com>
Date:   Sat Mar 2 09:53:25 2013 +0200

    Filetypes: Add some Ruby file extensions

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b7485c19259fe90b5c2c9ed2245ab3d65af34682
Merge: de03636 9d41270
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 19 14:57:51 2013 +0100

    Merge "Improve GTK compatibility macros for GTK 2.16" from eht16/master

commit 9d412702e8c26e3ce7cc16445d292be003eb3a5f
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue Mar 19 14:43:12 2013 +0100

    Make the compat_widget_set_flag macro more robust

 src/gtkcompat.h | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit de03636e5cf83f8dd3de5570d1e1f3ec965ba753
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue Mar 19 14:27:31 2013 +0100

    Add a note to update http://download.geany.org/MD5SUMS

 doc/making-a-release | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit d9c7f59b4187d3b24deae12865fafb5841029b36
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue Mar 19 14:17:25 2013 +0100

    Improve GTK compatibility macros for GTK 2.16
    
    On GTK 2.16 GTK_WIDGET_[UN]SET_FLAGS resolves to a do-while construct which
    raises a syntax error when embedded into a ? operator.
    Also gtk_widget_get_visible() is only available since GTK 2.18, so add a fallback to
    the old variant.

 src/gtkcompat.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 3291c30de570cc49a60fb270c952199a8acbc63d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 17 19:36:17 2013 +0100

    Fix utils_parse_and_format_build_date()

 src/utils.c | 3 +++
 1 file changed, 3 insertions(+)

commit 11acb599806eb5fe1a4c607ec9d05f4952988da9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 17 17:30:07 2013 +0100

    Add code for TMTag reference debugging
    
    This code is disabled by default, and is enabled if the DEBUG_TAG_REFS
    C preprocessor macro is defined.

 tagmanager/src/tm_tag.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

commit e409b70fab4f01a5e35db06d1ba6aa8ecd97b230
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 17 17:28:46 2013 +0100

    Fix various TMTag leaks

 src/document.c | 3 +++
 src/symbols.c  | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

commit fbce36418256cacee6d52e535e8ee41bfc76db39
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Mar 17 17:16:32 2013 +0100

    Improve build date conversion code
    
    Don't use strptime() as it is not very portable, instead use a GDate and use the
    code also for the date output in --version.

 src/about.c | 10 ++++------
 src/main.c  |  5 ++++-
 src/utils.c | 31 +++++++++++++++++++++++++++++++
 src/utils.h |  4 ++++
 4 files changed, 43 insertions(+), 7 deletions(-)

commit d270e6c69082d114901af23b756a3375a5b5ce23
Author: Christian Dywan <christian@twotoasts.de>
Date:   Sun Mar 17 10:52:50 2013 +0100

    Parse compiler provided build date to use the translatable date format string

 src/about.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 1db4cd90dfe89324e7c09e2284705a5d2725964d
Author: Christian Dywan <christian@twotoasts.de>
Date:   Sun Mar 17 10:46:32 2013 +0100

    Drop obsolete 'has_separator' property from the interface definitions

 data/geany.glade | 2 --
 1 file changed, 2 deletions(-)

commit a982908bec0c2ed9d5d846af205aafd497777d09
Author: Christian Dywan <christian@twotoasts.de>
Date:   Sun Mar 17 10:37:27 2013 +0100

    Define default template date format strings globally and make them translatable

 src/keyfile.c   | 6 +++---
 src/templates.h | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

commit 7150c63f224e7fdcd74870dee13a659c4472553b
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Mar 17 13:26:28 2013 +0000

    Add Find Usage popup menu items for symbol list tags (#3608278)

 src/symbols.c | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

commit 058bbc53681b24429ff16f79038e2283de480eea
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Mar 16 16:49:53 2013 +0100

    Update NEWS

 NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

commit 232290aad4be81cd67a309e5f28f867ad69a3fd4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 15 15:54:00 2013 +0100

    Fix our custom styles under KDE and for people using gtk-chtheme
    
    We have a custom RC file defining various styles we need, and we want
    the user to be able to override them (e.g. if they want -- or need --
    other colors).  Fair enough, one would simply call gtk_rc_parse() with
    the appropriate filename.  However, the styling rules applies in the
    order they are loaded, then if we load our styles after GTK has loaded
    the user's ones we'd override them.
    
    There are 2 solutions to fix this:
    1) set our styles' priority to something with lower than "user"
       (actually "theme" priority because rules precedence are first
       calculated depending on the priority no matter of how precise the
       rules is, so we need to override the theme).
    2) prepend our custom style to GTK's list while keeping priority to
       user (which is the default), so it gets loaded before real user's
       ones and so gets overridden by them.
    
    One would normally go for 1 because it's ways simpler and requires less
    code: you just have to add the priorities to your styles, which is a
    matter of adding a few ":theme" in the RC file.  However, KDE being a
    bitch it doesn't set the gtk-theme-name but rather directly includes
    the style to use in a user gtkrc file, which makes the theme have
    "user" priority, hence overriding our styles.  So, we cannot set
    priorities in the RC file if we want to support running under KDE,
    which pretty much leave us with no choice but to go with solution 2,
    which unfortunately requires writing ugly code since GTK don't have a
    gtk_rc_prepend_default_file() function.  Thank you very much KDE.
    
    Though, as a side benefit it also makes the code work with people using
    gtk-chtheme, which also found it funny to include the theme in the user
    RC file.

 data/geany.gtkrc | 14 +++++++-------
 src/main.c       | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/ui_utils.c   |  5 +----
 3 files changed, 57 insertions(+), 11 deletions(-)

commit 0cf495a6db90b068c2ec77404e863eef097fea66
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Mar 15 16:13:12 2013 +0000

    Add Rust filetype
    
    (See also: rust-lang.org)

 data/filetype_extensions.conf |  3 ++-
 data/filetypes.Rust.conf      | 61 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

commit fd8ba60b4a301fa22be7f95ce576ef5f615a4db6
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sat Mar 16 13:44:33 2013 +0000

    Disable start of word checkbox when whole word checkbox is enabled

 src/search.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 14878850cdf93b59044afb32a3d7537dd898a8bb
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Mar 15 18:30:42 2013 +0000

    Don't find start of word when whole word matching should prevent it

 src/search.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit feb4a6409ed09a913882c2a6f974ca1cba40979f
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Mar 15 17:24:51 2013 +0000

    Remove unused variables

 src/win32.c | 2 --
 1 file changed, 2 deletions(-)

commit 71093fec6292a73cc91cb8be795d7adb5a4f87ca
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 15 02:49:17 2013 +0100

    Autotools: replace use of deprecated INCLUDES in favor to AM_CPPFLAGS

 scintilla/Makefile.am | 2 +-
 src/Makefile.am       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 3a2853c08f40b2ab09ce8bb6de2408a00a1ec248
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 15 02:48:27 2013 +0100

    Add a  few more things to remember when making a release

 doc/making-a-release | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 0c5442b6253a9441f563de5046b6bcb1300e354f
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Mon Mar 11 19:54:28 2013 +0100

    More GTK3 Waf build system adjustments
    
    Install the src/gtkcompat.h header and install data/geany.css if necessary.

 wscript | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit 84176f2e8a0745526bd7344facff4944ed5d445d
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Mar 10 18:21:05 2013 +0100

    Add --enable-gtk3 configure flag to the Waf build system

 wscript | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

commit 35cc441b74dc8103144d09c429f5da5c11770680
Merge: 7e3a235 e0104a4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 10 17:20:25 2013 +0100

    Merge branch 'gtk3-support'
    
    Conflicts:
    	src/ui_utils.c

commit 7e3a235436729313d63c8e118c61eed626be1fb1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 10 17:00:01 2013 +0100

    Post release version bump
    
    Say welcome to Geany 1.24 "Sakai"!

 NEWS                 | 3 +++
 configure.ac         | 2 +-
 doc/geany.txt        | 2 +-
 doc/making-a-release | 4 ++--
 geany.exe.manifest   | 2 +-
 geany.nsi            | 4 ++--
 geany_private.rc     | 4 ++--
 src/geany.h          | 2 +-
 win32-config.h       | 2 +-
 wscript              | 2 +-
 10 files changed, 15 insertions(+), 12 deletions(-)

commit ee1cd3a3e41a01f83bdd17f80d7cf21c213fb4a4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 10 15:24:47 2013 +0100

    Fix various typos and wordings in the NEWS
    
    Also remove a duplicated item.

 NEWS | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit 44e0b8ee902e2a8a1bf908af59a97f5e4457b7ae
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 10 14:57:04 2013 +0100

    Update documentation images

 doc/images/build_menu_commands_dialog.png      | Bin 38736 -> 53471 bytes
 doc/images/find_dialog.png                     | Bin 13437 -> 17199 bytes
 doc/images/find_in_files_dialog.png            | Bin 21522 -> 25211 bytes
 doc/images/main_window.png                     | Bin 79859 -> 73968 bytes
 doc/images/pref_dialog_edit_completions.png    | Bin 32267 -> 54063 bytes
 doc/images/pref_dialog_edit_display.png        | Bin 28532 -> 47272 bytes
 doc/images/pref_dialog_edit_features.png       | Bin 24576 -> 38688 bytes
 doc/images/pref_dialog_edit_indentation.png    | Bin 28526 -> 40477 bytes
 doc/images/pref_dialog_files.png               | Bin 33684 -> 49600 bytes
 doc/images/pref_dialog_gen_misc.png            | Bin 26360 -> 42951 bytes
 doc/images/pref_dialog_gen_startup.png         | Bin 30596 -> 42976 bytes
 doc/images/pref_dialog_interface_interface.png | Bin 26399 -> 42346 bytes
 doc/images/pref_dialog_interface_notebook.png  | Bin 26334 -> 41551 bytes
 doc/images/pref_dialog_interface_toolbar.png   | Bin 26575 -> 38006 bytes
 doc/images/pref_dialog_keys.png                | Bin 35278 -> 46262 bytes
 doc/images/pref_dialog_printing.png            | Bin 25137 -> 35005 bytes
 doc/images/pref_dialog_templ.png               | Bin 28827 -> 41548 bytes
 doc/images/pref_dialog_tools.png               | Bin 26815 -> 36754 bytes
 doc/images/pref_dialog_various.png             | Bin 34526 -> 47404 bytes
 doc/images/pref_dialog_vte.png                 | Bin 32067 -> 45780 bytes
 doc/images/replace_dialog.png                  | Bin 16726 -> 21677 bytes
 21 files changed, 0 insertions(+), 0 deletions(-)

commit 5456fa3df978d242ddd81d96201172fd6324ef5e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 10 13:46:19 2013 +0100

    Regenerated the HTML manual

 doc/geany.html | 70 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 30 deletions(-)

commit c917f126678dc26a9afcee444905c52cb8488bfd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 10 13:42:24 2013 +0100

    Set release date

 NEWS           | 2 +-
 doc/geany.1.in | 2 +-
 doc/geany.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 6ec0d98e0ad0c7ae515801f6db6d34fb28177ee3
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Mar 10 15:08:46 2013 +0100

    Update NEWS for UAC fix

 NEWS | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 1613f93ad0adbb32faf77172930f981cff4ff8a5
Author: Igor Shaula <gentoo90@gmail.com>
Date:   Mon Feb 18 20:24:15 2013 +0200

    Disable UAC Virtualization on Windows
    
    Includes an application manifest embedded into the .exe resources.

 geany.exe.manifest | 18 ++++++++++++++++++
 geany_private.rc   |  2 ++
 2 files changed, 20 insertions(+)

commit 51c541faa223b5a8cab3eddc0bee49172b85ca2d
Author: tomboy64 <tomboy64@sina.cn>
Date:   Thu Feb 21 06:14:31 2013 +0100

    Add support for the Go programming language
    
    - syntax highlighting
    - support for the go compiler (as opposed to gccgo)

 NEWS                          |  1 +
 data/filetype_extensions.conf |  3 ++-
 data/filetypes.Go.conf        | 54 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

commit d5440c141f9acaa38dff42b12ae1a20f6c23cac8
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Mar 10 09:37:13 2013 +0100

    Another update of Hebrew translation.

 po/he.po | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit c317a93857a6904ad11dba87d7138871a8584314
Author: YosefOr <yosefor3@walla.com>
Date:   Sat Mar 9 20:39:15 2013 +0200

    Small improvement of Hebrew translation

 po/he.po | 2688 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1346 insertions(+), 1342 deletions(-)

commit b2b413470648854320a05954a8581a49c622d0a5
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Mar 9 14:26:33 2013 +0100

    Small improvement of German translation

 po/de.po | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit a6ab76e7ef47e923eee924254780fde4504dc3b3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 8 20:36:52 2013 +0100

    Update NEWS to reference more bugs and list latest changes

 NEWS | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

commit 771934ae29151e0c16c642fa4739f0aaec5cfd62
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 8 18:32:47 2013 +0100

    Don't translate program name directive in Pascal file template
    
    Pascal code only accepts an identifier in the program name directive,
    but {untitled} wildcard gets replaced with a translated string that may
    not be a valid Pascal identifier.  Moreover, the directive being part
    of the source of the program it's good practice for it to be in English
    anyway.
    
    Closes #3602314.

 data/templates/files/program.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e5e697e5c385d62f686b92b2cca09d940b974863
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Mar 8 17:19:31 2013 +0100

    Upate of Catalan translation

 NEWS     |    2 +-
 po/ca.po | 3277 ++++++++++++++++++++++++++++++--------------------------------
 2 files changed, 1563 insertions(+), 1716 deletions(-)

commit b01f31c09bfdd0988b4fb94bc154683f0bedaff6
Merge: f439a5b e01d5a5
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri Mar 8 00:08:58 2013 +0100

    Merge branch 'gentoo90-context-menu-icon'

commit e01d5a568b893a42a089272d8063c35548dfb9e7
Author: Igor Shaula <gentoo90@gmail.com>
Date:   Sat Feb 9 18:47:05 2013 +0200

    Add icon to Explorer context menu entry

 geany.nsi | 1 +
 1 file changed, 1 insertion(+)

commit f439a5be422ede003b279caf1df73f2d90393195
Merge: af23739 a3b9283
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Mar 7 00:20:39 2013 -0800

    Merge pull request #117 from kgkilo/hu_po
    
    Updated Hungarian translations

commit a3b9283e5bf1a9c84c116e0a2ebad16a3b7cdbac
Author: kilo aka Gabor Kmetyko <kg.kilo@gmail.com>
Date:   Wed Mar 6 23:42:46 2013 +0100

    Updated Hungarian translations

 po/hu.po | 1597 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 714 insertions(+), 883 deletions(-)

commit af237391fc4e1701b6dc6ed98f7081440ca89210
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Mar 6 19:47:47 2013 +0100

    Update of German translation

 po/de.po | 1676 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 743 insertions(+), 933 deletions(-)

commit a552c82a748d1eaed7ec04cc442e0fbbef288af0
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Mar 6 19:28:52 2013 +0100

    Update of Brazilian Portuguese translation

 po/pt_BR.po | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit e5245eb053cd02b72827de41f7509512fcbc551c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 5 23:52:45 2013 +0100

    Increase the number of lines where filename is replaced upon save as
    
    Search the first 4 lines (instead of 3) for Python templates support.

 doc/geany.txt  | 2 +-
 src/document.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 5b2366964938b54005eec39d392fc5cbea81682b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Mar 5 23:32:17 2013 +0100

    Fix replacing file name in headers upon save as
    
    The code used a Scintilla-specific regex escape (\<) which doesn't work
    anymore since the time we switched to full PCRE (which uses \b).  So,
    update the regular expression to PCRE.
    
    Also, properly escape the name to search in the unlikely case it has
    regular expression escapes in it;  and properly check for word
    boundaries even when not searching with an extension.

 src/document.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 77e142bb73cb12777a37ae792784b171b667d0c4
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Mar 5 19:44:31 2013 +0100

    Update of Slovenian translation

 po/sl.po | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

commit da5deda697677b508cde71a14e44ee671b07f64c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Mar 5 19:38:46 2013 +0100

    Update of Kazakh translation

 NEWS     |  3 +-
 po/kk.po | 95 +++++++++++++++++++++++++++-------------------------------------
 2 files changed, 42 insertions(+), 56 deletions(-)

commit bf7a399ac9ef4bdbe02feaf53696dd62ca70214c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Mar 5 19:35:46 2013 +0100

    Update of Brasilian Portugese translation

 po/pt_BR.po | 3262 ++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1547 insertions(+), 1715 deletions(-)

commit 58eb5507753c97fa99c31fb65d25ebcb5a2fab21
Merge: 775ef62 0053431
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Mar 4 09:17:23 2013 -0800

    Merge pull request #115 from xhacker/patch-1
    
    Update zh_CN.po

commit 00534315b38a8f388ab35af8f0e3b5c527fdddc2
Author: LIU Dongyuan <liu.dongyuan@gmail.com>
Date:   Mon Mar 4 23:33:25 2013 +0800

    Update zh_CN.po

 po/zh_CN.po | 79 +++++++++++++++++++++++++------------------------------------
 1 file changed, 32 insertions(+), 47 deletions(-)

commit 775ef628688c69de34640e12666aed5762a80dff
Author: Enrico Troeger <enrico.troeger@uvena.de>
Date:   Sun Mar 3 23:33:25 2013 +0100

    Set the working directory on Windows very early to also help code which uses relative resource paths

 src/main.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

commit fc9795010c504937815fd1c6ecfc9c592aa52e6a
Author: Enrico Troeger <enrico.troeger@uvena.de>
Date:   Sun Mar 3 23:28:22 2013 +0100

    Install geany.gtkrc with the Windows installer

 geany.nsi | 1 +
 1 file changed, 1 insertion(+)

commit 48dc4789ce22a072f4c1ca881d7bc45adb5f57d8
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Mar 3 08:10:44 2013 +0100

    Update of Turkish translation

 po/tr.po | 3307 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 1512 insertions(+), 1795 deletions(-)

commit 39bb444ee53ec47fcd60b9e6e36e27bd9e45bc16
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Mar 1 19:35:41 2013 +0100

    Small update on NEWS

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cf61d5d4258f18c2efe7cf006b909c6fc42d88a3
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Mar 1 19:35:12 2013 +0100

    Update of Italian translation

 po/it.po | 3271 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1542 insertions(+), 1729 deletions(-)

commit 964a20fb79cb1a55d663e4b519077d4952c817fe
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Mar 1 19:31:30 2013 +0100

    Update of Slovenian translation

 po/sl.po | 1593 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 734 insertions(+), 859 deletions(-)

commit 8db196d2b3838418478b06d637f8310cbdd8a4d7
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Mar 1 19:29:28 2013 +0100

    Update of Galician translation

 po/gl.po | 1724 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 764 insertions(+), 960 deletions(-)

commit d289e3da20a046283e7ead405bc93e00405b9251
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Mar 1 15:19:14 2013 +0100

    Fix comment toggling in PHP and HTML with bottom-up selection
    
    If current position is not at selection start (e.g. bottom-up
    selection), editor_get_filetype_at_current_pos() will start returning
    improper result as soon as the first buffer change since the style at
    the actual current position will have been invalidated and not yet
    recomputed.

 src/editor.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

commit d34ca178683c65df9f8bd4959c052966ef482b0b
Author: Lex <elextr@gmail.com>
Date:   Fri Mar 1 12:52:20 2013 +1100

    Correct description of build_activate_menu_item()
    
    Correct the documentation comment for build_activate_menu_item() for
    plugin documentation.

 src/build.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 58bffcbcceb4627b615e09f81cb3f1ebe9975352
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Feb 25 21:07:28 2013 +0100

    Update of Spanish translation

 NEWS     |    2 +-
 po/es.po | 2681 +++++++++++++++++++++++++++++++-------------------------------
 2 files changed, 1335 insertions(+), 1348 deletions(-)

commit 181e91ed8891b7461710de5db40252cf1e417a00
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Feb 25 21:01:47 2013 +0100

    Update of Lithuanian translation

 po/lt.po | 94 +++++++++++++++++++++-------------------------------------------
 1 file changed, 30 insertions(+), 64 deletions(-)

commit 8228c3f3df96d235f8e3dec486ad570c47898e27
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Feb 24 15:33:45 2013 +0100

    Update of French translation

 po/fr.po | 1721 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 743 insertions(+), 978 deletions(-)

commit 5997f6a6931bdbabf921a1e351fc3d72e516787f
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Feb 24 14:54:48 2013 +0100

    Update of Japanese translation

 po/ja.po | 71 +++++++++++++++++++++++++---------------------------------------
 1 file changed, 28 insertions(+), 43 deletions(-)

commit 48b370e2c4a76f57c8ccd0584557fcfa007cf71c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Feb 23 14:29:32 2013 +0100

    Update of po-files for string freeze of Geany 1.23

 po/ar.po    | 2184 +++++++++++++++++-----------------
 po/ast.po   | 2205 ++++++++++++++++++-----------------
 po/be.po    | 2204 ++++++++++++++++++-----------------
 po/bg.po    | 2202 ++++++++++++++++++-----------------
 po/ca.po    | 2205 ++++++++++++++++++-----------------
 po/cs.po    | 2210 ++++++++++++++++++-----------------
 po/de.po    | 2333 ++++++++++++++++++++-----------------
 po/el.po    | 2202 ++++++++++++++++++-----------------
 po/en_GB.po | 2205 ++++++++++++++++++-----------------
 po/es.po    | 2166 ++++++++++++++++++----------------
 po/et.po    | 2111 ++++++++++++++++-----------------
 po/eu.po    | 1849 +++++++++++++++--------------
 po/fa.po    | 2205 ++++++++++++++++++-----------------
 po/fi.po    | 3529 ++++++++++++++++++++++++++++---------------------------
 po/fr.po    | 3503 ++++++++++++++++++++++++++++++-------------------------
 po/gl.po    | 2205 ++++++++++++++++++-----------------
 po/he.po    | 3020 +++++++++++++++++++++++------------------------
 po/hi.po    |  968 +++++++--------
 po/hu.po    | 3458 +++++++++++++++++++++++++++++-------------------------
 po/id.po    | 2205 ++++++++++++++++++-----------------
 po/it.po    | 1864 +++++++++++++++--------------
 po/ja.po    | 2170 +++++++++++++++++-----------------
 po/kk.po    | 2167 +++++++++++++++++-----------------
 po/ko.po    | 2194 +++++++++++++++++-----------------
 po/lb.po    | 2200 ++++++++++++++++++-----------------
 po/lt.po    | 2166 ++++++++++++++++++----------------
 po/mn.po    | 2184 +++++++++++++++++-----------------
 po/nl.po    | 1462 ++++++++++++-----------
 po/nn.po    | 2174 +++++++++++++++++-----------------
 po/pl.po    | 2165 ++++++++++++++++++----------------
 po/pt.po    | 2166 ++++++++++++++++++----------------
 po/pt_BR.po | 2166 ++++++++++++++++++----------------
 po/ro.po    | 2202 ++++++++++++++++++-----------------
 po/ru.po    | 2132 +++++++++++++++++----------------
 po/sk.po    | 2164 +++++++++++++++++-----------------
 po/sl.po    | 2209 ++++++++++++++++++-----------------
 po/sr.po    |  998 ++++++++--------
 po/sv.po    | 2161 ++++++++++++++++++----------------
 po/tr.po    | 2167 ++++++++++++++++++----------------
 po/uk.po    | 2202 ++++++++++++++++++-----------------
 po/vi.po    | 2206 ++++++++++++++++++-----------------
 po/zh_CN.po | 3750 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 2197 +++++++++++++++++-----------------
 43 files changed, 50443 insertions(+), 46192 deletions(-)

commit 2b5944d4c21799acbcb7641375f8866c80f149e8
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Feb 23 14:23:49 2013 +0100

    Update of Hindi translation

 po/hi.po | 10999 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 5475 insertions(+), 5524 deletions(-)

commit d49b8fbbc0322191b24d70541f06143db6e13634
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Feb 22 14:57:15 2013 +0100

    Update NEWS for new items

 NEWS | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 99fbe0bd8ca3882fc4c2c96b4e241301def74ca1
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Thu Feb 21 19:27:06 2013 +0200

    Fix plugin_add_toolbar_item insertion order

 src/pluginutils.c |  9 ++++-----
 src/ui_utils.c    | 30 +++++++++++++++++++-----------
 src/ui_utils.h    |  3 ++-
 3 files changed, 25 insertions(+), 17 deletions(-)

commit 9d88bd24634f155c111e25476456530ecd244fda
Author: Max Musatov <m1kc@yandex.ru>
Date:   Fri Feb 22 05:12:37 2013 +0400

    Update the main.d template to use a more standard prototype for main()

 data/templates/files/main.d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5acb92a3cb429e76b26a034ba55bc7fa81481431
Author: Lex <elextr@gmail.com>
Date:   Thu Feb 21 17:07:42 2013 +1100

    More verbose update to manual for Terminal setting
    
    Provide a more complete description of the use of the changed
    Terminal setting in several places.

 doc/geany.txt | 51 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 19 deletions(-)

commit 62077c626c10116bde050d50cb4aef0e167f5eee
Author: Adam Coyne <github@mail2.coyne.nu>
Date:   Thu Feb 21 23:49:46 2013 -0600

    Prompt to overwrite in Windows Save As dialog
    
    Add OFN_OVERWRITEPROMPT so the dialog will prompt before overwriting an existing file.
    Remove the OFN_FILEMUSTEXIST flag, which works only with Open dialogs.

 src/win32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d577c57e7841f5fef780e114e3fba68ea6808830
Author: Lex <elextr@gmail.com>
Date:   Thu Feb 21 15:02:13 2013 +1100

    Add missing slash in default command

 src/keyfile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7d6ad6d50fb8b6801448144b1195302f1a3a26d2
Merge: 5df79bc dba93f3
Author: Lex <elextr@gmail.com>
Date:   Thu Feb 21 13:05:54 2013 +1100

    Merge branch 'master' of https://github.com/geany/geany

commit 5df79bc13515d4da647be4185c0c7a47dcb4f82a
Author: Lex <elextr@gmail.com>
Date:   Thu Feb 21 12:42:30 2013 +1100

    Adjust Terminal tooltip in preferences
    
    Adjust to say it is a full command and that %c is substituted by
    the geany_run_script path.

 data/geany.glade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dba93f3854c9efaaf7e07d09b4d80dd33f09f954
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Feb 21 01:16:04 2013 +0100

    Allow Quit keybinding to be configured
    
    This removes the last unmodifiable keybinding relying on GTK's
    defaults, and allows somebody to change this keybinding.

 data/geany.glade  | 1 -
 doc/geany.txt     | 2 ++
 src/keybindings.c | 5 +++++
 src/keybindings.h | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

commit a0dc8af9c4238fe435c7f45ef4c39c358b6803d2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Feb 21 00:57:06 2013 +0100

    Fix GTK default keybindings being still active after being unbound
    
    If we provide an AccelGroup when creating a menu item using a sock ID,
    it installs the GTK default accelerator, accelerator we can't remove
    since we don't know about it.  So, don't give an AccelGroup so GTK
    don't install it's own accelerator.
    
    This fix also required to properly update the accelerator on some item
    we used to ignore since the update didn't work anyway (since the GTK
    accelerator was displayed instead).
    
    Note that this doesn't fix the fact the editor popup menu accelerators
    are never updated after startup so they don't get updated before
    restart after changing a keybinding in the preferences.  This is a
    separate (and less problematic) issue due to a simple lack of update.
    
    Closes #1912683 and #3599251.

 data/geany.glade  | 27 ---------------------------
 doc/geany.txt     |  8 --------
 src/keybindings.c | 18 ++++++++++++------
 3 files changed, 12 insertions(+), 41 deletions(-)

commit 3c2dc547cdc9343573765ec0502effc00a61f39b
Author: Lex <elextr@gmail.com>
Date:   Thu Jan 24 18:25:44 2013 +1100

    Make the tools->terminal setting more flexible.
    
    Previously was hard coded with options to suit xterm.  As this is
    being replaced with different terminal programs some do not accept
    the same options.  The new setting stores the whole command with
    %c to substitute the script name.  Upgrades old settings if a new
    one does not exist.

 doc/geany.txt |  3 ++-
 src/build.c   | 44 +++++++++++++++-----------------------------
 src/keyfile.c | 29 +++++++++++++++++++++++++----
 3 files changed, 42 insertions(+), 34 deletions(-)

commit eab86bc6adf76764046a2d3959953309ba3cd658
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Feb 14 00:50:59 2013 +0100

    win32: Fix crash with -v if stream redirection setup fails
    
    Properly check for errors when setting up debug console stream
    redirections so if it fails it doesn't crash everything.

 src/win32.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 54 insertions(+), 17 deletions(-)

commit 1646504a46e4b5af354406fd1f819da0dd6754fa
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Feb 12 23:48:10 2013 +0100

    Fix build with bleeding edge GLib
    
    CTags defines __unused__ and __printf__, which not only are reserved
    identifiers, but actually are used by GNUC as arguments of the
    __attribute__() extension.  This used to work because no code seeing
    those definitions was trying to use them as __attribute__() argument,
    but a recent change in GLib made it use it in atomic operation, which
    are used by the tagmanager, which itself includes the CTags header
    defining those, leading to a weird build failure -- since __unused__
    expanded to an unexpected value.
    
    To fix this, rename CTag's __ununsed__ to UNUSED and __printf__ to
    PRINTF.

 tagmanager/ctags/c.c            |  4 ++--
 tagmanager/ctags/ctags.c        |  4 ++--
 tagmanager/ctags/general.h      |  8 ++++----
 tagmanager/ctags/lregex.c       | 30 +++++++++++++++---------------
 tagmanager/ctags/lua.c          |  2 +-
 tagmanager/ctags/main.h         |  2 +-
 tagmanager/ctags/options.h      |  2 +-
 tagmanager/ctags/parse.c        |  2 +-
 tagmanager/ctags/parse.h        |  2 +-
 tagmanager/src/tm_file_entry.c  |  2 +-
 tagmanager/src/tm_project.c     |  2 +-
 tagmanager/src/tm_source_file.c |  2 +-
 tagmanager/src/tm_workspace.c   |  2 +-
 13 files changed, 32 insertions(+), 32 deletions(-)

commit 76a6e945ec6d64e7eeae0ae81263850da670462a
Merge: 36581d6 2203d8f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Feb 12 15:01:00 2013 +0100

    Merge branch 'touste/abaqus-support'

commit 2203d8f085801492f7863c2c5c468e968df789bc
Author: Baptiste Pierrat <baptiste.pierrat@gmail.com>
Date:   Sun Jan 6 13:50:49 2013 +0100

    Abaqus: remove styles not actually used by the lexer

 data/filetypes.abaqus      | 11 +++--------
 src/highlightingmappings.h | 11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

commit d4e61bf0933038b3de8f7a16425e82bb51c44285
Author: Baptiste Pierrat <baptiste.pierrat@gmail.com>
Date:   Mon Dec 3 15:17:43 2012 +0100

    Add support for Abaqus files
    
    Support for Abaqus (.inp) files, including scintilla lexer and tag
    parser.
    
    Signed-off-by: Baptiste Pierrat <baptiste.pierrat@gmail.com>

 data/filetype_extensions.conf     |   1 +
 data/filetypes.abaqus             |  67 ++++
 scintilla/Makefile.am             |   1 +
 scintilla/lexers/LexAbaqus.cxx    | 620 ++++++++++++++++++++++++++++++++++++++
 scintilla/makefile.win32          |   1 +
 scintilla/scintilla_changes.patch |   2 +-
 scintilla/src/Catalogue.cxx       |   1 +
 src/filetypes.c                   |   6 +
 src/filetypes.h                   |   1 +
 src/highlighting.c                |   9 +
 src/highlightingmappings.h        |  30 ++
 src/symbols.c                     |   9 +
 tagmanager/ctags/Makefile.am      |   1 +
 tagmanager/ctags/abaqus.c         | 126 ++++++++
 tagmanager/ctags/makefile.win32   |   2 +-
 tagmanager/ctags/parsers.h        |   4 +-
 wscript                           |   1 +
 17 files changed, 879 insertions(+), 3 deletions(-)

commit e0104a4bc26461b848c61c06cf885a3b6adf469e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 11 04:47:21 2013 +0100

    Port new configurable document status colors to GTK3

 data/geany.css | 11 +++++++++++
 src/document.c | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)

commit a77ac1407a1285c21acf1745fb60ddfd5cf758d5
Merge: e250ee8 36581d6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 11 04:47:02 2013 +0100

    Merge branch 'master' into gtk3-support

commit 36581d6638236768e3ba00b1da2c15e795bc95f3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 11 03:31:05 2013 +0100

    Move document status color definition to the gtkrc file
    
    This allows for users to change the colors if needed (may be useful
    with some themes or color blind persons).
    
    On the sidebar, only the color is applied for now.  This is because
    it is not possible to style cell renderers through RC files, all having
    to be done in the code;  so currently only the color is applied.

 data/geany.gtkrc | 17 ++++++++++++
 src/document.c   | 84 ++++++++++++++++++++++++++++++++++++++++++++++----------
 src/document.h   |  2 ++
 src/ui_utils.c   | 11 ++------
 4 files changed, 90 insertions(+), 24 deletions(-)

commit 23ef01ede828ffd565ff1acf6a025fb193deb591
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 11 03:20:49 2013 +0100

    Allow user gtkrc to override our gtkrc styles
    
    This allows the user to override the custom styles we apply to some
    widgets, like e.g. the unmatched search entry colors.
    
    We use the :theme priority rather than the :application one because
    it seems that the :application one cannot override theme settings, even
    if it matches against a name the theme don't have rules for but have
    rules for the class of that widget.  This prevents a theme from
    overriding our styles, but it's unlikely a theme actually provide some
    specific stuff for us anyway.

 data/geany.gtkrc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit dbd6d12160f6d2c4baffca33cf226b4aef6be782
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 11 03:17:12 2013 +0100

    Fix not using monospace font for unmatched search entries
    
    This bug was introduced by RC file switch.

 data/geany.gtkrc | 1 +
 1 file changed, 1 insertion(+)

commit 923c8582e35776f1a4c2414880d79dae1dbe2968
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Feb 6 19:34:21 2013 +0100

    Extend i18n-section of NEWS a bit

 NEWS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit fb7196cf3fce687b089e6cf19c4320abda7d2ccf
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Feb 6 19:30:19 2013 +0100

    Update of German translation

 po/de.po | 2362 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1210 insertions(+), 1152 deletions(-)

commit eab804bae48ee89c4ba6d6b82c35544525c07c54
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Feb 6 19:19:31 2013 +0100

    Update of Swedish translation

 po/sv.po | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit 41456c18092a0fa0ff672dfcda2edb4a01ce7e87
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Feb 5 21:27:05 2013 +0100

    Replace ru_RU with simple ru inside credantials as we only have one Russiian translation

 THANKS      | 12 ++++++------
 src/about.c |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

commit f087542ef8ffbc5a7860d32e95818d25f4f4a914
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Feb 5 21:25:48 2013 +0100

    Added first version of Serbian translation

 THANKS      |    1 +
 po/sr.po    | 5466 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/about.c |    1 +
 3 files changed, 5468 insertions(+)

commit 92f2bb89707775a85efe852a161f0c1697460d41
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Feb 5 00:41:53 2013 +0100

    Update of Finnish translation

 po/fi.po | 4273 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 2128 insertions(+), 2145 deletions(-)

commit 159d712bd6a60d10d5ec2d2d858429a5ebe7222d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Feb 5 00:40:31 2013 +0100

    Adding first version of Hindi translation

 THANKS      |    1 +
 po/hi.po    | 5528 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/about.c |    1 +
 3 files changed, 5530 insertions(+)

commit 82f259f6b54a778953fc6715a40e78705977a08c
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Feb 3 12:35:05 2013 +0100

    Print filename of failed plugin

 scripts/plugin_test.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit cfed3c3f23258a2947a44e295d777c9a2e660891
Author: Felix Totir <felix.totir@gmail.com>
Date:   Thu Jan 31 17:42:04 2013 +0100

    Add missing D keywords
    
    Closes #3595187.

 data/filetypes.d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b02e7e4d04257d43f9cc79d54395f245e238ef49
Author: Felix Totir <felix.totir@gmail.com>
Date:   Thu Jan 31 16:29:04 2013 +0100

    Ignore more build files

 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit 911e5dca1761a0aad090e981a60ed5c937d01c46
Author: Stephen Coleman <omegacoleman@gmail.com>
Date:   Thu Jan 31 18:33:37 2013 +0800

    Detect SCons configuration files as Python
    
    SCons configuration files are plain Python, just without the .py
    extension.

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5fa4aa5d64695f919e3028ff75b4a1e55e119fd1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jan 31 18:07:14 2013 +0100

    Early NEWS update

 NEWS | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 100 insertions(+), 1 deletion(-)

commit e250ee8ec36957040f1fdbb5e28bcb8f2dc4b802
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 29 15:49:39 2013 +0100

    Fix version check for GtkFontChooserDialog (oops)

 src/dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8ece89096d38d5870ac73697bd17d870deaeac34
Merge: 1f244e0 bd7b56a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 29 15:29:10 2013 +0100

    Merge branch 'master' into gtk3-support

commit 258ea70ad7941e8f9a443d5bae4941c803df8ee6
Merge: b7b4e4d a661a0e
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Jan 26 05:01:31 2013 -0800

    Merge pull request #95 from YosefOr/patch-7
    
    Update Hebrew translator

commit b7b4e4d6c95d88ffea008621faf4cd438eb489b9
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Jan 25 18:48:30 2013 +0100

    Update of Hebrew translation

 po/he.po | 174 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 95 insertions(+), 79 deletions(-)

commit a661a0e3ea3f4bb82343eb0d6e2252492053d6d7
Author: YosefOr <yosefor3@walla.com>
Date:   Wed Jan 23 23:50:56 2013 +0200

    Update po/he.po
    
    Update Hebrew translator

 po/he.po | 174 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 95 insertions(+), 79 deletions(-)

commit bd7b56a80f2c5c250b3f3d8d94f05a7d3513e73d
Author: Lex <elextr@gmail.com>
Date:   Thu Jan 17 15:50:40 2013 +1100

    Comment future fixes/additions
    
    Note where Asciidoc features need to be supported that would
    prevent code sharing with other markup parsers.

 tagmanager/ctags/asciidoc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit dcac3e164c804729f49750510c3491205e2ff19d
Author: Lex <elextr@gmail.com>
Date:   Thu Nov 1 13:44:11 2012 +1100

    Fix indent setting
    
    Asciidoc requires single line comments to be at the start of the line
    so do not want indent.

 data/filetypes.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 280e9eeb1c515bd05603d2d501636abb330dfe13
Author: Lex <elextr@gmail.com>
Date:   Thu Nov 1 13:29:59 2012 +1100

    Correct Names of levels
    
    Make the top level the Document, make lower levels translatable
    although they do not normally show in Symbols pane.

 src/symbols.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 8294ea2c2e948894fd211d0ea55b34f12e76d553
Author: Lex <elextr@gmail.com>
Date:   Thu Nov 1 11:14:55 2012 +1100

    Add Asciidoc filetype
    
    Add a filetype for Asciidoc with symbol parser, but not styling.

 data/filetype_extensions.conf   |   1 +
 data/filetypes.asciidoc         |  35 +++++++
 src/filetypes.c                 |   8 ++
 src/filetypes.h                 |   1 +
 src/symbols.c                   |  11 +++
 tagmanager/ctags/Makefile.am    |   1 +
 tagmanager/ctags/asciidoc.c     | 205 ++++++++++++++++++++++++++++++++++++++++
 tagmanager/ctags/makefile.win32 |   2 +-
 tagmanager/ctags/parsers.h      |   4 +-
 wscript                         |   1 +
 10 files changed, 267 insertions(+), 2 deletions(-)

commit 76aec0852af3450aabb296dff17f878571d25a49
Author: Lex <elextr@gmail.com>
Date:   Thu Jan 17 15:27:39 2013 +1100

    Revert incomplete Asciidoc filetype commit.
    
    This reverts commit da78a44a1cfeb753e0d06d7175e882f508ad9788.

 data/filetypes.asciidoc     |  35 --------
 tagmanager/ctags/asciidoc.c | 208 --------------------------------------------
 2 files changed, 243 deletions(-)

commit 320f10c85b8381dc5e8dc1daec2fbceb050a9a83
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 15 22:28:00 2013 +0100

    Don't install themes index on non-Windows
    
    On non-Windows, the icons are installed on the system's icon directory,
    so installing our index.theme might override the system's one.  Since
    it's highly unlikely the theme index is missing on non-Windows, just
    don't install it.

 icons/Makefile.am       |  5 ++++-
 icons/tango/Makefile.am |  4 +++-
 wscript                 | 14 ++++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

commit b80c8cd2a98b2623a85f36d5b28f55abf2e82a92
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jan 14 19:20:01 2013 +0100

    Fix custom icons on Windows
    
    Install all icons on Windows, as well as a theme index because the
    system doesn't have one and one is required.
    
    Also install the theme index on non-Windows, although it shouldn't
    be necessary because the system is likely to provide one.

 icons/Makefile.am       |  5 ++++-
 icons/index.theme       | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
 icons/tango/Makefile.am |  4 ++++
 icons/tango/index.theme | 33 +++++++++++++++++++++++++++
 wscript                 |  7 +++---
 5 files changed, 104 insertions(+), 5 deletions(-)

commit e506a370e9c3b4661f0832afa1c0fb2c90d61d76
Author: Duncan de Wet <duncandewet@gmail.com>
Date:   Mon Jan 14 09:26:51 2013 +1300

    Added HTML5 self-closing tags
    
    http://www.w3.org/TR/html-markup/syntax.html#syntax-elements

 src/utils.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit c45a4f3e1be6287249a25dc39ef44e020d180c1a
Merge: 1a7a266 ba09cb3
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Jan 8 23:06:45 2013 -0800

    Merge pull request #92 from YosefOr/patch-6
    
    Update Hebrew Translation

commit ba09cb310b80bcbfd218ad05f9f2fb91280ac07e
Author: YosefOr <yosefor3@walla.com>
Date:   Tue Jan 8 20:52:55 2013 +0200

    Update Hebrew Translator

 po/he.po | 1364 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 686 insertions(+), 678 deletions(-)

commit 1a7a26682d20e55d8d3db478678896fc5fb4cfa6
Author: Matthew Brush <matt@geany.org>
Date:   Sun Jan 6 19:15:00 2013 -0800

    Add doc for terminal background image and regen HTML

 doc/geany.html | 878 +++++++++++++++++++++++++++++----------------------------
 doc/geany.txt  |   3 +
 2 files changed, 447 insertions(+), 434 deletions(-)

commit adfc0985dbc0e4c223051e6225e4863b79a43898
Merge: d236b40 15fddad
Author: Matthew Brush <matt@geany.org>
Date:   Sun Jan 6 19:11:17 2013 -0800

    Merge branch 'krofna/master'

commit d236b40ce9e9898e2d904ff209aab00fee7720e1
Merge: 93ff558 ede5d36
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Jan 6 04:46:28 2013 -0800

    Merge pull request #90 from hroncok/master
    
    Updated the Czech translation

commit ede5d362041baeccf83959d23973b67009103dea
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Sat Jan 5 19:11:13 2013 +0100

    Updated the Czech translation

 po/cs.po | 113 ++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 50 insertions(+), 63 deletions(-)

commit 93ff558544d0ae3c2c13f885a0c65b454328ee85
Merge: d2a8a11 7688999
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 1 19:17:18 2013 +0100

    Merge branch 'use-named-icons'

commit 7688999e62f658bdddb3cde77563db620dcc8774
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 1 19:14:50 2013 +0100

    Optimize PNG icons

 icons/16x16/classviewer-macro.png | Bin 332 -> 257 bytes
 icons/16x16/classviewer-other.png | Bin 287 -> 273 bytes
 icons/48x48/geany.png             | Bin 4361 -> 4314 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

commit 3783eed0ea0a032fae43f031305c1605aa245c8f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 18 02:33:28 2012 +0200

    Use icons from the theme in the completion popup
    
    Drop the XPM icons and load the PNG ones through the theme mechanisms,
    like we do for the symbols tree.

 icons/16x16/Makefile.am            |  4 ----
 icons/16x16/classviewer-method.xpm | 27 ----------------------
 icons/16x16/classviewer-var.xpm    | 27 ----------------------
 src/editor.c                       | 46 ++++++++++++++++++++++++++++++++++----
 4 files changed, 42 insertions(+), 62 deletions(-)

commit dabae1f94f13a85b672746aa0a177d3534048d9f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 17 22:18:54 2012 +0200

    Replace images embedded in the sources with proper themable icons
    
    Additionally, provide SVG versions of the icons as well as them
    rendered at the various icons sizes.

 configure.ac                            |    8 +
 data/geany.glade                        |   11 +-
 icons/16x16/Makefile.am                 |   13 +-
 icons/16x16/geany-build.png             |  Bin 0 -> 822 bytes
 icons/16x16/geany-close-all.png         |  Bin 0 -> 760 bytes
 icons/16x16/geany-save-all.png          |  Bin 0 -> 785 bytes
 icons/24x24/Makefile.am                 |    6 +
 icons/24x24/geany-build.png             |  Bin 0 -> 1259 bytes
 icons/24x24/geany-close-all.png         |  Bin 0 -> 1193 bytes
 icons/24x24/geany-save-all.png          |  Bin 0 -> 1157 bytes
 icons/32x32/Makefile.am                 |    6 +
 icons/32x32/geany-build.png             |  Bin 0 -> 1759 bytes
 icons/32x32/geany-close-all.png         |  Bin 0 -> 1612 bytes
 icons/32x32/geany-save-all.png          |  Bin 0 -> 1806 bytes
 icons/48x48/Makefile.am                 |   13 +-
 icons/48x48/geany-build.png             |  Bin 0 -> 2834 bytes
 icons/48x48/geany-close-all.png         |  Bin 0 -> 2659 bytes
 icons/48x48/geany-save-all.png          |  Bin 0 -> 2565 bytes
 icons/Makefile.am                       |   13 +-
 icons/scalable/Makefile.am              |   13 +-
 icons/scalable/geany-build.svg          |  162 ++++
 icons/scalable/geany-close-all.svg      |  446 ++++++++++
 icons/scalable/geany-save-all.svg       |  657 +++++++++++++++
 icons/tango/16x16/Makefile.am           |    7 +
 icons/tango/16x16/geany-save-all.png    |  Bin 0 -> 708 bytes
 icons/tango/16x16/geany-save-all.xcfgz  |  Bin 0 -> 2630 bytes
 icons/tango/24x24/Makefile.am           |    4 +
 icons/tango/24x24/geany-save-all.png    |  Bin 0 -> 1722 bytes
 icons/tango/32x32/Makefile.am           |    4 +
 icons/tango/32x32/geany-save-all.png    |  Bin 0 -> 2406 bytes
 icons/tango/48x48/Makefile.am           |    4 +
 icons/tango/48x48/geany-save-all.png    |  Bin 0 -> 3981 bytes
 icons/tango/Makefile.am                 |    1 +
 icons/tango/scalable/Makefile.am        |    4 +
 icons/tango/scalable/geany-save-all.svg |  613 ++++++++++++++
 po/POTFILES.in                          |    1 -
 src/Makefile.am                         |    2 +-
 src/images.c                            | 1371 -------------------------------
 src/main.c                              |    4 +-
 src/ui_utils.c                          |   98 +--
 src/ui_utils.h                          |   12 -
 wscript                                 |   69 +-
 42 files changed, 2023 insertions(+), 1519 deletions(-)

commit bd02c009a12d78dc90fe8eacd3cbc4ce5e117e05
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 15 15:23:30 2012 +0200

    Use the Geany icon from the theme everywhere

 data/geany.glade |   3 +
 src/about.c      |  10 +-
 src/dialogs.c    |  14 +--
 src/images.c     | 319 -------------------------------------------------------
 src/main.c       |  22 ++--
 src/prefs.c      |   4 -
 src/symbols.c    |  16 +--
 src/ui_utils.c   |   3 -
 src/ui_utils.h   |   1 -
 9 files changed, 20 insertions(+), 372 deletions(-)

commit 003435e16ded66be6084a017a3169a1fc8a61bcb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 1 19:04:59 2013 +0100

    Revert "Make use of theme icon a various pref."
    
    A preference for an icon doesn't make sense;  if someone don't like
    her theme's icon she should either switch to another theme, override
    that specific icon or don't bother.
    
    This reverts commit 6897cd49c69535c6563e56ae011c6f8382fec485.

 src/keyfile.c |  4 ----
 src/main.c    | 20 ++++++--------------
 src/main.h    |  2 --
 3 files changed, 6 insertions(+), 20 deletions(-)

commit b9c1c9093890506b85fc6bd3db9da410717bdd20
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 1 19:04:47 2013 +0100

    Revert "Alter default and document icon setting"
    
    This reverts commit 306eaab3916649567c892215ad8390b9d39de82f.

 doc/geany.txt | 2 --
 src/keyfile.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

commit d2a8a115878d035c148f991e40f4ad226807276d
Merge: 35db698 1bad155
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 1 18:54:08 2013 +0100

    Merge branch 'printing-with-scintilla'

commit 1bad1551d7ab0827c3a4d9c08783424003123122
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Nov 2 21:54:51 2012 +0100

    Scintilla: properly update the Pango contexts for the target surface
    
    This fixes drawing on a surface that has different settings (like
    scaling) than the display surface, by performing the measurements on a
    layout properly set up for the target surface.
    
    In practice, this fixes e.g. printing on a scaled surface.
    
    (Applied to Scintilla HG as 74c71632dd1afa726b0f1608d13413e0864da9b0)

 scintilla/gtk/PlatGTK.cxx | 4 ++++
 1 file changed, 4 insertions(+)

commit 35db698eea8b5c25d8885ad6e94270ff26932b7f
Merge: 4449a4d c597e5b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Dec 27 23:06:48 2012 -0800

    Merge pull request #89 from andreasots/master
    
    Update to Estonian translation

commit c597e5b3902acc83d237d90dffd027122c83fa3f
Author: Andreas Ots <andreasots@gmail.com>
Date:   Thu Dec 27 16:39:48 2012 +0200

    po/et.po: 970 translated, 4 fuzzy, 267 untranslated

 po/et.po | 242 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 123 insertions(+), 119 deletions(-)

commit 3a7453bec4c5fdd41b735bd464abdc485063296b
Author: Andreas Ots <andreasots@gmail.com>
Date:   Thu Dec 27 15:32:27 2012 +0200

    po/et.po: Git trashed the translations

 po/et.po | 4 ----
 1 file changed, 4 deletions(-)

commit 8b9c9d8e432052dfe80b301a5220f8bafd659f4e
Author: Andreas Ots <andreasots@gmail.com>
Date:   Thu Dec 27 15:31:00 2012 +0200

    po/et.po: Header fix

 po/et.po | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit e22d8d7e99dba936abcdb8d33867e9f21cdad645
Merge: 4c3b44f 4e950a3
Author: Andreas Ots <andreasots@gmail.com>
Date:   Thu Dec 27 15:28:19 2012 +0200

    Merge?

commit 4c3b44f9d71eb5b1cc82a286b7a4a5838583b7b4
Author: Andreas Ots <andreasots@gmail.com>
Date:   Thu Dec 27 13:23:50 2012 +0200

    po/et.po: 650 translated, 2 fuzzy, 589 untranslated

 po/et.po | 470 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 240 insertions(+), 230 deletions(-)

commit 4e950a39db1bb046572b0d1c7ba1be922f3969e6
Author: Andreas Ots <andreasots@gmail.com>
Date:   Thu Dec 27 13:23:50 2012 +0200

    po/et.po: 650 translated, 2 fuzzy, 589 untranslated

 po/et.po | 58 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

commit 7234f848d8bc3ae64b415307b540622cd8f025ef
Author: Andreas Ots <andreasots@gmail.com>
Date:   Thu Dec 27 12:26:04 2012 +0200

    po/et.po: 623 translated, 2 fuzzy, 616 untranslated

 po/et.po | 1582 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 833 insertions(+), 749 deletions(-)

commit 4449a4dc37512d41bdea5520e40a07523745a83b
Merge: 40cef34 7511e2b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Dec 27 08:24:22 2012 +0100

    Merging a first version of Estonian translation

commit 7511e2b0df042467678c9522dbcc74bba0895606
Author: Andreas Ots <andreasots@gmail.com>
Date:   Thu Dec 27 00:50:04 2012 +0200

    po/et.po: Translation update: 365 translated, 6 fuzzy, 870 untranslated

 po/et.po | 192 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 99 insertions(+), 93 deletions(-)

commit 283638c3d2ad7428d6c855b91008ccdbc3003ddc
Author: Andreas Ots <andreasots@gmail.com>
Date:   Wed Dec 26 21:57:00 2012 +0200

    po/et.po: Initial version of estonian translation: 278 translated, 2 fuzzy, 961 not translated

 po/et.po | 5435 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 5435 insertions(+)

commit 40cef34326f172abeb8ee20949fb7cac25518ee3
Author: Matthew Brush <matt@geany.org>
Date:   Tue Dec 18 15:47:06 2012 -0800

    Fix "default" named style mapping for filetypes.conf
    
    "default" was mapped to "value" which is normally a string-like
    style rather than a "default" type of style which make some themes
    that set different background colour for strings to look weird for
    config files highlighting.

 data/filetypes.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 15fddad323dbd28c147f987936161c09455029ae
Author: Mislav Blažević <krofnica996@gmail.com>
Date:   Tue Dec 18 10:26:48 2012 +0100

    Implement terminal background image

 data/geany.glade | 77 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 src/keyfile.c    |  2 ++
 src/prefs.c      |  7 ++++++
 src/vte.c        | 10 ++++++++
 src/vte.h        |  1 +
 5 files changed, 87 insertions(+), 10 deletions(-)

commit 6241a4520f79b9cab1b61f6114abb2d86d45e555
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Dec 16 10:21:01 2012 +0100

    Remove KEY prefix from GDK_KEY_BackSpace constant
    
    GDK_KEY_* is GTK3 and doesn't work on older GTK versions.

 plugins/filebrowser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 550b2c1219bb54ff42e346b37212e30e64cebee7
Author: Steven Blatnick <sblatnick@proofpoint.com>
Date:   Thu Dec 13 10:45:08 2012 -0700

    Use a backspace to browse up a directory.

 plugins/filebrowser.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 6ca889c78b0c1e089a35e0100b5232b0e6760a76
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Dec 12 13:59:29 2012 +0000

    Add Document->Clone keybinding

 doc/geany.txt     |  2 ++
 src/document.c    | 15 +++++++++++----
 src/document.h    |  2 ++
 src/keybindings.c |  5 +++++
 src/keybindings.h |  1 +
 5 files changed, 21 insertions(+), 4 deletions(-)

commit 83e7afc1991c882890d6e28027e0ec26552c0944
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 10 22:37:20 2012 +0100

    Fix return value of search_find_text() when the match is out of bounds
    
    When performing a regular expression search on a range, and there is a
    match past the end of the range, search_find_text() used to improperly
    return the position of the match, but without filling the
    Sci_TextToFind structure.  This lead to the calling code assume there
    was a match, and maybe read the uninitialized fields in the
    Sci_TextToFind structure, thus leading to undefined behavior.
    
    So, fix search_find_text() so it properly returns -1 when there is a
    match but it is outside the bounds.

 src/search.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 89d6b42503876c23824a7cfb7411732932c13db6
Merge: 288adaf 67fccdb
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Dec 8 14:48:56 2012 -0800

    Merge pull request #82 from YosefOr/patch-5
    
    Update po/he.po

commit 288adaffd719a7027a4bb6e9fa28db11f7dbaacd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Dec 6 19:38:51 2012 +0100

    Python tag parser: fix detection of keywords followed by a tab (\t)
    
    The Python tag parser used to require a space, and a space only, as the
    character following a keyword.  Fix this so it allows any whitespace.

 tagmanager/ctags/python.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

commit ed2cf2e5f423eb484400637a54b58c9876b88b0a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Dec 4 20:07:54 2012 +0100

    VTE: Grab focus upon middle click
    
    When pasting with the X primary clipboard (middle mouse button), the
    user expects the focus to be grabbed by the widget receiving the data.
    
    No idea why the VTE itself don't grab upon middle click, though.

 src/vte.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 67fccdba88f2d1d11b18c684222839b42f8b3d96
Author: YosefOr <yosefor3@walla.com>
Date:   Tue Dec 4 19:40:52 2012 +0200

    Update po/he.po

 po/he.po | 1917 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 970 insertions(+), 947 deletions(-)

commit d01974151248c268fd89d593a7965c35ae10f104
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Dec 2 18:03:14 2012 +0100

    Properly register the statusbar context ID
    
    Getting the statusbar context ID using the context registration API
    allows for other (namely, plugins) to register their own context
    without a risk of overriding Geany's one.

 src/ui_utils.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 8c4db25396842c4c4ad08958068e399119e5947d
Author: Quentin Glidic <sardemff7+git@sardemff7.net>
Date:   Sat Dec 1 23:37:21 2012 +0100

    Fix file saving behavior with "allow_always_save"
    
    This preference should only be used for UI action, not for other file
    saving triggering.

 src/callbacks.c | 2 +-
 src/document.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 8f96498323914d543ab98c7fa9c850f2de551379
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Dec 2 16:45:17 2012 +0100

    Fix a typo in the docs

 doc/geany.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit c4b245776151aa36a05fbc361ce2c2e3efd0279e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Nov 28 13:50:27 2012 +0000

    Fix clashing button mnemonic in detect/reload dialog (#3587465)

 src/document.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3205eeaa714222114fd82063fe51f9656d3e635d
Author: Evandro Borracini <evandro.borracini@gmail.com>
Date:   Tue Nov 27 17:05:51 2012 +0000

    Reduce unnecessary redraws when typing

 src/document.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit a1022060d29e35d4ace6fced2acc277a56f20f65
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Nov 27 14:16:30 2012 +0000

    Show Find in Files status summary on Windows

 src/search.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 48f7efaa68c295d2da6f1e1616312e2dcdd24df4
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Nov 27 13:30:36 2012 +0000

    Ignore D angle brackets e.g. Foo!(x < 2)

 tagmanager/ctags/c.c | 2 ++
 1 file changed, 2 insertions(+)

commit 0b63957e5961c90b081066cadd9d63001dec0d90
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Nov 23 16:18:50 2012 +0000

    Add 'Move Line(s)' menu items in Edit->Commands (and popup menu)
    
    Although using menu items for these is not very practical, it helps
    discoverability, and they're more useful and intuitive than 'Transpose
    Current Line'.

 data/geany.glade  | 36 ++++++++++++++++++++++++++----------
 src/callbacks.c   | 10 ++++++++--
 src/callbacks.h   |  4 ----
 src/keybindings.c | 11 ++++++-----
 4 files changed, 40 insertions(+), 21 deletions(-)

commit b5b31fb43d1fc1102aa9163105756a7eff777095
Merge: 43c49ba 535b7a6
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Nov 23 15:43:21 2012 +0000

    Merge branch 'document-clone'

commit 535b7a6b6e2c0b8e536a7e6d6ce82db92e06c8c1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sat Nov 17 16:22:23 2012 +0000

    Copy selected text only (when present) for Document->Clone

 doc/geany.txt  |  5 +++--
 src/document.c | 11 +++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

commit 22d5b4795bdfc9bf5f0544d448e6d8cb8a852510
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Nov 16 14:27:23 2012 +0000

    Update manual for Document->Clone command

 doc/geany.txt | 7 +++++++
 1 file changed, 7 insertions(+)

commit 5200450b854cbef1cb67d42d83767fdfbfbe3803
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Nov 16 14:14:18 2012 +0000

    Clone line breaking, auto indent, indent type, indent width settings

 src/document.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 06661f36a530c409487d6f03351afb0799f520ff
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Nov 16 14:04:19 2012 +0000

    Mark cloned documents as modified
    
    This helps avoid accidental data loss.

 src/document.c | 1 +
 1 file changed, 1 insertion(+)

commit c0a8a2b806956fc7e48ac756985dd68c7ed04441
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Nov 16 13:57:26 2012 +0000

    Disable 'Save As' dialog Rename button unless document exists on disk

 src/dialogs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 85006b6d0b5c2d2aee48d700f646fecc48ed1034
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 15 16:08:56 2012 +0000

    Add 'Document->Clone' menu command
    
    This copies the current document text and properties into a new
    document, similar to the old Save As 'Open file in a new tab'
    option, but easier to understand and decoupled from saving.
    
    One notable difference is that the new document does not copy the
    filename - the old behaviour was confusing and error-prone for the
    user (e.g. editing two documents with the same filename).

 data/geany.glade | 10 ++++++++++
 src/document.c   | 11 ++++++-----
 src/document.h   |  2 --
 3 files changed, 16 insertions(+), 7 deletions(-)

commit 3949cf730435c023215f8b8757144b6fb369a367
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 15 16:06:27 2012 +0000

    Remove 'Open file in a new tab' save as option

 src/dialogs.c | 68 ++++++++++++-----------------------------------------------
 1 file changed, 13 insertions(+), 55 deletions(-)

commit 43c49ba46d79e57314fd977465dd3819c2522c4f
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Nov 21 13:31:30 2012 +0000

    Make sci_get_contents() accept -1 for buffer_len to get all text

 src/sciwrappers.c | 18 ++++++++++++------
 src/tools.c       |  6 ++----
 2 files changed, 14 insertions(+), 10 deletions(-)

commit fe1da1891a4a21263c477dbd4c9cbc63d32d466d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Nov 21 12:39:26 2012 +0000

    Fix sci_get_contents() buffer length parameter name & doc
    
    sci_get_contents() takes buffer length as a parameter, not the
    number of characters to copy. Buffer length includes a null byte.

 src/sciwrappers.c | 11 +++++------
 src/sciwrappers.h |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

commit c9f68df68334fd1fad10481bf06aea06b3125a24
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Nov 21 13:07:37 2012 +0000

    Fix cancelling Project Close when showing the unsaved changes dialog

 src/project.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit 9256dd660ccae42d9366cbc004074b3e1e0fb3fa
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Nov 19 22:44:16 2012 +0100

    Update of Dutch translation

 po/nl.po | 2026 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1011 insertions(+), 1015 deletions(-)

commit 3f7eec5910473b8b4b9ed08adb3a51a58db6b2f8
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Nov 19 22:38:45 2012 +0100

    Fix a typo insode geany.glade

 data/geany.glade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit da78a44a1cfeb753e0d06d7175e882f508ad9788
Author: Lex <elextr@gmail.com>
Date:   Sat Nov 17 19:19:27 2012 +1100

    Add Asciidoc filetype with symbol parser
    
    Add an Asciidoc filetype and a basic symbol parser based on ReST.
    See the FIXMEs for ReST to Asciidoc changes still to be done.

 data/filetypes.asciidoc     |  35 ++++++++
 tagmanager/ctags/asciidoc.c | 208 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 243 insertions(+)

commit 9df961f8c580ad0546c28fa185372140d16c1d1c
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 15 15:40:05 2012 +0000

    Scroll cursor in view after line breaking

 src/editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b8fa21ff3baf773badf65548338d3b5ea7d47080
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 15 13:34:19 2012 +0000

    Never strip trailing spaces for Diff documents

 doc/geany.html | 17 ++++++++++++-----
 doc/geany.txt  | 13 +++++++++----
 src/editor.c   |  4 ++++
 3 files changed, 25 insertions(+), 9 deletions(-)

commit e9e41ee47bb2b53e5a42224477d0ea43471e110f
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 8 16:56:38 2012 +0000

    Move D, Vala unique keyword aliases out of keywordTable
    
    Instead put them in initialize*Parser().

 tagmanager/ctags/c.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit 523e0d7c11c6c99035793a14c2ccc92fabe0c0b3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 8 15:53:19 2012 +0100

    Fix reStructuredText comment marker
    
    Closes #3585377.

 data/filetypes.restructuredtext | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a742ff354673d6a593b65666f6b158e6f6c8bba3
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Nov 5 16:15:48 2012 +0000

    Parse scope for D nested template blocks (#3582833)

 tagmanager/ctags/c.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 7d4ffb1e4596f9dc2283f3251aae63781de0aea0
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sat Nov 3 16:02:40 2012 +0000

    Fix parsing D 'static assert' (#3582833)

 tagmanager/ctags/c.c | 2 ++
 1 file changed, 2 insertions(+)

commit 4423de1a7223bc85ea89d706e699d2344d8dd36a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Nov 2 15:22:37 2012 +0100

    Printing: fix improper margins when printing to a physical device
    
    We were improperly adding the printing device margins to the area
    where we print, leading to wider margins on physical outputs than
    on PDF or preview outputs (which have no hard margins), as well as
    wasting space and not respecting user's settings.
    
    Closes #3580269.

 src/printing.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

commit 9f32fdd1a4c54ba035c2f655bea6096c3b74fbe9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 1 16:41:47 2012 +0100

    Printing: draw the vertical separator line more accurately
    
    Use the dimensions and offsets used by Scintilla to position our
    separator line, since its position depends on where Scintilla drawn.
    
    Closes #3580268.

 src/printing.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit 55b8c7af3fbaffe1acb32eb398ff96e1825ca695
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 1 16:38:49 2012 +0100

    Printing: fix text resolution
    
    Scintilla doesn't respect the context resolution, so we need to scale
    its draws ourselves.

 src/printing.c | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

commit 75cb789eb5790f3becea5a331ce06000e30b3f7e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 30 23:44:47 2012 +0100

    Fix a c-format typo in the Turkish translation leading to a crash

 po/tr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 21096777813f256826b6a1384dc6bcc14e9ad715
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 28 18:55:48 2012 +0100

    JavaScript parser: fix scope of functions nested inside methods

 tagmanager/ctags/js.c | 1 +
 1 file changed, 1 insertion(+)

commit 4dafe0d8d30225be4cdecd36f2ee281f3d6326c9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Oct 26 16:59:21 2012 +0200

    JavaScript parser: properly parse regular expression literals
    
    This prevents a regex pattern from fooling the parser if it contains
    some recognized constructs, like comment or string literal starts.
    
    Closes #2992393 and #3398636.

 tagmanager/ctags/js.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

commit 3cfd8fa8b1ff8d8efaa58dae58aa93a0230d841a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 25 17:45:17 2012 +0100

    Clear search markers on Mark All keybinding when already set

 doc/geany.html    | 14 ++++++++++----
 doc/geany.txt     |  3 ++-
 src/keybindings.c | 12 +++++++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

commit 318b49ab782b2334ec0f33eb255f23b9a6be3239
Merge: d7e285d f7f47af
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 25 17:17:25 2012 +0200

    Merge branch 'scintilla-update'

commit f7f47af0856f32798a07bacf23f8a1fa751bef4b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 25 17:07:07 2012 +0200

    Update NEWS

 NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4ffd446c43986385170a2e144f951557e101ec05
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 24 23:15:38 2012 +0200

    Update for new PO styles

 data/filetypes.po          |  9 ++++++++-
 src/highlighting.c         | 11 ++++++++++-
 src/highlightingmappings.h | 25 ++++++++++++++++---------
 3 files changed, 34 insertions(+), 11 deletions(-)

commit 2874357a975ebaac4a768690a400da84c44ec7e0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 24 23:13:46 2012 +0200

    Add new PO lexer to the build system

 scintilla/Makefile.am    | 1 +
 scintilla/makefile.win32 | 1 +
 2 files changed, 2 insertions(+)

commit 7acc68ea0082d91e367bd37cdc1e39a65e440647
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 24 22:47:47 2012 +0200

    Refresh our Scintilla patch for the new lexers

 scintilla/scintilla_changes.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4d1675426779de628bc47bee3591df76a8028435
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 25 16:08:32 2012 +0200

    Update Scintilla to version 3.2.3
    
    Closes #2909124, #3094431 and #3233160.

 scintilla/gtk/ScintillaGTK.cxx      |   4 +
 scintilla/include/SciLexer.h        |   7 ++
 scintilla/include/Scintilla.iface   |   7 ++
 scintilla/include/ScintillaWidget.h |   4 +-
 scintilla/lexers/LexBash.cxx        | 156 +++++++++++++++++++++++++++++++++---
 scintilla/lexers/LexCPP.cxx         |  15 +++-
 scintilla/lexers/LexOthers.cxx      |  73 -----------------
 scintilla/lexers/LexPO.cxx          | 149 ++++++++++++++++++++++++++++++++++
 scintilla/lexers/LexRuby.cxx        |  14 +++-
 scintilla/lexers/LexSQL.cxx         |  33 ++++----
 scintilla/src/Catalogue.cxx         |   2 +-
 scintilla/src/Document.cxx          |  24 +++++-
 scintilla/src/Document.h            |   6 +-
 scintilla/src/Editor.cxx            |  45 +++++------
 scintilla/src/Editor.h              |   1 +
 scintilla/src/RESearch.cxx          |   2 +-
 scintilla/src/RunStyles.cxx         |   1 +
 scintilla/version.txt               |   2 +-
 18 files changed, 402 insertions(+), 143 deletions(-)

commit d7e285d00e2b7d943f32d01e7d3308dbc86620e7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 25 13:51:14 2012 +0100

    Fix parsing colons in D (#3577788)

 tagmanager/ctags/c.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 00c2cc20eaacd9ef26e89ab0c0c7a009a8f64118
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Oct 24 17:43:26 2012 +0100

    Fix gcc missing field initializer warning

 src/printing.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a3664fae9ece396952d732cc937e63192d8c6f76
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Sep 17 16:31:28 2012 +0100

    Fix spawning [synchronous] commands on Windows
    
    Build command spawning failed sometimes when there were several
    pages of errors. In these cases the process would block for 30s and
    then abort. (Some hangs were also experienced).
    
    This fix does cause a console window to be shown for the duration of
    the spawned process. This seems acceptable compared with the old
    broken behaviour, and can be useful to abort the build command by
    closing the console window.
    
    Note: If 'env' is passed, the old broken spawning is used.

 src/build.c | 16 +++++++-------
 src/win32.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 79 insertions(+), 9 deletions(-)

commit 8855c146cc477ba2961c752fd3fe70ac268ac4a3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 22 22:40:19 2012 +0200

    Fix a use of non-const variable to hold a string literal

 tagmanager/ctags/c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6c7f69578d8e142f5994cc9cf0e0abc83a606a1b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 22 20:43:06 2012 +0200

    Parse C++11 classed enums
    
    Part of #3578557.

 tagmanager/ctags/c.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit f2f22d34ab9063852279bc6c5a45c8d3cfafdc0a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 22 20:30:18 2012 +0200

    Parse C++11 enums with type specifier
    
    Part of #3578557.

 tagmanager/ctags/c.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit a77785e3780db6830ce94c01da8ee34c54f116e7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Oct 20 14:07:13 2012 +0200

    Set style for SCE_C_STRINGRAW (C++11 raw strings)
    
    Part of #3578557.

 data/filetypes.c           | 1 +
 src/highlightingmappings.h | 1 +
 2 files changed, 2 insertions(+)

commit f04df056cdd96be7c3319993d71b8dc36fdd397c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Oct 19 21:39:38 2012 +0200

    Fix parsing of C++11 final classes
    
    Closes #3577559.

 tagmanager/ctags/c.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit b626cc93e3c819f747160589227596b0d6a53484
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 18 17:02:39 2012 +0200

    ReStructuredText: fix parsing of titles containing UTF-8 characters
    
    If a title contained multi-byte UTF-8 characters, it wasn't properly
    recognized due to the title being longer (in bytes) than the underline.
    So, fix the title length computation to properly count the characters,
    not the bytes.
    
    Note that this fix only handles ASCII, one-byte charsets and UTF-8, it
    won't help with other multi-bytes encodings.  However, the whole parser
    expects ASCII-compatible encoding anyway, and in most situations it
    will be fed the Geany's UTF-8 buffer.
    
    Closes #3578050.

 tagmanager/ctags/rest.c | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

commit 6e8e0c7bfb6597cbfbf6e5dbfa2cb9a356146c49
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 18 16:55:33 2012 +0200

    Fix display of non-ASCII tags in the symbols tree for non-UTF-8 files
    
    We used to convert the tags from the file encoding to UTF-8, but since
    we parse directly from our UTF-8 buffer, all tags are UTF-8, which lead
    to an improper conversion.

 src/symbols.c | 3 +++
 1 file changed, 3 insertions(+)

commit 49d88f0cd549635ad46613daa236f1b5d36582e0
Author: Matthew Brush <matt@geany.org>
Date:   Tue Feb 21 20:16:12 2012 -0800

    Don't ignore custom M4 files in m4/ directory

 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 306eaab3916649567c892215ad8390b9d39de82f
Author: Lex <elextr@gmail.com>
Date:   Mon Oct 15 11:56:03 2012 +1100

    Alter default and document icon setting
    
    Previous default value prevented the preceding commit from working
    (by default), oops.

 doc/geany.txt | 2 ++
 src/keyfile.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 6897cd49c69535c6563e56ae011c6f8382fec485
Author: Lex <elextr@gmail.com>
Date:   Sun Oct 14 12:55:34 2012 +1100

    Make use of theme icon a various pref.
    
    Some users want the theme icon, some dislike the icon provided by
    their theme and want the traditional Geany icon.
    
    This makes that choice a various pref.  Used a standalone global
    to avoid impacting the plugin interface and CommandLineOptions
    and GeanyStatus didn't make sense.

 src/keyfile.c |  4 ++++
 src/main.c    | 20 ++++++++++++++------
 src/main.h    |  2 ++
 3 files changed, 20 insertions(+), 6 deletions(-)

commit 4c7ca69be0642aeec9e7d3831d799215d1737b95
Author: Matthew Brush <matt@geany.org>
Date:   Sat Oct 13 15:30:41 2012 -0700

    Prefer to use Geany icon from theme over inline one
    
    Note that no attempt is made to handle when the icon theme is changed
    to update Geany's window icon (ex. using the style-set signal).

 src/main.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 220ace841ca08baff629e2443df92540aa8fca62
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Oct 12 20:40:38 2012 +0200

    Fix uncommenting multi-line comments when cursor is on a delimiter
    
    If the cursor was inside one of the comment's delimiters, the code used
    to look for another delimiter, leading to removing previous comment's
    start.  Moreover, the code assumed the delimiter will always be found,
    leading to improper deletions if a delimiter could not be found (either
    because of the above problem or because the comment wasn't terminated).
    
    Also, the code used document_find_text() which, if the searched text
    cannot be found on the requested direction, either wraps or asks the
    user whether to wrap.  Wrapping is wrong if there is more than one
    single comment in the file, and the dialog is confusing for the use
    since she didn't ask for it.
    
    So, rework the code for it to correctly find the delimiters, and not
    to wrap search or ask the user.  It is also simpler by reusing some
    already existing code.

 src/editor.c | 86 ++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 32 deletions(-)

commit 206c39cb6aa02e12bbf5d3c5b63f9fd9d95f705f
Author: Matthew Brush <matt@geany.org>
Date:   Thu Oct 11 23:01:29 2012 -0700

    Fix reshowing calltip after autoc list closed
    
    Using default priority causes Geany's reshowing idle handler to run
    before Scintilla's, changing priority to low in hopes of making it
    run after.

 src/editor.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 5bb0ca5a83fff906256d9924e8831f7c2bc24024
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Oct 12 00:10:15 2012 +0200

    Fix cursor position after comment toggling with no selection
    
    The implementation drops the non-selection code paths and simply makes
    sure both caret and anchor are placed at the same position if there
    was no selection.  This avoids having two completely different code
    paths for things that are very similar -- and alternative code paths
    were buggy.
    
    Closes #3576431.

 src/editor.c | 54 ++++++++++++++++++++++++------------------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

commit 1f244e0d54fb544caa8250a2efa634d24d0f4f15
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Sep 28 04:33:41 2012 +0200

    Set the primary-toolbar CSS class on the main toolbar under GTK3
    
    This makes the main toolbar look like other GTK3 application ones.

 src/toolbar.c | 3 +++
 1 file changed, 3 insertions(+)

commit f735e6800bddcffc1819b480601be658560f0256
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Sep 28 04:30:57 2012 +0200

    Add GTK3 version of our custom styles
    
    Although GTK3 still have gtk_rc_parse_string(), it doesn't work anymore
    for our overrides, so register proper CSS for them.

 Makefile.am    |  7 ++++++-
 configure.ac   |  1 +
 data/geany.css | 25 +++++++++++++++++++++++++
 src/ui_utils.c | 20 ++++++++++++++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)

commit 7d0adef31b60b4b7d042d708754d01caffdf7e4f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 14:40:24 2012 +0200

    Use GtkFontChooserDialog on GTK >= 3.2 for consistency
    
    GtkFontButton uses GtkFontChooserDialog on GTK 3.2 so the UI is more
    consistent if we use it explicitly too, and GtkFontSelectionDialog
    is somewhat broken on 3.4.

 src/dialogs.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit d6fba7ac8244ebf077e76468a5072552fa02aa89
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 16 15:57:04 2012 +0200

    Make GeanyWrapLabel work with GTK3
    
    Although theoretically GtkLabel from GTK3 should be able to replace
    GeanyWrapLabel altogether, a bug [1] with it makes it use way too much
    space in our about dialog (and possibly other places), making it not
    really usable.
    
    So, port the GeanyWrapLabel hack to GTK3, with the appropriate
    additional hacks for it to work.  At least it looks good and don't
    seem to have resizing issues now.
    
    [1] https://bugzilla.gnome.org/show_bug.cgi?id=657621

 src/geanywraplabel.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++---
 src/geanywraplabel.h |  25 -------------
 2 files changed, 96 insertions(+), 31 deletions(-)

commit caf207c36a54814b57b83ca69ec007eaa7bb6f13
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 19:39:02 2012 +0200

    Don't use old GTK1-style typesystem
    
    This fixes the SCINTILLA_CLASS() and IS_SCINTILLA() macros on GTK3.
    No harm on GTK2, those macros are available since 2.0.
    
    This also makes those macros more consistent with the SCINTILLA()
    macro that already uses the proper GObject calls.
    
    Backported from Scintilla HG: 9cd7cf1d9af73d50b0423ed34a6693bbf7f57ac8

 scintilla/include/ScintillaWidget.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 18394513634c33152c07878b7f3a436303bbab87
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 16 00:18:58 2012 +0200

    Fix a packing issue on GTK3
    
    GTK3 changed the default for expand and fill, so explicitly set them.

 src/ui_utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6c942c1436fa91c715cc90ce0d046627e75e3306
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 16 00:17:18 2012 +0200

    Prevent plugins built against GTK2 Geany from loading in GTK3 Geany

 src/plugindata.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 42b3629aafb223e66695a8079397c16ec39760b0
Author: Lex Trotman <elextr@gmail.com>
Date:   Tue Oct 9 13:56:13 2012 +1100

    Fix sign comparison warnings
    
    GTK uses a signed page_nr parameter to callback draw_page despite
    describing it as 0 based, cast it to unsigned for comparisons to
    array len which is also unsigned.

 src/printing.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 394f223b493a4be4185ca35a524bb69f67b3cea8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 16 00:12:19 2012 +0200

    Load GTK3 version of the VTE library when built against GTK3

 src/vte.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 3ae884c13f0eddd5a8533fefddda8a566196ad24
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 16 00:11:31 2012 +0200

    Make X11 backend specific code GTK3-proof

 src/socket.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit c5985f0cd172f6196c0966eaa14e4c7ea5799391
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 16 00:10:24 2012 +0200

    Add ::draw handler for GTK3 where we have ::expose-event handlers

 src/editor.c      | 12 ++++++++++++
 src/keybindings.c | 12 ++++++++++++
 src/sidebar.c     |  8 ++++++++
 3 files changed, 32 insertions(+)

commit fa5a00b48b0270e13662660cd9ab40fe8029de19
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 16 00:07:46 2012 +0200

    Map GeanyWrapLabel to GtkLabel on GTK3
    
    The GTK3 version of GtkLabel provides what GeanyWrapLabel is for given
    the appropriate settings are set, so no need to our own widget -- that
    would require being updated to support GTK3 anyway.

 src/geanywraplabel.c |  3 +++
 src/geanywraplabel.h | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

commit 3e649dddef93723ebc2487d30023fc5f62d894ca
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 16 00:04:25 2012 +0200

    Prevent most GTK3 deprecation warnings that can't be fixed on GTK2
    
    Map the various horizontal and vertical deprecated constructors
    to their GtkOrientation-based equivalents on GTK3 to prevent most
    deprecation warnings.

 src/gtkcompat.h | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit 6409840d4af0f59c18f392d39952ac114bde4052
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Sep 15 23:40:13 2012 +0200

    Get rid of GtkComboBoxEntry API and use GtkComboBoxText API
    
    Use the GtkComboBoxText API and the GtkComboBoxEntry replacement API
    and map those to the old equivalents if not available.
    
    This changes the type exposed by ui_combo_box_add_to_history() from
    GtkComboBoxEntry to either GtkComboBox (under GTK2) or GtkComboBoxText
    (under GTK3).  This should not be too much of an issue since
    GtkComboBoxEntry and GtkComboBoxtext are subclasses of GtkComboBox,
    but this will still emit warnings when when the calling code passes
    a GtkComboBoxEntry pointer to ui_combo_box_add_to_history().
    
    However, this requires the calling code to use the same mapping as we
    do (GtkComboBoxText = GtkComboBox on GTK2, even on 2.24), or things
    will blow and it'll be hard to understand why.  This wouldn't be an
    issue if the calling code includes our gtkcompat.h header everywhere
    it deals with combo boxes, which will be the case if it includes the
    Geany headers everywhere but probably won't otherwise.  Oh dear.
    
    A possible kind of workaround may be for ui_combo_box_add_to_history()
    to do type-checking on its argument and use the actually correct API
    for that type.

 plugins/filebrowser.c |  9 +++++----
 plugins/saveactions.c |  8 ++++----
 src/Makefile.am       |  1 +
 src/dialogs.c         | 11 ++++++-----
 src/gtkcompat.h       | 31 +++++++++++++++++++++++++++++++
 src/plugindata.h      |  3 ++-
 src/search.c          | 33 ++++++++++++++++-----------------
 src/stash.c           | 24 ++++++++++++++++++++++--
 src/ui_utils.c        | 12 ++++++------
 src/ui_utils.h        |  6 ++++--
 10 files changed, 97 insertions(+), 41 deletions(-)

commit 5ec0eb477d51c1ccfa67f1bad606eb6eb18c82eb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Sep 15 14:21:07 2012 +0200

    Guard removed dialog separators on GTK3
    
    GtkDialog separators sere deprecated on GTK 2.22 and remove on 3.0,
    so define them to dummy values on GTK3.
    
    We don't get rid of them altogether because GTK 2.16 we depend on
    probably has separators enabled by default and we want to remove them.

 src/gtkcompat.h | 8 ++++++++
 1 file changed, 8 insertions(+)

commit c54639c0e12b7ba63888c612a855ce3a76e2bd00
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Sep 15 14:01:18 2012 +0200

    Include keysyms compatibility header on GTK3

 src/gtkcompat.h | 3 +++
 1 file changed, 3 insertions(+)

commit a763e307f7f211b46589738e6476b72bb1d2a0de
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Sep 15 13:52:49 2012 +0200

    Don't access GtkWidget fields directly
    
    Since many accessor are new in GTK versions we don't depend on, add
    a header that defines them to the direct access if they aren't
    available.

 plugins/saveactions.c |  3 ++-
 plugins/splitwindow.c |  5 +++--
 src/Makefile.am       |  1 +
 src/build.c           |  3 ++-
 src/callbacks.c       |  3 ++-
 src/editor.c          |  3 ++-
 src/gb.c              |  3 ++-
 src/gtkcompat.h       | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/keybindings.c     | 11 +++++-----
 src/notebook.c        | 11 +++++-----
 src/search.c          |  7 ++++---
 src/ui_utils.c        |  9 ++++----
 src/vte.c             |  3 ++-
 13 files changed, 94 insertions(+), 25 deletions(-)

commit 484cc3adacfe6594050295dc7ca0f1c357f44570
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Sep 15 13:41:46 2012 +0200

    Add configure flag --enable-gtk3 to build against GTK 3.x

 configure.ac | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

commit eeddd6f720e1ded79beeec9203b698c9191de624
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Sep 29 20:18:19 2012 +0200

    Move custom styles to a resource file

 Makefile.am      |  3 ++-
 data/geany.gtkrc | 23 +++++++++++++++++++++++
 src/notebook.c   | 11 -----------
 src/search.c     | 28 ----------------------------
 src/ui_utils.c   | 26 ++++++++++++--------------
 wscript          |  1 +
 6 files changed, 38 insertions(+), 54 deletions(-)

commit 3070738df8e30cc62be877aba3d8bd43a5eef1bc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Oct 6 01:32:54 2012 +0200

    Make wordchars have precedence over whitespacechars
    
    This makes the "wordchars" setting from filetypes.common and each
    specific filetype override filetype.common's "whitespace_chars"
    setting, rather than it overriding filetype-specific "wordchars".
    
    This makes the it easy to chose filetype-specific "wordchars", where
    before user had not only to update this setting, but also the
    filetype.common "whitespace_chars" setting if it listed one or more of
    the new characters for the change to actually have an effect -- and
    changing "whitespace_chars" for every filetype.
    
    Closes #3429368.

 doc/geany.txt      |  3 +--
 src/highlighting.c | 30 ++++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

commit 565c9176881f8d8a6d308a047c762e9e7cfdbbd4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Oct 6 00:55:03 2012 +0200

    Consider dash (-) when looking for the word to complete for CSS

 src/editor.c | 2 ++
 1 file changed, 2 insertions(+)

commit 2297badbd7ca808b90fc29db3d48a88aa3ded59f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Oct 5 12:43:10 2012 +0200

    Use "scala" extension for Scala
    
    Closes #3574723.

 data/filetype_extensions.conf | 2 +-
 data/filetypes.Scala.conf     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 64a47b9cb691e02a00d013374856aa31708bac3b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Sep 26 19:30:18 2012 +0200

    Allow to switch message window orientation to place it on the right

 data/geany.glade | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/keyfile.c    |  5 ++++
 src/main.c       |  3 ++
 src/prefs.c      |  3 ++
 src/ui_utils.h   |  1 +
 5 files changed, 94 insertions(+), 2 deletions(-)

commit 474e60b6fad22c75c57af3a6700d7bc47fceee10
Author: trongthanh <trongthanh@gmail.com>
Date:   Sun Sep 30 11:13:43 2012 -0700

    Add more CSS3 keywords

 data/filetypes.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 85cb6d527c859729d592fd33c34a3730c593d076
Author: trongthanh <trongthanh@gmail.com>
Date:   Sun Sep 30 11:08:13 2012 -0700

    Improve CSS highlighting

 data/filetypes.css | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit e70d9e5e05c6329d201dfaae19858decb0474e21
Author: trongthanh <trongthanh@gmail.com>
Date:   Sun Sep 30 10:57:38 2012 -0700

    Fix JavaScript ident/keyword highlighting in HTML filetype

 data/filetypes.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2c6c210c6f1ed8d0b5ceacabdc67c497ab863f59
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 30 15:46:59 2012 +0200

    Fix detection of keywords when followed by a semicolon
    
    Closes #2130612.

 tagmanager/ctags/ruby.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c1a7b1b475a28c73f830b76de7d1dedf5948df3f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Sep 28 03:27:35 2012 +0200

    Fix various packing issue affecting GTK3 but compatible with GTK2

 plugins/filebrowser.c |  2 +-
 plugins/saveactions.c |  2 +-
 plugins/splitwindow.c |  2 +-
 src/dialogs.c         | 10 +++++-----
 src/highlighting.c    |  2 +-
 src/plugins.c         |  2 +-
 src/pluginutils.c     |  2 +-
 src/project.c         |  2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

commit 972b34e49ab5db30ae07b099e89c19607e5f581b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Sep 26 22:54:15 2012 +0200

    Keep caret and anchor position upon indent and unindent
    
    Closes #3167355.

 src/editor.c | 68 +++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 28 deletions(-)

commit d6bbdab1661dd798f0d85da3d7f814247c59112c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Sep 26 21:07:59 2012 +0200

    Update of Basque translation

 po/eu.po | 692 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 360 insertions(+), 332 deletions(-)

commit 00ccac5b78b2e3ea7501906ffa5e0186af01b4f1
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Sep 25 19:58:39 2012 +0200

    Update of Italian translation

 po/it.po | 851 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 433 insertions(+), 418 deletions(-)

commit bf233bc05590acf2c4ac6ecdbca9f9a30b5e5662
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 25 16:47:00 2012 +0200

    JavaScript parser: create class tag for variable with children methods
    
    If we generated methods, properties or class children tags for a
    variable, generate a class tag for the variable itself so the children
    aren't orphaned.

 tagmanager/ctags/js.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 5df551b1ce7d2192f8ddec8eda6da4ac05662969
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 25 16:45:57 2012 +0200

    JavaScript parser: fix parsing non-method properties
    
    If a property value had more than one token, the parser choked on it
    and failed to parse further properties of the object.  Fix that by
    properly skipping the property's value.  If that value is a sub-object,
    parse it recursively.
    
    Closes #3470609.

 tagmanager/ctags/js.c | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

commit dc6e4f272309fa51ad0f2cdccc448adeef4c083d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 25 02:10:00 2012 +0200

    JavaScript parser: lowercase "object" isn't a keyword
    
    Closes #3036476.

 tagmanager/ctags/js.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit b9ca95c381624a288a7ea733624f36a9af10212a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 25 00:38:18 2012 +0200

    JavaScript parser: fix some unterminated statement corner case issues
    
    This fixes parsing of the following unterminated statements:
    
    	if () {
    		foo = 42
    	}
    
    	if () {
    		foo = new Object()
    	}
    
    	if () {
    		foo = ({a:1,b:2})
    	}

 tagmanager/ctags/js.c | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

commit 205bab83d7d7bbedc16f00f9b6b5b71199d4fde8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 25 00:18:27 2012 +0200

    JavaScript parser: properly consume closing brace after a block in findCmdTerm()

 tagmanager/ctags/js.c | 1 +
 1 file changed, 1 insertion(+)

commit 74890cc3080a87c95a19d28183a022a9219afcab
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 24 19:27:14 2012 +0200

    JavaScript parser: Simplify parseJfFile() code (no functional changes)

 tagmanager/ctags/js.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

commit 297bca3799a99f68d177e1105d79a69a7d9ef103
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 24 19:02:38 2012 +0200

    JavaScript parser: Don't drop the token after an unbraced if
    
    If an `if` haven't had braces, the code used to check itself for an
    `else` after it, eating the next token if it wasn't actually an `else`.
    
    So, drop the check for the else altogether since parseLine() handles
    `else`s by calling parseIf() anyway.
    
    This fixes constructs like:
    
    	if (foo)
    		bar();
    	function baz() {
    		// ...
    	}
    
    Closes #3568542.

 tagmanager/ctags/js.c | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

commit 66888d580f71e39e0a5f8b56083ccb22eea2d1b5
Author: Oleg Eterevsky <oleg@chromium.org>
Date:   Mon Sep 24 18:47:07 2012 +0400

    In ctags JavaScript parser fix recognizing functions inside methods

 tagmanager/ctags/js.c | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

commit effc8ef86f475db15582ba0e91a9d8ce0ebfd55f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 24 12:12:45 2012 +0200

    Add proper scope for JS tags including their own context
    
    This makes `Foo.bar = function()` properly report a function tag "bar"
    with scope "Foo" rather than a function tag "Foo.bar" with no scope.
    
    Part of #3570192.

 tagmanager/ctags/js.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

commit be45924f7c04fcc0f511168b9fdb1c8a2d940a5c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Sep 22 18:13:07 2012 +0200

    JavaScript parser: don't set token position information again and again
    
    There is no need to set the token position information in the loop
    searching for the initial token character, simply do that when we
    finally found the token start.

 tagmanager/ctags/js.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 772509e898a6847117e28156859483993376118e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Sep 22 17:52:29 2012 +0200

    ctags: fix improper use of "const" type qualifier
    
    The external declaration of "File" in read.h (defined in read.c) was
    improperly tagged as "const" for it not to be modifiable outside of
    read.c.  Although it is good to protect this global variable against
    improper modification, the use of "const" here makes it perfectly valid
    for the compiler to assume that the fields in this structure never
    changes during runtime, thus allowing it to do optimizations on this
    assumption.  However, this assumption is wrong because this structure
    actually gets modified by many read.c's functions, and thus possibly
    lead to improper and unexpected behavior if the compiler sees a window
    for optimizing fields access.
    
    Moreover, protecting "File" as it was with the "const" type qualifier
    required a hack to be able to include read.h in read.c since "const"
    and non-"const" declarations conflicts.
    
    Actually, at least the JavaScript parser did suffer of the issue,
    because it calls getSourceLineNumber() macro (expanding to a direct
    "File" member access) several times in one single function, making it
    easy for the compilers to cache the value as an optimization.  Both GCC
    and CLang showed this behavior with optimization enabled.  As a result,
    the line numbers of JavaScript tags were often incorrect.

 tagmanager/ctags/read.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

commit 9ef34bbe0cc9a66b3be062da0dd98a713d74af32
Author: Lex Trotman <elextr@gmail.com>
Date:   Sat Sep 22 16:05:51 2012 +1000

    Fix pointer warning
    
    GCC 4.7.1 gives a incompatible pointer warning because gtk_adjustment_new
    returns a GObject* not a GtkAdjustment* (new compiler default).

 src/stash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5ef6e1627cbe639e5f2b9d974f384c6a5b4eeec2
Author: Lex Trotman <elextr@gmail.com>
Date:   Sat Sep 22 14:13:14 2012 +1000

    Fix multiline comments at end of file
    
    Multiline comments did not work at end of file because there is no
    style there so also check if at end of file as well as style.
    Closes #3026691

 src/editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fbb89f523af47b35e238678d348cfa98e56c760a
Author: Lex Trotman <elextr@gmail.com>
Date:   Sat Sep 22 13:40:33 2012 +1000

    Remove illegal signal handling
    
    The SIGTERM handler called the standard exit callback which uses
    functions that are illegal in signal handlers.  Commented out as
    a prelude to full removal if no use case can be made.

 src/main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit e5e37601572f86b9c5712ace5e1d3b16caac67b2
Author: Lex Trotman <elextr@gmail.com>
Date:   Sat Sep 22 12:47:29 2012 +1000

    Use faster squiggle underlining
    
    Geany performance suffered with a lot of error underlining visible.
    Matthew Brush developed an improved implementation that was accepted
    into Scintilla, this selects that implementation.

 src/highlighting.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 877b0477c401e9c359cbf93e04989b7aeccc257e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Sep 21 18:39:15 2012 +0200

    Set scope information for JavaScript tags
    
    Instead of adding the scope to the tag name, properly add it as the
    tag's scope.
    
    Closes #3570192.

 tagmanager/ctags/js.c   | 35 ++++++++++++-----------------------
 tagmanager/src/tm_tag.c |  3 ++-
 2 files changed, 14 insertions(+), 24 deletions(-)

commit 2d83a85eb74cc515853ef0ec68da6832ba99c750
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 23:15:11 2012 +0200

    Update NEWS for a few recently fixed bugs

 NEWS | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit b886ac1b2e601248238a5ab85848d78108e3550e
Merge: afb1eaa 8289e8f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 22:59:52 2012 +0200

    Merge branch 'improve-scope-detection'

commit 8289e8f96289d0c4ca00231d1d2fa0e87179641f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 22:51:36 2012 +0200

    Report scope including classes, namespaces and alike
    
    Don't only match the current function as the current scope, but also
    classes, namespaces and others containers.
    
    Closes #1996778.

 src/symbols.c  | 14 ++++++++++++++
 src/symbols.h  |  2 ++
 src/ui_utils.c |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

commit 491a45f614bc1c4633168e97a06734eff6886601
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 22:41:24 2012 +0200

    Improve symbols_get_current_function() a lot and make it more flexible
    
    Finding the current function now better handles the case the current
    line is after a function but outside its scope, and many other issues
    the scope reporting had.

 src/symbols.c | 164 ++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 101 insertions(+), 63 deletions(-)

commit 9d2dab8fcf4aa4d2b890724b44d483d273732b3c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 20:22:52 2012 +0200

    Fix an off-by-one issue in sci_get_position_from_line()
    
    Scintilla counts lines from 0 but TagManager from 1, so convert them.

 src/callbacks.c | 2 +-
 src/symbols.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit d83bd409388313503dcad58cb6d601bf92e64fbc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 20:07:45 2012 +0200

    Add tm_get_current_tag()

 tagmanager/src/tm_workspace.c | 23 +++++++++++++++--------
 tagmanager/src/tm_workspace.h |  7 +++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

commit afb1eaaa0186d60723de40ad32ecc14b9267fe69
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 14:26:39 2012 +0200

    Remove improper caching of the current function
    
    The code assumed that if both old and new fold levels were above the
    minimal function fold level the function couldn't have been changed,
    which is wrong if a function can appear both inside and outside another
    fold level (e.g. inside or outside a class).

 src/symbols.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit adbd162c7b8ca3e9e6f01ee1cc03c96c84c722b1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 03:02:25 2012 +0200

    Also consider tags up to date if realtime parsing is active
    
    This makes symbols_get_current_function() more accurate by using TM
    data even on a modified file if realtime tag parsing is enabled, thus
    if the data has reasonable chances to be correct.

 src/symbols.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 1cfa44ff629f8dbcbf4153cce97cfccf185f9483
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 02:57:17 2012 +0200

    Make tm_get_current_function() find methods too

 tagmanager/src/tm_workspace.c | 2 +-
 tagmanager/src/tm_workspace.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit eed6e25a0e8ad7e21aeeefa1d64a43865400cad9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 02:53:15 2012 +0200

    Don't duplicate the kind names and letters

 tagmanager/ctags/python.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 022524ba2615695425cca2f4b919b74a96cf7707
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 02:49:08 2012 +0200

    Report Python class methods as methods rather than members
    
    This makes the Python kinds more consistent with other parsers and
    allows to find Python methods when filtering on tm_tag_method_t.

 tagmanager/ctags/python.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 17396aaa999a6a2ce91f190d7aac56492c945712
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 17 02:29:55 2012 +0200

    Fix a memory leak in tm_get_current_function()

 tagmanager/src/tm_workspace.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 2e725999cc40f7ea668887b8e9e2f949c4892cd4
Merge: df3d35d e020b04
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Sep 16 21:58:05 2012 +0200

    Merge update of Russian translation from m1kc.

commit df3d35dab11a1f3afe99c656d8c7ef06d8ab4a23
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Sep 15 22:45:38 2012 +0200

    No need to update GdkDragContext:action
    
    Updating GdkDragContext:action is not needed and this field is private
    anyway.

 src/notebook.c | 5 -----
 1 file changed, 5 deletions(-)

commit b58995c9fc8c183ef37a31ca74ba44336a6c55ce
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Sep 15 15:52:42 2012 +0200

    Don't access private field GtkNotebook::event_window

 src/notebook.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit e020b04754cd3f90d71996be687fc9431d72e05a
Author: m1kc <m1kc@yandex.ru>
Date:   Sun Sep 16 00:03:13 2012 +0400

    Fix the rest of the Russian strings.

 po/ru.po | 342 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 156 insertions(+), 186 deletions(-)

commit 978f7703983358f4a25c67f8a78780e6da6f5f4e
Author: m1kc <m1kc@yandex.ru>
Date:   Sat Sep 15 22:31:14 2012 +0400

    Fix some more Russian strings.

 THANKS   |   1 +
 po/ru.po | 290 +++++++++++++++++++++++++++++++--------------------------------
 2 files changed, 145 insertions(+), 146 deletions(-)

commit d807eff73d61de95825d548471e0f00d50a6e6e9
Author: m1kc <m1kc@yandex.ru>
Date:   Sat Sep 15 13:50:36 2012 +0400

    Fix some Russian strings.

 po/ru.po | 368 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 157 insertions(+), 211 deletions(-)

commit 987c13e26fe228a004bb2fe4d20e08264a419f65
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Sep 15 19:10:53 2012 +0200

    Added Basque translation provied by Asier Iturralde Sarasola

 THANKS      |    1 +
 po/eu.po    | 5443 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/about.c |    1 +
 3 files changed, 5445 insertions(+)

commit 8427ab08c2d5531221512c8b2151c259eadb027c
Author: m1kc <m1kc@yandex.ru>
Date:   Sat Sep 15 13:50:36 2012 +0400

    Fix some Russian strings.

 po/ru.po | 368 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 157 insertions(+), 211 deletions(-)

commit f1e88ca311af3c3ced49f4b348d88140a74302b0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Sep 13 16:07:44 2012 +0200

    Ruby parser: don't create an extra scope after "for .. in .. do"
    
    When "do" appears as the separator after a "for", "while" or "until"
    construct, don't improperly make it start its own scope too.

 tagmanager/ctags/ruby.c | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

commit faeeaf4bd2ab906441d266baf93b57a13864654a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Sep 12 00:35:02 2012 +0200

    Check the VTE library we're loading actually have all symbols we need
    
    This prevents a crash if the VTE library we happen to load lacks a
    symbol we need, which can happen e.g. if the user passed an improper
    library to the --vte-lib command-line option or if the VTE library is
    loadable but broken.

 src/vte.c | 85 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 30 deletions(-)

commit da5bb7f0e1aa5d5bf861697d6d54bff88b177a34
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 20:15:00 2012 +0200

    Don't access GtkColorSelectionDialog fields directly
    
    Also don't hack around and handle clicks on the dialog's buttons but
    rather simply handler the dialog's response.

 src/tools.c | 58 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

commit 72db3a711e9748c1fbcdd4e4cccb64e4f956a916
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 20:13:05 2012 +0200

    Don't use deprecated GtkObject

 src/stash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 96afed1e9c906ed76d4f644eefb34cb16cdaec53
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 20:03:19 2012 +0200

    Don't access GtkFontSelectionDialog fields directly
    
    Also don't hack around and handle clicks on the dialog's buttons but
    rather simply handler the dialog's response.

 src/dialogs.c | 56 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

commit 49f6ebbd0a3eb4967c6a7a50771573a42b5bf6cc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 19:46:47 2012 +0200

    Don't use gtk_widget_hide_all(), deprecated in 2.24

 src/build.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 926744b4b735c88ad449ce419f9ebee4442a1802
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 17:20:58 2012 +0200

    Don't use pre-GObject types and macros

 src/vte.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8b181f7c79673350803891d4d6bd70a7af62eb29
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 17:15:53 2012 +0200

    Don't access GtkSelectionData fields directly

 src/notebook.c | 5 +++--
 src/toolbar.c  | 4 ++--
 src/vte.c      | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

commit 593fef7fa0b9c799c58c1e8e9b36193572333b6f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 17:12:35 2012 +0200

    Don't access GtkWidget:parent directly

 src/stash.c    | 2 +-
 src/ui_utils.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit c7f699736148535253b92ec7f3dd256a905b53d9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 16:55:13 2012 +0200

    Don't access GtkNotebook fields directly

 src/notebook.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2d878c8a5d307b0c90f6b3d43b6c6fd236812aba
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 16:52:19 2012 +0200

    Don't use deprecated GtkNotebookPage

 src/callbacks.c | 6 +++---
 src/callbacks.h | 6 +++---
 src/notebook.c  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

commit 4d1673538099b29782292ba92d3605e48b8214f0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 16:48:57 2012 +0200

    Don't access GtkDialog fields directly

 src/about.c    | 4 ++--
 src/gb.c       | 4 ++--
 src/prefs.c    | 4 ++--
 src/search.c   | 4 ++--
 src/ui_utils.c | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

commit 3b14cca451af830bae608fc0e25078280ce6423e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 16:39:34 2012 +0200

    Don't use long-deprecated gtk_widget_{ref,unref}()

 plugins/splitwindow.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 5ada77df700ab01b01175cac565b0f36502086fb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Sep 11 16:37:01 2012 +0200

    Don't use deprecated gtk_box_pack_start_defaults()

 plugins/saveactions.c | 2 +-
 src/project.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 9f479b861a2405f23fdd117b3eb54ed269688da4
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Sep 12 19:30:56 2012 +0200

    Regenerate Python tag list
    
    Generated against a clean Python 2.7 installation.

 data/python.tags | 52 +++++-----------------------------------------------
 1 file changed, 5 insertions(+), 47 deletions(-)

commit baafa6325c344bbc2c2370835c9be6968d1a4a67
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Sep 12 19:29:21 2012 +0200

    Strip more tags which start with a keyword

 scripts/create_py_tags.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

commit 8171af611fefe24561fee70cfe5785afd649c595
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Sep 9 16:05:58 2012 +0200

    Don't set the focus to the editor widget when clicking a symbol while holding Control
    
    When clicking a symbol in the Symbols sidebar and holding the Control modifier key, don't
    set the focus to the editor widget so further navigation in the Symbols sidebar with keys
    is possible.

 src/sidebar.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 49dafc85361122fbcc84da5aa3e5172b1f9ab20f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Sep 6 20:43:49 2012 +0200

    Use namespaces icon for Ruby modules
    
    It's not perfect but better than nothing since other tags have icons.

 src/symbols.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8f0ddfe4effdddd2fe6cbda30b320f917ade9346
Merge: a5edf57 b82134e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Sep 6 18:44:40 2012 +0200

    Merge branch 'printing-with-scintilla'
    
    Closes #3475444, #2804000 and #2629121.

commit a5edf57a17d491b2e43f69d841ab651c8b1079b7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Sep 6 14:52:31 2012 +0100

    Don't regenerate deps.mak files on 'make clean' (Windows makefile)

 makefile.win32 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 00714db69c3ce8f8ba2d40be62c596045f1001d7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 5 16:47:53 2012 +0100

    Improve collapsing fold behaviour when start point is offscreen
    
    When collapsing a fold range whose starting line is offscreen,
    scroll the starting line to display at the top of the view.
    Otherwise it can be confusing when the document scrolls down to hide
    the folded lines.

 src/editor.c      | 13 +++++++++++++
 src/sciwrappers.c |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

commit 654f07219f112f3c487675ceb70afda766684a81
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Sep 3 02:31:52 2012 +0200

    Update Scintilla to version 3.2.2

 NEWS                              |  2 +-
 scintilla/gtk/PlatGTK.cxx         |  2 +-
 scintilla/include/Platform.h      |  5 ++++
 scintilla/include/Scintilla.h     |  5 ++++
 scintilla/include/Scintilla.iface | 14 +++++++++++
 scintilla/lexers/LexHTML.cxx      |  2 +-
 scintilla/lexers/LexLua.cxx       |  2 +-
 scintilla/lexers/LexOthers.cxx    | 20 ++++++++-------
 scintilla/lexers/LexYAML.cxx      |  2 +-
 scintilla/src/AutoComplete.cxx    |  4 ++-
 scintilla/src/AutoComplete.h      |  2 ++
 scintilla/src/CallTip.cxx         | 18 ++++++++------
 scintilla/src/CallTip.h           |  5 ++++
 scintilla/src/Editor.cxx          | 50 ++++++++++++++++++++++++++++++++------
 scintilla/src/Editor.h            |  4 +++
 scintilla/src/Indicator.cxx       | 51 ++++++++++++++++++++++++++++++---------
 scintilla/src/LineMarker.cxx      | 12 ++++-----
 scintilla/src/LineMarker.h        |  2 +-
 scintilla/src/ScintillaBase.cxx   |  4 +--
 scintilla/src/XPM.cxx             | 13 +++++-----
 scintilla/src/XPM.h               |  6 ++++-
 scintilla/version.txt             |  2 +-
 22 files changed, 169 insertions(+), 58 deletions(-)

commit f53f37c578161c0b780443f1a800bb67a6386820
Author: Lex Trotman <elextr@gmail.com>
Date:   Mon Sep 3 18:36:39 2012 +1000

    Save encoding in session as text
    
    Since reading locale and reading encodings from within files by regex
    can find encodings not on the Geany list, saving as text ensures that
    any encoding found can be saved in the session, otherwise a file can
    be opened but will not re-open because the encoding cannot be saved
    in the session.  Since numeric encoding names exist prefix the text
    name by 'E' so they can be distinguished from saved numeric indexes.

 src/keyfile.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

commit c05f1bdd448e2e2b327b69224608a1e7c01d5b99
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 2 20:28:30 2012 +0200

    Remove a suspect ungetc() call in VHDL parser
    
    This ungetc() call don't look legitimate and actually leads to lots
    of warnings about ungetc() being called when another character was
    already backed up.

 tagmanager/ctags/vhdl.c | 1 -
 1 file changed, 1 deletion(-)

commit e469aa27e06b33e2db0a98bc8d0a969b4b47612b
Author: Miguel Sánchez de León Peque <msdeleonpeque@gmail.com>
Date:   Sun Sep 2 19:12:42 2012 +0200

    Update VHDL parser to display blocks in the symbols list

 src/symbols.c           | 2 +-
 tagmanager/ctags/vhdl.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

commit 66b93d2d8d1f60b57bd87d7250a00c3815a78bae
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 2 14:37:51 2012 +0200

    Fix "mark all" search feature when using regular expressions
    
    Use the proper, full-featured, regular expression engine we use
    everywhere else rather than Scintilla's stripped-down one.
    
    Closes #3564132.

 NEWS         | 3 +++
 src/search.c | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

commit 69d8295c5ea91f88a33ec41c523c6c9f47e346c9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Sep 2 14:14:52 2012 +0200

    Don't try to unref NULL regex

 src/search.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 13410c0e5a1ba7ba2bbda6398a25074ff9faa3a6
Author: YosefOr <yosefor3@walla.com>
Date:   Fri Aug 31 14:47:36 2012 +0300

    Update po/he.po
    
    Translation error correction

 po/he.po | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 0627817c7b1a133c273a8db3bfbc7bd9e3013125
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Aug 29 23:04:50 2012 +0200

    Regenerate Python tag list
    
    Generated against a clean Python 2.7 installation.

 data/python.tags | 8000 ++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 5703 insertions(+), 2297 deletions(-)

commit 883ce3acb6cb760e8b8ef3238141243f74da8878
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Aug 29 23:03:25 2012 +0200

    Add method to generate also tags for __builtins__
    
    This way we get easily also tags for standard exceptions and a few builtin types.

 scripts/create_py_tags.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

commit 29f0d02be3072c25e1ccc27258621703830cc623
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Aug 29 22:40:54 2012 +0200

    Add a warning about running this script with its potential side effects

 scripts/create_py_tags.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit f1cb61f6cbe7e52c33eed60fa36b40826a792258
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Aug 29 22:22:57 2012 +0200

    Ignore tag names starting a Python keyword
    
    This removes tags like 'pass_', 'pass_stmt' or 'return_stmt' which are quite annoying
    when typing the actual keywords and pressing Enter afterwards.
    Also add some more modules and packages to the ignore list to avoid weird side effects
    when importing them (even though antigravity is funny).

 scripts/create_py_tags.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

commit fd8b20c80b5aa3a0e75b5662cf2fcba769d7d937
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Wed Aug 29 22:14:49 2012 +0200

    Add 'memoryview' identifier as found in Python2.7

 data/filetypes.python | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b82134e021adf42e171d025d1f3058197be67ab4
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Aug 27 21:28:46 2012 +0200

    printing: Fix line number margin border position

 src/printing.c | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

commit aba3f9744897ec5997f075f16261e65f942701d8
Author: YosefOr <yosefor3@walla.com>
Date:   Sun Aug 26 20:47:01 2012 +0300

    Update po/he.po
    
    Update of Hebrew translation

 po/he.po | 204 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 104 insertions(+), 100 deletions(-)

commit 2b163c367d564474b5495a13963af806469b2f41
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Aug 25 10:32:14 2012 +0200

    Adding Hebrew translation

 THANKS      |    1 +
 po/he.po    | 5539 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/about.c |    1 +
 3 files changed, 5541 insertions(+)

commit 484f6fcdef245a1501bc93a124a68f0f3d273b5d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Aug 25 16:02:21 2012 +0200

    Make sure to only use as much data as it was actually read
    
    When reading a C macro, make sure to only use as much byes we actually
    got and not as much as we requested.  This should not be a problem
    anymore now 61c5216 fixed a too long read, but it's safer anyway.

 tagmanager/ctags/get.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 61c5216083a916af46c1150f1b4f4a7102c4a25b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Aug 25 15:50:09 2012 +0200

    Fix an off-by-one issue in C macro parsing code
    
    Closes #3556536.

 tagmanager/ctags/get.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 9817c1420201554b5c2f9841f5fb192dd7ce00ba
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 24 23:26:11 2012 +0200

    Add a few missing Haxe keywords
    
    Closes #3448664.

 data/filetypes.haxe | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ce742b45dd103435a77f8ab391bdaec67cde36a0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 24 20:20:09 2012 +0200

    Remove spurious semicolons

 src/build.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit d80bc7ce56d8f69b1cfe933bc02c4d58dadc2a7e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Aug 24 19:25:57 2012 +0200

    Update FSF address
    
    Closes #3557875.

 COPYING                     |  8 ++++----
 doc/geany.html              | 10 +++++-----
 doc/geany.txt               |  8 ++++----
 doc/plugins.dox             |  7 +++----
 doc/pluginsignals.c         |  7 +++----
 doc/pluginsymbols.c         |  7 +++----
 plugins/classbuilder.c      |  7 +++----
 plugins/demoplugin.c        |  7 +++----
 plugins/export.c            |  7 +++----
 plugins/filebrowser.c       |  7 +++----
 plugins/geanyplugin.h       |  7 +++----
 plugins/htmlchars.c         |  7 +++----
 plugins/saveactions.c       |  7 +++----
 plugins/splitwindow.c       |  7 +++----
 src/about.c                 |  6 +++---
 src/about.h                 |  6 +++---
 src/build.c                 |  6 +++---
 src/build.h                 |  6 +++---
 src/callbacks.c             |  6 +++---
 src/callbacks.h             | 28 ++++++++++++++--------------
 src/dialogs.c               |  6 +++---
 src/dialogs.h               |  6 +++---
 src/document.c              |  6 +++---
 src/document.h              |  6 +++---
 src/documentprivate.h       |  7 +++----
 src/editor.c                |  6 +++---
 src/editor.h                |  6 +++---
 src/encodings.c             |  6 +++---
 src/encodings.h             |  6 +++---
 src/filetypes.c             |  6 +++---
 src/filetypes.h             |  6 +++---
 src/filetypesprivate.h      |  7 +++----
 src/gb.c                    |  6 +++---
 src/geany.h                 |  6 +++---
 src/geanyentryaction.c      |  6 +++---
 src/geanyentryaction.h      |  6 +++---
 src/geanymenubuttonaction.c |  6 +++---
 src/geanymenubuttonaction.h |  6 +++---
 src/geanyobject.c           |  7 +++----
 src/geanyobject.h           |  7 +++----
 src/geanywraplabel.c        |  6 +++---
 src/geanywraplabel.h        |  6 +++---
 src/highlighting.c          |  6 +++---
 src/highlighting.h          |  6 +++---
 src/highlightingmappings.h  |  6 +++---
 src/images.c                |  7 +++----
 src/keybindings.c           |  6 +++---
 src/keybindings.h           |  6 +++---
 src/keyfile.c               |  6 +++---
 src/keyfile.h               |  6 +++---
 src/log.c                   |  6 +++---
 src/log.h                   |  6 +++---
 src/main.c                  |  6 +++---
 src/main.h                  |  6 +++---
 src/msgwindow.c             |  6 +++---
 src/msgwindow.h             |  6 +++---
 src/navqueue.c              |  6 +++---
 src/navqueue.h              |  6 +++---
 src/notebook.c              |  6 +++---
 src/notebook.h              |  6 +++---
 src/plugindata.h            |  7 +++----
 src/pluginprivate.h         |  7 +++----
 src/plugins.c               |  7 +++----
 src/plugins.h               |  7 +++----
 src/pluginutils.c           |  7 +++----
 src/pluginutils.h           |  7 +++----
 src/prefs.c                 |  6 +++---
 src/prefs.h                 |  7 +++----
 src/printing.c              |  6 +++---
 src/printing.h              |  6 +++---
 src/project.c               |  6 +++---
 src/project.h               |  6 +++---
 src/projectprivate.h        |  7 +++----
 src/sciwrappers.c           |  6 +++---
 src/sciwrappers.h           |  6 +++---
 src/search.c                |  6 +++---
 src/search.h                |  6 +++---
 src/sidebar.c               |  6 +++---
 src/sidebar.h               |  6 +++---
 src/socket.c                |  6 +++---
 src/socket.h                |  6 +++---
 src/stash.c                 |  7 +++----
 src/stash.h                 | 29 ++++++++++++++---------------
 src/support.h               |  6 +++---
 src/symbols.c               |  6 +++---
 src/symbols.h               |  6 +++---
 src/templates.c             |  6 +++---
 src/templates.h             |  6 +++---
 src/toolbar.c               |  6 +++---
 src/toolbar.h               |  6 +++---
 src/tools.c                 |  6 +++---
 src/tools.h                 |  6 +++---
 src/ui_utils.c              |  6 +++---
 src/utils.c                 |  6 +++---
 src/utils.h                 |  6 +++---
 src/vte.c                   |  6 +++---
 src/vte.h                   |  6 +++---
 src/win32.c                 |  6 +++---
 src/win32.h                 |  6 +++---
 99 files changed, 323 insertions(+), 349 deletions(-)

commit 2b77157e5ee3a897829dce6a61c217b9cdb82378
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Aug 20 09:46:07 2012 +0200

    Update of Russian translation provided by Igor Burmistrov

 po/ru.po | 737 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 387 insertions(+), 350 deletions(-)

commit e20a57927dc6b760611c8ea2fb72bd43ffc507b4
Author: oco <oco@newmail.ru>
Date:   Thu Aug 16 18:35:27 2012 -0700

    Use all supported keyword sets for Scintilla Forth lexer
    
    Submitted on geany-devel mailing list

 data/filetypes.forth       | 8 ++++++--
 src/highlightingmappings.h | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

commit 7b65d76d5f6e5cad5ad0e8fe9a4c0a1653fec0cf
Author: Matthew Brush <matt@geany.org>
Date:   Thu Aug 16 17:46:18 2012 -0700

    Fix comment style and wording from last commit
    
    Don't use C99/C++ style comments and elaborate a bit on the purpose
    of the call.

 src/editor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit e1a1c54d784c3285b536f1608bb98e1355094644
Author: Yosef Or <Yosefor3@walla.com>
Date:   Sun Aug 12 23:28:24 2012 +0300

    Keep code direction LTR

 src/editor.c | 3 +++
 1 file changed, 3 insertions(+)

commit d36db75bcbcbc43c747d86da0d647528cbb2b904
Author: Matthew Brush <matt@geany.org>
Date:   Fri Aug 10 21:05:41 2012 -0700

    ClassBuilder: Defy GTK+ conventions and instead generate valid C code

 plugins/classbuilder.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 7193a1161b0078dedea3dd588910daaf8b1f5dc7
Author: Matthew Brush <matt@geany.org>
Date:   Fri Aug 10 18:19:54 2012 -0700

    Minor style changes from last commit

 src/editor.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit a17e37bcd84c642136614c6e60a62a4c1bd7604a
Author: Alexander Eberspächer <alex.eberspaecher@gmail.com>
Date:   Fri Aug 10 11:03:42 2012 +0200

    Test against the lexer instead of the filetype when computing
    indentation. This fixes Cython indentation.

 src/editor.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 9a63e05f63871e2c89a32f59c585cc93538d74e0
Author: Matthew Brush <matt@geany.org>
Date:   Thu Aug 9 16:49:45 2012 -0700

    Change plugin manager's OK button response to GTK_RESPONSE_OK
    
    Used to be GTK_RESPONSE_CANCEL for some reason.

 src/plugins.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit bc5b68822dee11a7c007fee633cf97db0a55b8dd
Author: Matthew Brush <matt@geany.org>
Date:   Thu Aug 9 14:09:27 2012 -0700

    Remove indirection from callback handler

 src/plugins.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit e62bec43fcf31451242ea1b8c6107bebab7f9f8b
Author: Matthew Brush <matt@geany.org>
Date:   Thu Aug 9 18:15:47 2012 -0700

    Use `g_build_filename()` instead of `g_strconcat()` for paths

 src/editor.c      |  7 +++----
 src/filetypes.c   | 18 +++++++++---------
 src/keybindings.c |  6 +++---
 src/keyfile.c     |  4 ++--
 src/main.c        | 10 +++++-----
 src/msgwindow.c   |  3 +--
 src/plugins.c     | 10 +++++-----
 src/project.c     |  9 ++++-----
 src/symbols.c     |  8 ++++----
 9 files changed, 36 insertions(+), 39 deletions(-)

commit c2c6a70515d8863347b7022bcf35970b933c1a57
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Aug 8 15:33:45 2012 +0200

    Open files with leading or trailing whitespaces through the socket

 src/socket.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit d152c5ce2235c0bd34cc76613e3045100f95a4b9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Aug 7 17:50:17 2012 +0200

    Properly indent even if the indenting character isn't the last one
    
    For all languages, this change allows comments at the end of the
    checked line, e.g.:
    
    	if 42:  # magic number
    		print("I'm indented!")
    
    For languages with braces, it also properly indent if there is code
    on the same line as the opening brace, e.g.:
    
    	if (42) { printf("some code here...");
    		printf("...but I'm properly indented");
    	} else { /* comment! */
    		printf("normal block is fine too, of course");
    	}
    
    Although this is uncommon (and quite ugly) it's valid and should be
    handled properly.

 src/editor.c | 61 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 27 deletions(-)

commit 4c2d8998d736d67215e0e1d7057505f19af6ae2f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Aug 6 16:12:31 2012 +0200

    Fix a reference to a function in the documentation

 src/ui_utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 63249c71e82a2fa9bd56b3e151f901a85fdea394
Author: Matthew Brush <matt@geany.org>
Date:   Fri Aug 3 18:49:04 2012 -0700

    Dedent switch block from last commit, pure noise

 tagmanager/ctags/c.c | 206 +++++++++++++++++++++++++--------------------------
 1 file changed, 103 insertions(+), 103 deletions(-)

commit e76a35c2715bfc015af6c965a972bc3eaec35460
Author: Matthew Brush <matt@geany.org>
Date:   Fri Aug 3 18:41:15 2012 -0700

    Minor tweak to D "!" template parameter list parsing code
    
    Note:
    Indentation left as is so that the diff is readable, next commit contains
    the indentation fix.

 tagmanager/ctags/c.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit 89b7e089c42f52c50dba70bb508d8803fa830f0a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jul 31 00:33:53 2012 +0200

    Fix invalid use of strcpy() on overlapping memory
    
    strcpy()'s behavior on overlapping memory is undefined, so replace such
    uses with memmove().
    
    Based on CTags r783: https://ctags.svn.sourceforge.net/svnroot/ctags@783

 tagmanager/ctags/ctags.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit fd40e4aa547b4fb8027bd9a5a8946afc7c93fd8d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jul 31 00:32:53 2012 +0200

    Mark a few things as static
    
    Based on CTags r779: https://ctags.svn.sourceforge.net/svnroot/ctags@779

 tagmanager/ctags/objc.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 3a460a2c5ba2de3aa01f2bea2a001c36dd01b839
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jul 31 00:31:43 2012 +0200

    Remove and unused structure member
    
    Based on CTags r769: https://ctags.svn.sourceforge.net/svnroot/ctags@769

 tagmanager/ctags/read.c | 2 --
 tagmanager/ctags/read.h | 1 -
 2 files changed, 3 deletions(-)

commit 13e5c0202a73f70b4aa76dfa23aef7da5493e320
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jul 30 20:08:05 2012 +0200

    Fix Haskell parsing when a comment is the first thing inside a type
    
    Closes #3552129.

 tagmanager/ctags/haskell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cb54ccf8e1b8af381fa8d65f7ecf0872e5807fd2
Merge: 5110fab 4cdcaa2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jul 30 17:06:00 2012 +0200

    Merge branch 'scintilla-update'

commit 4db0813a79f7dff8cfc7d29dbdeabf2f7f29ce1a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jul 30 02:55:36 2012 +0200

    Rewrite GTK printing using Scintilla
    
    We used to draw the pages to print ourselves, but it is a tedious and
    error-prone task (and we did made mistakes) that Scintilla would do
    better by itself.  So, rewrite the GTK (e.g. non-external) print code
    to use Scintilla's built-in capabilities of drawing the buffer's
    content on the pages.
    
    Not only this makes the code a lot simpler and shorter, but it gives a
    more accurate render (proper handling of tab stops, wrapping on word
    boundaries, no missing character when a wrapped line spans on multiple
    pages, ...), and it is noticeably faster (around 3 times).
    
    Additionally we now paginate properly, which fixes printing starting
    after page 1 or printing non-contiguous pages (we used to always print
    starting from page 1 and counting, no matter what pages were selected).
    
    However, note that obviously the render is not the same, even though
    it's quite similar.

 src/printing.c | 564 ++++++++++++---------------------------------------------
 1 file changed, 117 insertions(+), 447 deletions(-)

commit 5772178d3a98388d4e5df683d9a90ae2771e2152
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jul 30 01:38:59 2012 +0200

    printing: Avoid an useless allocation

 src/printing.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit 5110fab0e10b2f352ce4dbf66d991820a97079dd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 28 19:23:37 2012 +0200

    Fix search and replacement of empty matches (again)
    
    f4eb89cd7d79738a9c6c45e29abdd9d15d22e4fd was partially wrong and
    removed legitimate re-matches when two different matches ends at the
    same position.  Particularly, the replacement changes are reverted.
    
    Interestingly, Perl and Python does not agree on how to do such
    replacements.  Python does what I did in the above-cited commit, e.g.
    doesn't replace twice if the match end overlaps, but Perl does.
    Perl looks more legitimate here since both Python and Perl does find
    the overlapping matches when performing a search, so Python is the odd
    guy here doing it differently on replace than it does upon search.
    
    For example, replacing using the pattern "a?(?=b)" and the replacement
    string "_":
    
    	Python: ababcdb -> _b_bcd_b
    	Perl:   ababcdb -> __b__bcd_b
    
    But finding using the same pattern on the same input gives the same
    results on both:
    
    	Python: ababcdb -> ['a', '', 'a', '', '']
    	Perl:   ababcdb -> ['a', '', 'a', '', '']
    
    Anyway, GLib and us claim to support "Perl-compatible regular
    expressions", so we gotta follow Perl, especially in such doubtful
    situations.

 src/search.c | 47 ++++++++++++++++-------------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

commit 1ce4b1fac516f89dadb639cb773c76b68cfa286b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 28 00:31:56 2012 +0200

    Fix a reference to a file in HACKING

 HACKING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 95d767f873729db6a2feadac358a4a5d7a3e564c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 28 00:29:27 2012 +0200

    Document sci_get_lexer()
    
    This function is part of the plugin API but missed its documentation,
    leading to it not appearing in the generated API documentation.

 src/sciwrappers.c | 4 ++++
 1 file changed, 4 insertions(+)

commit f4eb89cd7d79738a9c6c45e29abdd9d15d22e4fd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 28 00:15:24 2012 +0200

    Fix search and replacement of empty matches
    
    Regular expressions might match empty ranges, which weren't handled
    properly, but generally simply omitted.
    
    For example, the regular expression "^$" (empty line) never matched
    because we assumed empty results were not interesting, and actually
    needed more care in the code.  Alike, an expression matching only on
    its lookahead part, like "a?(?=b)" against "b", would stop further
    search, although it could even match a non-empty range if "ab" is
    present later in the input.  This last kind of expressions also lead
    to double-replacement because they first matched "ab" and then "b"
    alone when re-matching after the "a" replacement.
    
    This commit fixes:
     * searching when the matched range is empty;
     * step-by-step search when matching an empty range;
     * double replacement when the pattern re-matches an empty range
       straight after a replacement;
     * replacement to and empty string when the matching an empty range.
    
    A know issue though is the step-by-step replacement that won't replace
    an empty match but rather find the next match.

 src/search.c | 55 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 18 deletions(-)

commit a091238617a5461a2f5642e9589f15748f4e28ac
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jul 25 13:13:49 2012 +0200

    Fix searching out of document range
    
    If a search matched the very last character of the document, next
    search attempt started out of the document bounds.  This even lead
    to an infinite loop due to an improper sanity check.
    
    By the way, this fixes matching of contiguous results, as the next
    search used to improperly skip one character after the result.
    Although this looks like a huge issue, it was actually visible almost
    only on the match count since the whole matching line was printed.

 src/search.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit f90bdc5957a827ce044fed6d0a7cd286a7301014
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jul 26 16:13:34 2012 +0100

    Only set Find in Files directory once per-document
    
    Use the current document's directory unless the directory field has
    already been edited and the current document has not changed.
    Otherwise, prepend the current document's directory to the drop-down
    history in case it is wanted.
    
    This is useful to avoid losing the edited directory when it is less
    likely the user wants to use the current document's directory.

 doc/geany.html | 12 +++++++++---
 doc/geany.txt  | 12 ++++++++++--
 src/search.c   | 21 ++++++++++++++++++---
 3 files changed, 37 insertions(+), 8 deletions(-)

commit 98452edcc9e2ee542ba722f816fc6f0deeabc6f7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jul 26 15:33:10 2012 +0100

    Update manual for search pref changes; add some links

 doc/geany.html | 14 ++++++++------
 doc/geany.txt  | 14 +++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

commit 924882098990776127bf68b68a045a8b1c956477
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jul 26 13:27:58 2012 +0100

    Fix installing data files with MSYS (Windows makefiles)

 makefile.win32 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 14daf925ac03b2889a18921f5698ef849a247255
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jul 26 12:56:54 2012 +0100

    indent switch, add braces

 tagmanager/ctags/c.c | 196 ++++++++++++++++++++++++++-------------------------
 1 file changed, 99 insertions(+), 97 deletions(-)

commit 5fff1e69c2c68f834f33ebb839127609f22a97bf
Author: Matthew Brush <matt@geany.org>
Date:   Tue Jul 24 17:56:29 2012 -0700

    Add NULL guard for reloading "untitled" documents
    
    Previously it was using a GLIB assertion which shouldn't be used
    to detect a normal condition and so it caused a warning on the
    console output when clicking "Reload" with an "untitled" document.

 src/callbacks.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit d11f9a51b939bf39c3c1676ab823147d460ede75
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jul 17 23:09:00 2012 +0200

    Rely on GModule for adding or not the `--export-dynamic` linker flag
    
    We explicitly use GModule's .pc since 7b2f0fe, and it provides the
    appropriate flag: we don't need to add it ourselves anymore.  Moreover,
    since this flag is not needed (nor available) on all platforms (e.g.
    Windows or MacOS X), it is safer to let GModule deal with adding it
    anyway.

 src/Makefile.am | 2 --
 wscript         | 1 -
 2 files changed, 3 deletions(-)

commit 4cdcaa22e680757f4eca4b55a69e6a01eea07549
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 14 15:29:10 2012 +0200

    Update for new Scintilla styles

 data/filetypes.c           | 1 +
 src/highlighting.c         | 1 +
 src/highlightingmappings.h | 1 +
 3 files changed, 3 insertions(+)

commit 03509ee1a89856256f42a4ada5b635e70dab9472
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jul 14 15:02:14 2012 +0200

    Update Scintilla to version 3.2.1
    
    Closes #3540469

 NEWS                              |  2 +-
 scintilla/include/Platform.h      |  8 ++--
 scintilla/include/SciLexer.h      |  1 +
 scintilla/include/Scintilla.h     |  4 ++
 scintilla/include/Scintilla.iface | 63 ++++++++++++++++++++------------
 scintilla/lexers/LexCPP.cxx       | 32 ++++++++++++----
 scintilla/lexers/LexCSS.cxx       | 29 +++++++++++----
 scintilla/lexers/LexFortran.cxx   | 33 ++++++++++++-----
 scintilla/lexers/LexHTML.cxx      |  2 +-
 scintilla/lexlib/CharacterSet.h   | 37 +++++++++++++++++--
 scintilla/src/AutoComplete.cxx    | 13 ++++++-
 scintilla/src/AutoComplete.h      |  8 ++++
 scintilla/src/CharClassify.cxx    | 16 ++++++++
 scintilla/src/CharClassify.h      |  1 +
 scintilla/src/Document.cxx        | 77 ++++++++++++++++++++++-----------------
 scintilla/src/Document.h          |  1 +
 scintilla/src/Editor.cxx          | 60 ++++++++++++++++++++++++++----
 scintilla/src/Editor.h            |  1 +
 scintilla/src/PerLine.cxx         | 11 ++----
 scintilla/src/PerLine.h           |  2 +-
 scintilla/src/ScintillaBase.cxx   | 37 +++++++------------
 scintilla/src/ViewStyle.h         |  2 +-
 scintilla/version.txt             |  2 +-
 23 files changed, 307 insertions(+), 135 deletions(-)

commit f0f3fc83ad8a9ae54896422fa9668b31f1e3f6bf
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Jul 9 13:27:30 2012 +0100

    Allow '!' char in D parameter lists

 tagmanager/ctags/c.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 8d26450f07cac40812a04fe2adfd29fa54f25059
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jul 8 17:11:50 2012 +0100

    Add status bar warning if Windows spawn timed out

 src/win32.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit deb5f3542b5b618e56ca9d823f40df062188eb6a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jul 9 00:59:11 2012 +0200

    Bump API version to reflect Scintilla's SCI_{GET,SET}USEPALETTE removal
    
    Scintilla deprecated SCI_GETUSEPALETTE and SCI_SETUSEPALETTE messages,
    and since we don't build with deprecated API support they aren't
    available anymore.

 src/plugindata.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5af4dab5f06316395d1507455284d7f8c588f9e2
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Jul 6 13:17:54 2012 +0100

    Fix showing project name in sidebar documents
    
    This was broken if the base path ended with a directory separator.

 src/sidebar.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 74959b9cb91dcc4436c457f04a40df23a01de381
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jul 4 17:13:14 2012 +0100

    Support MSYS=1 to enable building with MSYS; use $/ instead of DIRSEP
    
    Defining MSYS=1 is cleaner than requiring users to define CP, RM, etc.

 doc/makefile.win32              |  6 ++++--
 makefile.win32                  | 14 +++++++++++---
 plugins/makefile.win32          |  4 ++++
 scintilla/makefile.win32        |  3 +++
 src/makefile.win32              |  4 ++++
 tagmanager/ctags/makefile.win32 |  4 ++++
 tagmanager/mio/makefile.win32   |  4 ++++
 tagmanager/src/makefile.win32   |  4 ++++
 8 files changed, 38 insertions(+), 5 deletions(-)

commit 65fe86369152420c4e7df32645975644dfe7b258
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jul 4 16:44:43 2012 +0100

    Use PREFIX=C:/libs and minor cleanup (Windows makefiles)
    
    This PREFIX works on both cmd.exe and MSYS, whereas backslash confuses
    MSYS.
    Use copy /y in doc/makefile.win32.
    Remove unused targets binclean, exec.

 doc/makefile.win32       |  2 +-
 makefile.win32           |  3 +--
 plugins/makefile.win32   |  4 ++--
 scintilla/makefile.win32 |  2 +-
 src/makefile.win32       | 12 ++----------
 5 files changed, 7 insertions(+), 16 deletions(-)

commit bfa2db50d6176083daf0b8d559ba3bd78ad77175
Merge: 40ab39d c72dce0
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jul 4 12:38:19 2012 +0100

    Merge branch 'tm/tree-refactoring'
    
    This moves CTags files into their own subdirectory and moves the
    tagmanager source and header files into their own subdirectory.
    
    The bulk of the work was done by Colomban.

commit c72dce06a55594247cad232d78bec9868f585587
Merge: 928de3d 40ab39d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jul 4 12:15:53 2012 +0100

    Merge remote-tracking branch 'origin/master' into tm/tree-refactoring
    
    Conflicts:
    	makefile.win32
    	src/makefile.win32

commit 40ab39d8fd0a17603b5a3af885ad1ef9f26924e8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jul 1 15:20:21 2012 +0200

    Map all filetype's character styles to 'character' named style

 data/filetypes.ada | 2 +-
 data/filetypes.asm | 2 +-
 data/filetypes.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 409c1a68a5c7d180be2ae311ed54d00c25a61ac3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 30 22:00:42 2012 +0200

    Make argument checking in Scintilla update script more strict

 scripts/update-scintilla.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f0b245cdae33b019fec5234263b66fe74bbbacb1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 30 21:58:09 2012 +0200

    Fix a typo in the Scintilla update script (oops)

 scripts/update-scintilla.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a6c0dc0978a4ee0ee1ed384e57356303fb0d274c
Merge: 098f127 7c0d4d1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 30 20:13:56 2012 +0200

    Merge branch 'scintilla-update'

commit 098f12708760ac76c849f917804859e1ae66394e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 30 01:51:53 2012 +0200

    Drop now unused "scalar" named style

 data/colorschemes/alt.conf | 1 -
 data/filetypes.common      | 1 -
 2 files changed, 2 deletions(-)

commit 3d2302393032548a051f513cf2fa269541a320ec
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 30 01:51:38 2012 +0200

    Fix a few Shell style mappings

 data/filetypes.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ad0297f42f01daa226de74b90d671d91735ca12c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 30 01:51:20 2012 +0200

    Fix a few Perl style mappings

 data/filetypes.perl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 4ad643f756c5f10f73931fc4f15954f62c267513
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jun 27 16:33:34 2012 +0100

    Fix makefile.win32:install for MSYS

 makefile.win32 | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit 78144ab606aba1a049cd090cbb574b4f94caf062
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jun 27 14:26:39 2012 +0100

    Make makefile.win32:install target work without MSYS
    
    Based on patch by Dimitar Zhekov.
    MSYS users should now define 'CP_R = cp -r'.
    Removed override of MAKE, as this is set automatically.

 makefile.win32 | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

commit 7c0d4d12458523cb175d7e63e0662aa288b5b5d0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Jun 27 01:04:33 2012 +0200

    Add a script to update Scintilla

 scripts/update-scintilla.sh | 87 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

commit 298ce94c5ddc352a19a89dddcadc23bd3aed631b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 26 23:16:45 2012 +0200

    Update for new Scintilla styles

 data/filetypes.c           | 1 +
 data/filetypes.css         | 1 +
 src/highlighting.c         | 3 ++-
 src/highlightingmappings.h | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

commit f1dbdabf7695b39e8873a4a0c74a3a5e809a90b8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 26 22:22:04 2012 +0200

    Add Scintilla update to NEWS

 NEWS | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 08d751daf206d606176bae9cc8cd216f00a1e662
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Tue Jun 26 21:39:56 2012 +0100

    Fix building with makefile.win32 from Windows command prompt, not MSYS

 makefile.win32     | 26 ++++++++++++--------------
 src/makefile.win32 | 10 +++++-----
 2 files changed, 17 insertions(+), 19 deletions(-)

commit 4dd0fe917501e1d67bf840f8f183acb32ad92b5b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jun 26 20:48:16 2012 +0200

    Update Scintilla to version 3.2.0

 scintilla/gtk/PlatGTK.cxx          | 1204 +++++-------------------------------
 scintilla/gtk/ScintillaGTK.cxx     |  142 ++---
 scintilla/include/ILexer.h         |    8 +
 scintilla/include/Platform.h       |  196 +++---
 scintilla/include/SciLexer.h       |  130 ++++
 scintilla/include/Scintilla.h      |   31 +-
 scintilla/include/Scintilla.iface  |  233 ++++++-
 scintilla/lexers/LexAda.cxx        |    1 +
 scintilla/lexers/LexAsm.cxx        |    6 +-
 scintilla/lexers/LexBash.cxx       |   11 +-
 scintilla/lexers/LexBasic.cxx      |    6 +-
 scintilla/lexers/LexCPP.cxx        |   50 +-
 scintilla/lexers/LexCSS.cxx        |  228 ++++++-
 scintilla/lexers/LexD.cxx          |    6 +-
 scintilla/lexers/LexHTML.cxx       |   31 +-
 scintilla/lexers/LexNsis.cxx       |    1 +
 scintilla/lexers/LexOthers.cxx     |   33 +-
 scintilla/lexers/LexPascal.cxx     |   20 +
 scintilla/lexers/LexPerl.cxx       |    9 +-
 scintilla/lexers/LexRuby.cxx       |    6 +-
 scintilla/lexers/LexSQL.cxx        |  163 +++--
 scintilla/lexers/LexVHDL.cxx       |    3 -
 scintilla/lexlib/LexAccessor.h     |    2 +-
 scintilla/lexlib/PropSetSimple.cxx |    4 +-
 scintilla/scintilla_changes.patch  |   19 +-
 scintilla/src/AutoComplete.cxx     |   11 +-
 scintilla/src/AutoComplete.h       |    3 +-
 scintilla/src/CallTip.cxx          |   63 +-
 scintilla/src/CallTip.h            |   23 +-
 scintilla/src/CellBuffer.cxx       |    8 +
 scintilla/src/CellBuffer.h         |    2 +
 scintilla/src/Decoration.cxx       |    4 +-
 scintilla/src/Document.cxx         |  281 +++++----
 scintilla/src/Document.h           |   11 +-
 scintilla/src/Editor.cxx           | 1099 +++++++++++++++++---------------
 scintilla/src/Editor.h             |   34 +-
 scintilla/src/FontQuality.h        |    3 +
 scintilla/src/Indicator.cxx        |   14 +-
 scintilla/src/Indicator.h          |    2 +-
 scintilla/src/LineMarker.cxx       |  168 +++--
 scintilla/src/LineMarker.h         |   35 +-
 scintilla/src/PerLine.cxx          |   63 +-
 scintilla/src/PerLine.h            |    1 +
 scintilla/src/PositionCache.cxx    |   18 +-
 scintilla/src/PositionCache.h      |   14 +-
 scintilla/src/ScintillaBase.cxx    |   36 +-
 scintilla/src/ScintillaBase.h      |    2 -
 scintilla/src/SplitVector.h        |   18 +
 scintilla/src/Style.cxx            |   38 +-
 scintilla/src/Style.h              |   18 +-
 scintilla/src/UniConversion.cxx    |  117 ++++
 scintilla/src/UniConversion.h      |   15 +
 scintilla/src/ViewStyle.cxx        |  166 +++--
 scintilla/src/ViewStyle.h          |   46 +-
 scintilla/src/XPM.cxx              |   44 +-
 scintilla/src/XPM.h                |   10 +-
 scintilla/version.txt              |    2 +-
 57 files changed, 2435 insertions(+), 2477 deletions(-)

commit 40da14b5b1c9006aa4149481eb6a2d43ed4550fa
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jun 24 17:21:50 2012 +0100

    Add keybinding for 'Go to Start of Display Line' (#3182425)

 doc/geany.html    | 31 +++++++++++++++++++------------
 doc/geany.txt     | 21 +++++++++++++--------
 src/keybindings.c |  7 ++++++-
 src/keybindings.h |  1 +
 4 files changed, 39 insertions(+), 21 deletions(-)

commit 8187268ad0ee3c51f85acf3cbfa49f8ec0ab5dc2
Author: Chow Loong Jin <hyperair@debian.org>
Date:   Thu Jun 21 16:06:19 2012 +0800

    Link export plugin against libm (-lm)
    
    The export plugin uses the pow() function from libm without linking against
    it. It has worked so far because Geany itself has a link against libm, but
    should that be removed in the future, this would fail to resolve symbols.
    
    Signed-off-by: Chow Loong Jin <hyperair@debian.org>
    Signed-off-by: Colomban Wendling <ban@herbesfolles.org>

 plugins/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 74115db3810d8c7a133bdc08260113e65413b5cd
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Jun 20 17:09:25 2012 +0200

    Update of Swedish translation

 po/sv.po | 602 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 301 insertions(+), 301 deletions(-)

commit 920fe578346b461ba7cd675ad2c88b3067c01d9c
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue Jun 19 00:02:48 2012 +0200

    Add missing files in the Windows installer
    
    Even this has been done post-release, the changes were also used
    for the 1.22 release.

 geany.nsi | 4 ++++
 1 file changed, 4 insertions(+)

commit d13ee0406a47856c5d19a4ba5a9615d11b554623
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 18 19:18:31 2012 +0200

    Update making-a-release for Git and new sever setup

 doc/making-a-release | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

commit e9d61aa7e5d112f9af6252655e3277cf2d7f2d20
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 18 19:16:05 2012 +0200

    Post release version bump

 NEWS             | 3 +++
 configure.ac     | 2 +-
 doc/geany.txt    | 2 +-
 geany.nsi        | 4 ++--
 geany_private.rc | 4 ++--
 src/geany.h      | 2 +-
 win32-config.h   | 2 +-
 wscript          | 2 +-
 8 files changed, 12 insertions(+), 9 deletions(-)

commit b7d245a7dfd797aaa328f020cd65f682767c92f5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 18 15:28:06 2012 +0200

    Set release date

 NEWS           |  2 +-
 doc/geany.1.in |  2 +-
 doc/geany.html | 13 +++++++------
 doc/geany.txt  |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

commit 29e64583b9940fa8612053e060ad00841cebd32f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 18 16:08:52 2012 +0200

    Fix translations build and installation in VPATH builds

 m4/geany-i18n.m4 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 03c66d5b513ee11cf37e591fd13f87ac468c9f1d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 18 15:19:31 2012 +0200

    Consistently use US wording

 NEWS | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 3ff2f3409833213c386623f09fc19a7e27cc4743
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 18 15:18:52 2012 +0200

    Add a few missing NEWS entries

 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

commit 1c2c455b1d326159da6a36ebfe225667bd511c91
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jun 18 01:13:05 2012 +0200

    Update copyright information

 README                      | 2 +-
 README.Packagers            | 2 +-
 doc/geany.txt               | 5 +++--
 doc/plugins.dox             | 2 +-
 doc/pluginsignals.c         | 4 ++--
 doc/pluginsymbols.c         | 4 ++--
 geany.nsi                   | 6 +++---
 geany_private.rc            | 2 +-
 plugins/classbuilder.c      | 4 ++--
 plugins/demoplugin.c        | 4 ++--
 plugins/export.c            | 4 ++--
 plugins/filebrowser.c       | 4 ++--
 plugins/geanyplugin.h       | 4 ++--
 plugins/htmlchars.c         | 6 +++---
 plugins/saveactions.c       | 4 ++--
 plugins/splitwindow.c       | 4 ++--
 src/about.c                 | 5 +++--
 src/about.h                 | 4 ++--
 src/build.c                 | 4 ++--
 src/build.h                 | 4 ++--
 src/callbacks.c             | 4 ++--
 src/callbacks.h             | 4 ++--
 src/dialogs.c               | 4 ++--
 src/dialogs.h               | 4 ++--
 src/document.c              | 4 ++--
 src/document.h              | 4 ++--
 src/documentprivate.h       | 4 ++--
 src/editor.c                | 6 +++---
 src/editor.h                | 4 ++--
 src/encodings.c             | 4 ++--
 src/encodings.h             | 4 ++--
 src/filetypes.c             | 4 ++--
 src/filetypes.h             | 4 ++--
 src/filetypesprivate.h      | 4 ++--
 src/gb.c                    | 4 ++--
 src/geany.h                 | 4 ++--
 src/geanyentryaction.c      | 4 ++--
 src/geanyentryaction.h      | 4 ++--
 src/geanymenubuttonaction.c | 4 ++--
 src/geanymenubuttonaction.h | 4 ++--
 src/geanyobject.c           | 4 ++--
 src/geanyobject.h           | 4 ++--
 src/geanywraplabel.c        | 4 ++--
 src/geanywraplabel.h        | 4 ++--
 src/highlighting.c          | 5 +++--
 src/highlighting.h          | 4 ++--
 src/highlightingmappings.h  | 6 +++---
 src/images.c                | 4 ++--
 src/keybindings.c           | 4 ++--
 src/keybindings.h           | 4 ++--
 src/keyfile.c               | 4 ++--
 src/keyfile.h               | 4 ++--
 src/log.c                   | 4 ++--
 src/log.h                   | 4 ++--
 src/main.c                  | 4 ++--
 src/main.h                  | 4 ++--
 src/msgwindow.c             | 4 ++--
 src/msgwindow.h             | 4 ++--
 src/navqueue.c              | 4 ++--
 src/navqueue.h              | 4 ++--
 src/notebook.c              | 4 ++--
 src/notebook.h              | 4 ++--
 src/plugindata.h            | 4 ++--
 src/pluginprivate.h         | 4 ++--
 src/plugins.c               | 4 ++--
 src/plugins.h               | 4 ++--
 src/pluginutils.c           | 4 ++--
 src/pluginutils.h           | 4 ++--
 src/prefs.c                 | 4 ++--
 src/prefs.h                 | 4 ++--
 src/printing.c              | 4 ++--
 src/printing.h              | 4 ++--
 src/project.c               | 4 ++--
 src/project.h               | 4 ++--
 src/projectprivate.h        | 4 ++--
 src/sciwrappers.c           | 4 ++--
 src/sciwrappers.h           | 4 ++--
 src/search.c                | 4 ++--
 src/search.h                | 4 ++--
 src/sidebar.c               | 4 ++--
 src/sidebar.h               | 4 ++--
 src/socket.c                | 4 ++--
 src/socket.h                | 4 ++--
 src/stash.c                 | 4 ++--
 src/stash.h                 | 4 ++--
 src/support.h               | 4 ++--
 src/symbols.c               | 5 +++--
 src/symbols.h               | 4 ++--
 src/templates.c             | 4 ++--
 src/templates.h             | 4 ++--
 src/toolbar.c               | 4 ++--
 src/toolbar.h               | 4 ++--
 src/tools.c                 | 4 ++--
 src/tools.h                 | 4 ++--
 src/ui_utils.c              | 6 +++---
 src/ui_utils.h              | 4 ++--
 src/utils.c                 | 4 ++--
 src/utils.h                 | 4 ++--
 src/vte.c                   | 4 ++--
 src/vte.h                   | 4 ++--
 src/win32.c                 | 4 ++--
 src/win32.h                 | 4 ++--
 wscript                     | 4 ++--
 103 files changed, 211 insertions(+), 207 deletions(-)

commit 64cfa86f86a31c4511a3db333c78730d3d163d8e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 17 23:53:58 2012 +0200

    Remove broken 'deb' build system target
    
    The 'deb' target was supposed to build a Debian package from the
    sources but the 'debian/' subdirectory never existed.

 Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

commit c037f01d0d831884dcca0bb50064a60eb7c14d4c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 17 23:33:08 2012 +0200

    Remove obsolete redundant dist-bzip2 build system target
    
    Automake provides dist-bzip2 since at least version 1.8, so remove our
    own target.  Moreover bzip2 distributions are a little obsolescent now
    Xz is available and spread enough.

 Makefile.am | 6 ------
 1 file changed, 6 deletions(-)

commit 292757777c6060402ddda2e357322efc67b63dd2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 17 19:35:12 2012 +0200

    Generate ChangeLog from Git log
    
    The Makefile rule comes from https://live.gnome.org/Git/ChangeLog with
    slight modifications.

 ChangeLog          | 6877 +---------------------------------------------------
 ChangeLog.pre-1-22 | 6875 +++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.am        |   15 +
 3 files changed, 6892 insertions(+), 6875 deletions(-)

commit 41793a0f7ba38c43c19e84d5577bcd5fff550414
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Jun 16 08:27:14 2012 +0200

    Updating NEWS for translations

 NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5344ada080d05eb92462f927ce332ff4340469d6
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Jun 16 08:18:31 2012 +0200

    Update of Brailian Portuguese translation

 po/pt_BR.po | 443 +++++++++++++++++++++++++++++-------------------------------
 1 file changed, 215 insertions(+), 228 deletions(-)

commit c7c7ff454059799f46c7ba9116c050254bf63c0f
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Jun 14 19:14:32 2012 +0200

    Clean up a fuzzy string inside Turkish translation

 po/tr.po | 1 -
 1 file changed, 1 deletion(-)

commit fcee5d446f37ad3d837d3d9d65c6635214e3d21d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Jun 13 18:46:32 2012 +0200

    Update of Turkish translation

 po/tr.po | 444 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 214 insertions(+), 230 deletions(-)

commit 1e15d2f0e3c0de8bd67ffac580533ec5916be397
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Jun 13 18:44:41 2012 +0200

    Update of Spanish translation

 po/es.po | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

commit 95ce0a2bee50d39a5abb117b353ee5b086057a21
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jun 13 13:33:39 2012 +0100

    Disable D explicit fold points (as C filetypes do)

 data/filetypes.d | 3 +++
 1 file changed, 3 insertions(+)

commit afaec0b0bb769df4c4bf59b435985af58b77aec3
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 11 19:05:49 2012 +0200

    Update of Kazakh translation

 po/kk.po | 446 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 222 insertions(+), 224 deletions(-)

commit ff0d63eeb55a0606c8ea659cde55d67ee9f19f19
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 11 19:03:53 2012 +0200

    Update of German translation

 po/de.po | 1615 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 715 insertions(+), 900 deletions(-)

commit 97380d9c94b5782c30c53dad3cbe738b252c7286
Author: Jean-Philippe Moal <skateinmars@skateinmars.net>
Date:   Sat Jun 9 20:02:03 2012 +0200

    Update of French translation

 po/fr.po | 1760 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 759 insertions(+), 1001 deletions(-)

commit 7d097ca7ad7fe1cdd044fa83472facac091ce220
Author: Matthew Brush <matt@geany.org>
Date:   Sat Jun 9 19:48:13 2012 -0700

    Update 'docComment' keywords in C, C++, Vala, and Genie filetypes
    
    C and C++ have Doxygen keywords from:
        http://www.stack.nl/~dimitri/doxygen/commands.html
    
    Vala and Genie have Doxygen keywords and Valadoc keywords from:
        http://valadoc.org/#!wiki=markup

 data/filetypes.Genie.conf | 4 ++--
 data/filetypes.c          | 4 ++--
 data/filetypes.cpp        | 4 ++--
 data/filetypes.vala       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

commit a82f2f5445995abeb2c2c3e1b571850dbf7f41bd
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Jun 9 16:16:36 2012 +0200

    Remove double opening bracket

 THANKS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e6771cce4b92599fc98bac3accb901d462eea7aa
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sat Jun 9 16:15:58 2012 +0200

    Add missing closing brackets in mail addresses
    
    This should also fix the display problems on the website where this file is used.

 THANKS | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit f6cafce997e8e5359a887b532ab714829f4cbe8f
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Jun 9 14:41:21 2012 +0200

    Correct file permissions for some translation files to be 644

 po/kk.po | 0
 po/sv.po | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

commit db683890f6b589e7993ef2fc255ff3ee05ca9c69
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Jun 9 10:55:33 2012 +0200

    Update of Simplified Chinese translation

 po/zh_CN.po | 2731 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 1358 insertions(+), 1373 deletions(-)

commit 1c47dec4756f2299c4d1b9eae726539618d5d2d0
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Jun 9 10:35:23 2012 +0200

    Fixing an accelerator in German translation

 po/de.po | 332 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 166 insertions(+), 166 deletions(-)

commit 4be2fc07752622fe7b7e5f2ba0edc5b40c1ab19d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Jun 9 10:34:11 2012 +0200

    Update of Italian transaltion

 po/it.po | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 213190ad0fee7cef82f067caba9a362a9a471f52
Author: kilo aka Gabor Kmetyko <kg.kilo@gmail.com>
Date:   Fri Jun 8 13:24:29 2012 +0200

    Updated Hungarian translations

 po/hu.po | 1707 ++++++++++++++++++++++++++------------------------------------
 1 file changed, 724 insertions(+), 983 deletions(-)

commit 0a9262d4d37696c6ac369ca7d2b7c4935dc094b3
Author: Lex Trotman <elextr@gmail.com>
Date:   Sat Jun 9 13:44:42 2012 +1000

    Add incompatibilities to NEWS
    
    Add section outlining incompatibilities in accordance with ML.

 NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

commit e44198abb2080904576f3d7a52814d3d6c737339
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Jun 5 18:27:14 2012 +0100

    Parse D functions with various attributes/storage classes
    
    Parse @attributes, pure, nothrow.
    Parse return types immutable(T), shared(T), inout(T).

 NEWS           |  5 +++--
 tagmanager/c.c | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 45 insertions(+), 18 deletions(-)

commit edeaa521a2a5eb1b759f50c750422ffb262c587e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Jun 8 13:28:07 2012 +0100

    Show info message if selection style is invisible, not warning

 src/highlighting.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 928de3d68425374f154f01367ddce0c0bd8f0260
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jun 7 16:45:37 2012 +0100

    Don't suppress warnings or define G_OS_WIN32 (Windows build)

 tagmanager/src/makefile.win32 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9f99b4f55ad4a1adae4d2db7858b91e95e81c8ad
Merge: 18cec1f 177d642
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jun 7 16:32:32 2012 +0100

    Merge remote-tracking branch 'origin/master' into tm/tree-refactoring

commit 177d6428cb337c5cebd3545afdecea97ba3a1f43
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Jun 6 21:54:12 2012 +0200

    Update of Lithuanian, Italian, Dutch and Portugese translation

 po/it.po |  31 +++--
 po/lt.po | 393 ++++++++++++++++++++++++++---------------------------
 po/pl.po | 330 ++++++++++++++++++++++----------------------
 po/pt.po | 466 ++++++++++++++++++++++++++++++---------------------------------
 4 files changed, 604 insertions(+), 616 deletions(-)

commit 18cec1fb81b5a4d186a352e0264a2f1d065bbe3a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jun 6 15:21:00 2012 +0100

    Fix Windows build

 plugins/makefile.win32        | 2 +-
 src/makefile.win32            | 2 +-
 tagmanager/src/makefile.win32 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 6f0d015ed2eed5563d02d7824a098256e9874bb9
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jun 6 15:19:34 2012 +0100

    Fix documentation using old directory tagmanager/include

 doc/Doxyfile.in  | 6 +++---
 src/plugindata.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 4e5a7231bf5f7c739b0bc1cd8d55e771cebf7758
Author: Matthew Brush <matt@geany.org>
Date:   Mon Jun 4 14:29:23 2012 -0700

    Always select current editor font when showing the font dialog
    
    Previously, choosing another font and then pressing cancel would keep
    the font selected rather than resetting it to the current editor font
    because the dialog is not destroyed between showings.

 src/dialogs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9d7ff79a9a4a1e8640847c062ac085a8944e6de2
Author: Matthew Brush <matt@geany.org>
Date:   Mon Jun 4 14:18:49 2012 -0700

    Restore secondary clear icon functionality in Preferences dialog
    
    Ensures all entries that get a clear icon added to the secondary position
    also set the secondary icon to be activatable. This was probably
    introducted during the Glade switch and could be fixed in the Glade file
    but this fix ensures that even hard coded entries will always have their
    clear icon activatable.

 src/ui_utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit cfdedf4e678a19f157f981de0777491c97098f2d
Author: Matthew Brush <matt@geany.org>
Date:   Mon Jun 4 13:54:08 2012 -0700

    Remove sentence from documentation that doesn't apply anymore
    
    With newer GTK+ releases, leaving this field blank causes the "Recent
    Files" "feature" to be used rather the the expected current working
    directory. No replacement text added to explain the new behaviour since
    it would be incorrect with older GTK+ versions, would likely be incorrect
    on Windows with native dialogs and it will possibly be reverted in GTK+
    in the future.
    
    Recenerate HTML manual, including previous changes from other commits.

 data/geany.glade |  2 +-
 doc/geany.html   | 23 +++++++++++++++++------
 doc/geany.txt    |  1 -
 3 files changed, 18 insertions(+), 8 deletions(-)

commit 06c1b342d453857197610a4e272d5742ac3d6885
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 4 17:29:04 2012 +0200

    Update of Japanese translation

 po/ja.po | 438 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 213 insertions(+), 225 deletions(-)

commit 682752a0f587a961dd7aea2a994da450c328b987
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 4 17:28:50 2012 +0200

    Update of Italian translation

 po/it.po | 321 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 161 insertions(+), 160 deletions(-)

commit 7a0dc3ea8334271027fa5af8fb140e7912dd5933
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Jun 4 17:28:38 2012 +0200

    Update of Spanish translation

 po/es.po | 430 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 208 insertions(+), 222 deletions(-)

commit 23009bf35d742458457c0df25210dbe7a67e992e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Jun 4 13:46:27 2012 +0100

    Fix using CXX, CC as usual to prevent override problems (Windows build)

 scintilla/makefile.win32 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit c37d8b4390811bd59064b9b7e6bb8b807a6ac6a6
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Jun 4 13:30:55 2012 +0100

    Do not suppress warnings (Windows makefiles)
    
    Also do not define G_OS_WIN32.

 scintilla/makefile.win32      | 2 +-
 tagmanager/makefile.win32     | 4 ++--
 tagmanager/mio/makefile.win32 | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

commit 304f3a8b476351230bc0324597f0689e9cddebeb
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Mar 11 11:51:47 2012 +0100

    Adding a small note pointing out that setting a default keybinding might not the best idea for plugin maintainers

 src/keybindings.c | 3 +++
 1 file changed, 3 insertions(+)

commit 7b3b65e27df77be862714e2de69aa9f61764a91b
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jun 3 18:04:03 2012 +0100

    Add workaround for users with an invisible selection style
    
    This is likely to be the case for any users that copied the system
    selection style line as this was incorrectly set before, but not
    applied.

 src/highlighting.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit ff484c9a8bc355e8258e4db8457005461b451249
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jun 3 17:40:46 2012 +0100

    Do not override default selection foreground style

 data/filetypes.common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dd87e318cf846db3b3af1481942637969e891557
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jun 3 17:34:33 2012 +0100

    Fix applying default selection colors after editing 'selection' style
    
    Default colors were not restored when disabling the override flags.

 src/highlighting.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 12ba8350910f126cbfd2b0b817c293b0816f53f1
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Jun 3 17:53:17 2012 +0200

    Update of Lithuanian translation

 po/lt.po | 80 ++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 43 insertions(+), 37 deletions(-)

commit d0fe947a6f8eaf70f2d6eea7d161b50643d07b82
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Jun 3 17:51:20 2012 +0200

    Update po files after enabling more strings to be translatable.

 po/ar.po    | 49 +++++++++++++++++++++++++++++++++++--------------
 po/ast.po   | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/be.po    | 49 +++++++++++++++++++++++++++++++++++--------------
 po/bg.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/ca.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/cs.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/de.po    | 54 ++++++++++++++++++++++++++++++++++++------------------
 po/el.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/en_GB.po | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/es.po    | 49 +++++++++++++++++++++++++++++++++++--------------
 po/fa.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/fi.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/fr.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/gl.po    | 54 ++++++++++++++++++++++++++++++++++++------------------
 po/hu.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/id.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/it.po    | 49 +++++++++++++++++++++++++++++++++++--------------
 po/ja.po    | 54 ++++++++++++++++++++++++++++++++++++------------------
 po/kk.po    | 49 +++++++++++++++++++++++++++++++++++--------------
 po/ko.po    | 54 ++++++++++++++++++++++++++++++++++++------------------
 po/lb.po    | 54 ++++++++++++++++++++++++++++++++++++------------------
 po/lt.po    | 49 +++++++++++++++++++++++++++++++++++--------------
 po/mn.po    | 49 +++++++++++++++++++++++++++++++++++--------------
 po/nl.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/nn.po    | 51 ++++++++++++++++++++++++++++++++++++---------------
 po/pl.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/pt.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/pt_BR.po | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/ro.po    | 54 ++++++++++++++++++++++++++++++++++++------------------
 po/ru.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/sk.po    | 49 +++++++++++++++++++++++++++++++++++--------------
 po/sl.po    | 49 +++++++++++++++++++++++++++++++++++--------------
 po/sv.po    | 54 ++++++++++++++++++++++++++++++++++++------------------
 po/tr.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/uk.po    | 54 ++++++++++++++++++++++++++++++++++++------------------
 po/vi.po    | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/zh_CN.po | 52 +++++++++++++++++++++++++++++++++++-----------------
 po/zh_TW.po | 49 +++++++++++++++++++++++++++++++++++--------------
 38 files changed, 1339 insertions(+), 622 deletions(-)

commit 58a03352b6a0030f41210c2f67eb78371e4c41af
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Jun 3 17:48:30 2012 +0200

    Enable two strings for translation. Patch by gymka

 src/about.c    | 2 +-
 src/ui_utils.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 1d6efd332e6720b7d5305e94e54f1f02c934f772
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 3 16:56:31 2012 +0200

    Remove an useless NULL check and error message
    
    gtk_builder_new() cannot fail but in case of memory exhaustion, where
    the GLib allocator will abort anyway.

 src/ui_utils.c | 5 -----
 1 file changed, 5 deletions(-)

commit e98f11cbc504b5fb7711d2ce9bc641b28897272d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 3 16:50:57 2012 +0200

    Display warnings, critical and error messages even if not in verbose mode

 src/log.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 70e0f6eaa0c7213e9f4681c5941b37a89a8e961c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 3 16:47:18 2012 +0200

    Fix verbose output with GLib 2.32 and newer
    
    Since GLib 2.32, messages logged with levels INFO and DEBUG aren't
    output by the default log handler unless the G_MESSAGES_DEBUG
    environment variable contains the domain of the message or is set to
    the special value "all".
    
    Since we use INFO level messages for verbose mode, we need to make
    sure this environment variable is properly set when in verbose mode.

 src/main.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 9f042521e5ab1958c8274c981ff122b461a3e75f
Merge: 87046ee 084f43e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jun 3 15:09:34 2012 +0200

    Merge branch 'frlan/svn_cleanup'

commit 87046eeec092356eceeb979840f6e8d361368877
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Jun 3 10:20:14 2012 +0200

    Update of po-files for string freeze for upcoming 1.22 release

 po/ar.po    |  984 ++++----
 po/ast.po   | 6111 +++++++++++++++++++++++++-------------------------
 po/be.po    | 6042 +++++++++++++++++++++++++------------------------
 po/bg.po    | 6289 ++++++++++++++++++++++++++-------------------------
 po/ca.po    | 6069 +++++++++++++++++++++++++------------------------
 po/cs.po    | 6073 +++++++++++++++++++++++++------------------------
 po/de.po    |   37 +-
 po/el.po    | 6405 ++++++++++++++++++++++++++--------------------------
 po/en_GB.po | 6073 +++++++++++++++++++++++++------------------------
 po/es.po    | 6125 +++++++++++++++++++++++++-------------------------
 po/fa.po    | 6059 +++++++++++++++++++++++++------------------------
 po/fi.po    | 6322 ++++++++++++++++++++++++++-------------------------
 po/fr.po    | 6130 +++++++++++++++++++++++++-------------------------
 po/gl.po    | 6079 +++++++++++++++++++++++++------------------------
 po/hu.po    | 6623 ++++++++++++++++++++++++++++--------------------------
 po/id.po    | 3562 ++++++++++++++---------------
 po/it.po    | 2701 +++++++++++-----------
 po/ja.po    | 5887 ++++++++++++++++++++++++------------------------
 po/kk.po    | 3086 ++++++++++++-------------
 po/ko.po    | 6119 +++++++++++++++++++++++++-------------------------
 po/lb.po    | 6140 +++++++++++++++++++++++++-------------------------
 po/lt.po    |  215 +-
 po/mn.po    | 7227 +++++++++++++++++++++++++++++++++++++++++++++--------------
 po/nl.po    | 6085 +++++++++++++++++++++++++------------------------
 po/nn.po    | 2619 +++++++++++-----------
 po/pl.po    | 6039 +++++++++++++++++++++++++------------------------
 po/pt.po    | 6119 +++++++++++++++++++++++++-------------------------
 po/pt_BR.po | 6101 ++++++++++++++++++++++++-------------------------
 po/ro.po    | 6237 ++++++++++++++++++++++++++-------------------------
 po/ru.po    | 6075 +++++++++++++++++++++++++------------------------
 po/sk.po    | 1884 ++++++++--------
 po/sl.po    | 6571 +++++++++++++++++++++++++++--------------------------
 po/sv.po    | 2607 ++++++++++-----------
 po/tr.po    | 5887 ++++++++++++++++++++++++------------------------
 po/uk.po    | 6142 +++++++++++++++++++++++++-------------------------
 po/vi.po    | 6077 +++++++++++++++++++++++++------------------------
 po/zh_CN.po | 5799 ++++++++++++++++++++++++-----------------------
 po/zh_TW.po | 6042 ++++++++++++++++++++++++-------------------------
 38 files changed, 101967 insertions(+), 94675 deletions(-)

commit 084f43ed71151adb1fa9efa842d5b055e4165e83
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jun 2 11:41:52 2012 +0200

    Suggest to provide git-formatted patches rather than `git diff` ones

 doc/geany.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 928b847c1e427f25f56d1715d18a0d1d30ab4f59
Author: Lex Trotman <elextr@gmail.com>
Date:   Sat Jun 2 16:09:16 2012 +1000

    Force selection to change when Default or Alt colourscheme chosen
    
    The selection foreground and background are not changed unless
    the respective 3rd or 4th field is true (see highlighting.c:790).

 data/colorschemes/alt.conf | 2 +-
 data/filetypes.common      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 67ff99b1124594bd846be7a547558fe84837b9dd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 31 23:28:46 2012 +0200

    Add a few missing NEWS entries

 NEWS | 2 ++
 1 file changed, 2 insertions(+)

commit 1725b72ec66730252f0cef48d17943588521cc65
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 31 22:53:51 2012 +0200

    Add a node about the possibility for third party plugins to be on p.g.o

 doc/plugins.dox | 2 ++
 1 file changed, 2 insertions(+)

commit a35435b4d9023bfab2832f1caa8c055c089b5f0f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 31 22:52:17 2012 +0200

    Reword a few sentences

 doc/plugins.dox | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

commit 7b339b8d3053f13020cdd82831b5e4e8b282e19a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu May 31 22:33:07 2012 +0200

    Added a missing word and some smaller changes on spelling (GitHub; pull request)

 doc/geany.txt   | 2 +-
 doc/plugins.dox | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 54ed2189fe5a8c3f6d9c7a340c8647f4e4195e1f
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu May 31 22:27:56 2012 +0200

    Use capitilized version of Git inside documentation

 doc/geany.txt   | 2 +-
 doc/plugins.dox | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 05e5f756c11cd2ab66cf064301c115ae82fd5a7a
Merge: f0a9c42 c309360
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu May 31 22:19:32 2012 +0200

    Merge branch 'master' into tm/tree-refactoring

commit 8965b8bc48b4d04a43f318528d800df322079ffa
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu May 31 22:15:44 2012 +0200

    Some updates on general API documentation to reflect, that geany-plugins don't use svn anymore

 doc/plugins.dox | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

commit 81c84e553dc43bd9bf0589a07d41d2da5a929d2d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Apr 29 17:36:45 2012 +0200

    Removing reference to svn from sending a patch for this document

 doc/geany.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit dbeb690f6719eb210db3271080830325f1d1f8de
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Apr 28 10:40:38 2012 +0200

    Fixing one apperance of svn inside documentation

 doc/geany.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit effab1a1291300018e8320b5a8c291c0ccb61cf4
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Mar 9 14:29:02 2012 +0100

    Remove svn specific scripts as the are not needed anymore

 scripts/svn-add.sh     |  8 -------
 scripts/svn-changes.sh | 60 --------------------------------------------------
 2 files changed, 68 deletions(-)

commit c30936028ee5a8d0ca70202bb57676298bc7d727
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 8 19:33:04 2012 +0200

    When not sorting the file list, don't preserve read order
    
    If the caller doesn't want the list to be sorted, there is no need to
    preserve the order in which the files were actually read, since that
    order is undefined anyway.

 src/utils.c | 2 --
 1 file changed, 2 deletions(-)

commit 13a7fb521e5a5d78f3a50a83ad6fa0eaacad2e6b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 8 19:32:04 2012 +0200

    Don't sort tags file list since the order doesn't matter

 src/symbols.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6f62a55370f629a051184799341498841e2dbb15
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 8 19:27:40 2012 +0200

    g_slist_prepend() is faster than _append() and the order doesn't matter

 src/symbols.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit d03b347145c06e32402613ee46e40eef065c97c3
Author: Matthew Brush <matt@geany.org>
Date:   Wed May 30 17:24:33 2012 -0700

    Remove duplicate NEWS item

 NEWS | 1 -
 1 file changed, 1 deletion(-)

commit 74faf9920e13f92f0bb8b16e0a2e9ed203ff3d89
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed May 30 17:25:24 2012 +0100

    Update for ntrel's changes

 NEWS | 43 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

commit 8bb24011b6be4996ea141c6eaa338e3cdd00fafa
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed May 30 16:45:29 2012 +0100

    Tweak default string color for a little more contrast

 data/filetypes.common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fa5929ecbe75b2cd1adad1abcf3e52c3fac3ad28
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed May 30 13:02:53 2012 +0100

    Fix clearing styles in sci_set_lexer()

 src/sciwrappers.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit c84d486472c19ae388fc068b82bd12c6e470fe7d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 30 01:32:08 2012 +0200

    GeanyWrapLabel: fix rendering issues
    
    GtkLabel may re-create its PangoLayout between calls leading to the
    final layout used for rendering not to be set up with the appropriate
    values for our sizing.  Then, re-set up the layout each time we have to
    deal with it and straight before GtkLabel renders it.

 src/geanywraplabel.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

commit 6c15dd4724eac54f6d2ee9e1964af3a2cd1760f1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 30 01:31:06 2012 +0200

    Drop GEANY_WRAP_LABEL_GET_PRIVATE() macro

 src/geanywraplabel.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

commit 232919a16d95cf1351a11e1e3ee6f82e3218378b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed May 30 01:23:27 2012 +0200

    GeanyWrapLabel: make sure we ask for the height matching our width
    
    With this patch, we make sure the height we query is the one matching
    the width we stored and not a newer or older one.
    
    This only fixes the sizing problem, the rendering issue visible in
    some situations is still present.
    
    This fix is replicated from the fix in libview's WrapLabel, see
    http://view.svn.sourceforge.net/viewvc/view/trunk/libview/libview/wrapLabel.cc?revision=132&view=markup
    It also includes the "fix for the fix",
    http://view.svn.sourceforge.net/viewvc/view/trunk/libview/libview/wrapLabel.cc?revision=135&view=markup

 src/geanywraplabel.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit 9b39c9973a054c6abff398dd140483c7e2b89370
Author: Matthew Brush <matt@geany.org>
Date:   Tue May 29 15:51:02 2012 -0700

    Add some more items to NEWS

 NEWS | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 18dea90938b19bdf12b2d932ce5c964f8c40080b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 29 19:52:26 2012 +0200

    Show shadow around license text view in the about dialog
    
    Since the license is a huge piece of text expected to possibly scroll
    horizontally, and since most themes display the background of text
    views in a different color than the default widget background color,
    adding a shadow makes the edges more visible and the UI neater.

 src/about.c | 3 +++
 1 file changed, 3 insertions(+)

commit d354c597dcd4494dbfdfdccf126ff3bb45de007b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 29 19:31:26 2012 +0200

    Adjust border width of the "Credits" about tab

 src/about.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7aef9c18fb248def92302d1646f7d246f73430d1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 29 19:27:25 2012 +0200

    Update copyright date in about dialog

 src/about.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 563249f7c6659ea2c6436f38af5977da4c5723c9
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue May 29 17:59:37 2012 +0100

    Warn user if current filetype might not support color schemes
    
    If the 'default' style isn't set to a named style, then probably the
    filetype styles have been overridden with manual colors and may not
    work properly with color schemes.
    
    Note: HTML-based filetypes won't show a warning because they don't
    have a 'default' style (they use 'html_default' instead).
    
    This is a simple heuristic, but is worth having to avoid some
    spurious bug reports when using the color schemes dialog.

 src/filetypesprivate.h |  1 +
 src/highlighting.c     | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

commit 12a1295dd1a0e769951b7d7a2ee89f90c4e869a5
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue May 29 17:54:36 2012 +0100

    Do not change message order for sci_set_lexer()
    
    Scintilla mentions clearing styles after setting lexer.

 src/sciwrappers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit edd672c3e5d1aff00816e2fc57f58d69b84fa019
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue May 29 15:16:24 2012 +0100

    Don't clear styles when setting lexer id unless it has changed
    
    This fixes styles being cleared when using the Split Window plugin.

 src/sciwrappers.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit d550bc781c2fa50078bdeacf2eeec16dcf0cee42
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon May 28 13:57:34 2012 +0200

    Update of German translation

 po/de.po | 920 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 466 insertions(+), 454 deletions(-)

commit 2ed1d6d8bbc936a8a21d205d34cf9910114632c0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun May 27 20:12:31 2012 +0200

    Do not apply color scheme upon color scheme selection dialog display
    
    Current color scheme was applied upon color scheme selection dialog
    display because the GtkTreeView::cursor-changed signal is emitted when
    the tree view is initially shown (since it actually gets the focus for
    the first time), uselessly re-applying the current color scheme.
    
    This is a performance issue because when many documents are open
    updating the color scheme can take a few seconds.
    
    Now we watch for the GtkTreeSelection::changed signal on the tree
    view's selection, which is only emitted when the selected item actually
    changes.  We also connect to that signal after filling the tree so we
    don't get notified on the initial selection setup.

 src/highlighting.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit ffd3d739db23c2da70faf960bc060e4a3e29c4ae
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun May 27 17:11:30 2012 +0100

    Fix a missing tag on global tags merge (oops)

 tagmanager/tm_tag.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 915bb5989e2a77469c02a17555f01e8d657dab88
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun May 27 00:28:45 2012 +0200

    Update NEWS to reflect current status

 NEWS | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

commit 262b48b52c66b2b7d10fc0235eb9d24ce1d90026
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun May 27 01:09:05 2012 +0200

    Add a separator after the Color Schemes menu item

 data/geany.glade | 7 +++++++
 1 file changed, 7 insertions(+)

commit e87f393192636e8c03b3743efd82da5e1aa6f167
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun May 27 01:03:18 2012 +0200

    Create color scheme menu item with Glade
    
    Now there is a dialog instead of a menu for selecting the color
    schemes, the item under View->Editor can be created with Glade like the
    rest of the menu.

 data/geany.glade   | 18 ++++++++++++++++++
 src/callbacks.c    |  7 +++++++
 src/callbacks.h    |  4 ++++
 src/highlighting.c | 21 +--------------------
 src/highlighting.h |  4 ++--
 src/main.c         |  3 ---
 6 files changed, 32 insertions(+), 25 deletions(-)

commit ac27a658d26dc6acd4fa73b0e548244879663e7b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat May 26 08:38:27 2012 +0200

    Adding a missing space inside German translation

 po/de.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 23ed5511448d8a4f9450e71b6690690c1728d85e
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat May 26 08:37:31 2012 +0200

    Update of Lithuanian translation provided by Algimantas Margevičius

 po/lt.po | 777 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 396 insertions(+), 381 deletions(-)

commit cf3139de03d7c3b8916b3e22528766c8abd0f6e7
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri May 25 19:47:10 2012 +0200

    Use the same pointer type for all pointers in tm_tags_merge()
    
    This prevents GCC from complaining about implicit casts and comparisons
    between different pointer types.  It also makes the code a little less
    bound at dealing with TMTags.

 tagmanager/tm_tag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2f94aa373e4329dc6d3f103f21333c4e08e95355
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri May 25 19:44:17 2012 +0200

    Fix incomplete copy in tm_tags_merge() that lead to crashes

 tagmanager/tm_tag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c7fa1fd9e26d414d8dee5ff699d8283f12f0865d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed May 16 09:48:39 2012 +0200

    Updated Italian translation provided by Giuseppe Penone

 po/it.po | 2911 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1449 insertions(+), 1462 deletions(-)

commit ef59393e82c61534de17dca265612c8b8aabafe5
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed May 16 09:43:45 2012 +0200

    Update of Swedish translation by Tony Mattsson

 po/sv.po | 2061 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1046 insertions(+), 1015 deletions(-)

commit e5f7f7735f258c7863032778af627bc91e1f58ac
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed May 16 09:31:51 2012 +0200

    Update of Slovakian translation

 po/sk.po | 571 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 289 insertions(+), 282 deletions(-)

commit 3bdc8de2c452fa56fce825aac5019ffa1ad62726
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed May 16 09:30:32 2012 +0200

    Added Tomáš Vadina as Slovakian translator

 THANKS      | 1 +
 src/about.c | 1 +
 2 files changed, 2 insertions(+)

commit c04fd65a8fe5812735768fec6fb5990ecbac589e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon May 14 22:22:29 2012 +0200

    Add support for user-defined labels for custom commands
    
    This allows the user to define a label to be displayed in the menu in
    place of the command to be run.  This can be very useful if e.g. a
    custom command is too complex to be easily read in the menu, or if two
    custom commands are so similar could be confounded.

 src/keyfile.c  | 30 ++++++++++++++++++++
 src/main.c     |  1 +
 src/tools.c    | 89 +++++++++++++++++++++++++++++++++++++++++++---------------
 src/ui_utils.h |  1 +
 4 files changed, 98 insertions(+), 23 deletions(-)

commit f0a9c4298569972abcd6e8d37ddbe7d5c6a7729d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 8 22:52:27 2012 +0200

    Update makefile.win32 build system

 makefile.win32                  |  8 +++---
 src/makefile.win32              |  4 +--
 tagmanager/Makefile.am          |  3 ---
 tagmanager/ctags/makefile.win32 | 56 ++++++++++++++++++++++++++++++++++++++++
 tagmanager/makefile.win32       | 57 -----------------------------------------
 tagmanager/mio/makefile.win32   |  2 +-
 tagmanager/src/makefile.win32   | 52 +++++++++++++++++++++++++++++++++++++
 7 files changed, 116 insertions(+), 66 deletions(-)

commit 13f3ee5e9982f627a743238defa5c5421518cf7e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 8 22:35:55 2012 +0200

    Update Waf build system

 wscript | 103 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 78 insertions(+), 25 deletions(-)

commit d69a153bb440bf5e27db6851fa291555be5f9d4b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue May 8 22:14:29 2012 +0200

    Refactor tagmanager source files architecture
    
    Split ctags and tagmanager sources, as follows:
    
    tagmanager/ctags: the parsers, more or less upstream CTags;
    tagmanager/mio: local MIO library copy;
    tagmanager/src: actual tagmanager sources.

 configure.ac                        |    3 +-
 plugins/Makefile.am                 |    4 +-
 src/Makefile.am                     |   30 +-
 tagmanager/Makefile.am              |   83 +-
 tagmanager/abc.c                    |  127 --
 tagmanager/actionscript.c           |   99 --
 tagmanager/args.c                   |  256 ---
 tagmanager/args.h                   |   58 -
 tagmanager/asm.c                    |  384 -----
 tagmanager/basic.c                  |  257 ---
 tagmanager/c.c                      | 3233 -----------------------------------
 tagmanager/cobol.c                  |   48 -
 tagmanager/conf.c                   |  127 --
 tagmanager/css.c                    |  234 ---
 tagmanager/ctags.c                  | 1401 ---------------
 tagmanager/ctags.h                  |   25 -
 tagmanager/ctags/Makefile.am        |   80 +
 tagmanager/ctags/abc.c              |  127 ++
 tagmanager/ctags/actionscript.c     |   99 ++
 tagmanager/ctags/args.c             |  256 +++
 tagmanager/ctags/args.h             |   58 +
 tagmanager/ctags/asm.c              |  384 +++++
 tagmanager/ctags/basic.c            |  257 +++
 tagmanager/ctags/c.c                | 3233 +++++++++++++++++++++++++++++++++++
 tagmanager/ctags/cobol.c            |   48 +
 tagmanager/ctags/conf.c             |  127 ++
 tagmanager/ctags/css.c              |  234 +++
 tagmanager/ctags/ctags.c            | 1401 +++++++++++++++
 tagmanager/ctags/ctags.h            |   25 +
 tagmanager/ctags/diff.c             |  136 ++
 tagmanager/ctags/docbook.c          |  151 ++
 tagmanager/ctags/entry.c            |  421 +++++
 tagmanager/ctags/entry.h            |  103 ++
 tagmanager/ctags/fortran.c          | 2241 ++++++++++++++++++++++++
 tagmanager/ctags/general.h          |  257 +++
 tagmanager/ctags/get.c              |  849 +++++++++
 tagmanager/ctags/get.h              |   51 +
 tagmanager/ctags/haskell.c          |  357 ++++
 tagmanager/ctags/haxe.c             |  233 +++
 tagmanager/ctags/html.c             |   69 +
 tagmanager/ctags/js.c               | 1650 ++++++++++++++++++
 tagmanager/ctags/keyword.c          |  254 +++
 tagmanager/ctags/keyword.h          |   32 +
 tagmanager/ctags/latex.c            |  244 +++
 tagmanager/ctags/lregex.c           |  696 ++++++++
 tagmanager/ctags/lua.c              |  130 ++
 tagmanager/ctags/main.h             |   82 +
 tagmanager/ctags/make.c             |  284 +++
 tagmanager/ctags/markdown.c         |  105 ++
 tagmanager/ctags/matlab.c           |  150 ++
 tagmanager/ctags/nestlevel.c        |   76 +
 tagmanager/ctags/nestlevel.h        |   52 +
 tagmanager/ctags/nsis.c             |  147 ++
 tagmanager/ctags/objc.c             | 1142 +++++++++++++
 tagmanager/ctags/options.c          |  236 +++
 tagmanager/ctags/options.h          |  111 ++
 tagmanager/ctags/parse.c            |  650 +++++++
 tagmanager/ctags/parse.h            |  137 ++
 tagmanager/ctags/parsers.h          |  109 ++
 tagmanager/ctags/pascal.c           |  357 ++++
 tagmanager/ctags/perl.c             |  380 ++++
 tagmanager/ctags/php.c              |  281 +++
 tagmanager/ctags/python.c           |  806 +++++++++
 tagmanager/ctags/r.c                |  195 +++
 tagmanager/ctags/read.c             |  605 +++++++
 tagmanager/ctags/read.h             |  120 ++
 tagmanager/ctags/rest.c             |  176 ++
 tagmanager/ctags/ruby.c             |  408 +++++
 tagmanager/ctags/sh.c               |  112 ++
 tagmanager/ctags/sort.c             |  220 +++
 tagmanager/ctags/sort.h             |   30 +
 tagmanager/ctags/sql.c              | 1675 ++++++++++++++++++
 tagmanager/ctags/strlist.c          |  280 +++
 tagmanager/ctags/strlist.h          |   52 +
 tagmanager/ctags/tcl.c              |  147 ++
 tagmanager/ctags/txt2tags.c         |  133 ++
 tagmanager/ctags/verilog.c          |  337 ++++
 tagmanager/ctags/vhdl.c             |  299 ++++
 tagmanager/ctags/vstring.c          |  230 +++
 tagmanager/ctags/vstring.h          |   82 +
 tagmanager/diff.c                   |  136 --
 tagmanager/docbook.c                |  151 --
 tagmanager/entry.c                  |  421 -----
 tagmanager/entry.h                  |  103 --
 tagmanager/fortran.c                | 2241 ------------------------
 tagmanager/general.h                |  257 ---
 tagmanager/get.c                    |  849 ---------
 tagmanager/get.h                    |   51 -
 tagmanager/haskell.c                |  357 ----
 tagmanager/haxe.c                   |  233 ---
 tagmanager/html.c                   |   69 -
 tagmanager/include/Makefile.am      |   10 -
 tagmanager/include/tm_file_entry.h  |  124 --
 tagmanager/include/tm_project.h     |  207 ---
 tagmanager/include/tm_source_file.h |  160 --
 tagmanager/include/tm_symbol.h      |   80 -
 tagmanager/include/tm_tag.h         |  375 ----
 tagmanager/include/tm_tagmanager.h  |   40 -
 tagmanager/include/tm_work_object.h |  184 --
 tagmanager/include/tm_workspace.h   |  181 --
 tagmanager/js.c                     | 1650 ------------------
 tagmanager/keyword.c                |  254 ---
 tagmanager/keyword.h                |   32 -
 tagmanager/latex.c                  |  244 ---
 tagmanager/lregex.c                 |  696 --------
 tagmanager/lua.c                    |  130 --
 tagmanager/main.h                   |   82 -
 tagmanager/make.c                   |  284 ---
 tagmanager/markdown.c               |  105 --
 tagmanager/matlab.c                 |  150 --
 tagmanager/mio/Makefile.am          |    2 -
 tagmanager/nestlevel.c              |   76 -
 tagmanager/nestlevel.h              |   52 -
 tagmanager/nsis.c                   |  147 --
 tagmanager/objc.c                   | 1142 -------------
 tagmanager/options.c                |  236 ---
 tagmanager/options.h                |  111 --
 tagmanager/parse.c                  |  650 -------
 tagmanager/parse.h                  |  137 --
 tagmanager/parsers.h                |  109 --
 tagmanager/pascal.c                 |  357 ----
 tagmanager/perl.c                   |  380 ----
 tagmanager/php.c                    |  281 ---
 tagmanager/python.c                 |  806 ---------
 tagmanager/r.c                      |  195 ---
 tagmanager/read.c                   |  605 -------
 tagmanager/read.h                   |  120 --
 tagmanager/rest.c                   |  176 --
 tagmanager/ruby.c                   |  408 -----
 tagmanager/sh.c                     |  112 --
 tagmanager/sort.c                   |  220 ---
 tagmanager/sort.h                   |   30 -
 tagmanager/sql.c                    | 1675 ------------------
 tagmanager/src/Makefile.am          |   34 +
 tagmanager/src/tm_file_entry.c      |  282 +++
 tagmanager/src/tm_file_entry.h      |  124 ++
 tagmanager/src/tm_project.c         |  568 ++++++
 tagmanager/src/tm_project.h         |  207 +++
 tagmanager/src/tm_source_file.c     |  369 ++++
 tagmanager/src/tm_source_file.h     |  160 ++
 tagmanager/src/tm_symbol.c          |  319 ++++
 tagmanager/src/tm_symbol.h          |   80 +
 tagmanager/src/tm_tag.c             |  854 +++++++++
 tagmanager/src/tm_tag.h             |  375 ++++
 tagmanager/src/tm_tagmanager.c      |   11 +
 tagmanager/src/tm_tagmanager.h      |   40 +
 tagmanager/src/tm_work_object.c     |  298 ++++
 tagmanager/src/tm_work_object.h     |  184 ++
 tagmanager/src/tm_workspace.c       | 1264 ++++++++++++++
 tagmanager/src/tm_workspace.h       |  181 ++
 tagmanager/strlist.c                |  280 ---
 tagmanager/strlist.h                |   52 -
 tagmanager/tcl.c                    |  147 --
 tagmanager/tm_file_entry.c          |  282 ---
 tagmanager/tm_project.c             |  568 ------
 tagmanager/tm_source_file.c         |  369 ----
 tagmanager/tm_symbol.c              |  319 ----
 tagmanager/tm_tag.c                 |  854 ---------
 tagmanager/tm_tagmanager.c          |   11 -
 tagmanager/tm_work_object.c         |  298 ----
 tagmanager/tm_workspace.c           | 1264 --------------
 tagmanager/txt2tags.c               |  133 --
 tagmanager/verilog.c                |  337 ----
 tagmanager/vhdl.c                   |  299 ----
 tagmanager/vstring.c                |  230 ---
 tagmanager/vstring.h                |   82 -
 166 files changed, 29788 insertions(+), 29748 deletions(-)

commit 11c3c91525919cb5b9f7bf168cbe8e894f345f88
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun May 6 08:14:14 2012 +0200

    Fixed a wrong reference to utils_open_browser()

 doc/pluginsymbols.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9a80935835c3b49c0f29876e9d8efa0d309d49be
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri May 4 23:13:36 2012 +0200

    Use the same Python interpreter for the genapi.py script as for the Waf script
    
    This ensures we call the genapi.py script with the same Python interpreter as the Waf
    build system was called. This is relevant if the used interpreter is not 'python' but e.g.
    python2 or python2.6 or whatever.

 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3d1c7e3f57e3a4fa2ac527cd14f5ece5501c10c3
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri May 4 23:11:40 2012 +0200

    PEP8 fixes

 plugins/genapi.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit af70c1dbcba5ef2b8f637e74d6dcd25aa8848f6b
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Fri May 4 23:10:43 2012 +0200

    Make the script Python3 compatible

 plugins/genapi.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 1588a675705cf0eb0a0025c67c9e7a623300589d
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu May 3 18:17:39 2012 +0200

    Update of Italian translation by Giuseppe Penone

 po/it.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 249f9bc285d605257b0279d0ffb034eb2785cdcd
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Apr 28 08:51:26 2012 +0200

    Update of Italian translation by Giuseppe Penone

 po/it.po | 2050 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1122 insertions(+), 928 deletions(-)

commit 33e1a81b4a5d9f7d282b260c868fd1a5d6c1efaf
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Apr 26 13:50:39 2012 +0100

    Ignore D 'static if' tests
    
    This prevents the parser getting confused.

 tagmanager/c.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 3f7b888b32a46683f8d67902df4c5d45ddb11a0e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Apr 26 13:18:05 2012 +0100

    Avoid unnecessary hash table for global tag filenames

 src/filetypes.c        |  9 ++++++---
 src/filetypesprivate.h |  1 +
 src/symbols.c          | 40 ++++++++++++++--------------------------
 3 files changed, 21 insertions(+), 29 deletions(-)

commit 6e46a7bd3d6805a7af995e0487a4ac22c97c35e3
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Apr 25 16:10:33 2012 +0100

    Fix existing leak when a matching ignore.tags item is parsed

 HACKING              |  1 +
 tagmanager/options.c | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

commit a56373cabdceafb9e282ee5e287b5b3c7ce25b9f
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Apr 25 15:54:56 2012 +0100

    Support PREFIX* in ignore.tags

 doc/geany.html       | 6 +++++-
 doc/geany.txt        | 5 +++++
 tagmanager/options.c | 9 +++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

commit 000bd8547cb349afc50318fd3856df6cfafad4a8
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Apr 25 15:47:49 2012 +0100

    Use g_str_has_prefix to prevent invalid memory reads in find_shebang()

 src/filetypes.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 7c545a30940a403086859f2b2cdcd4d9221c38f7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Apr 25 12:54:25 2012 +0100

    Delete temporary error file

 tagmanager/tm_workspace.c | 1 +
 1 file changed, 1 insertion(+)

commit 6edb38b54a6d6d3583bc41dfda17a1fe6489e9c0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 23 20:45:40 2012 +0200

    Rewrite shebang interpreter matching a little
    
    Use a generic match code and an array of the mappings for easier code
    maintenance.

 src/filetypes.c | 56 ++++++++++++++++++++++++++------------------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

commit 4f87e31478866f8e221bbccd380c944d1bd565ce
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Apr 24 17:35:31 2012 +0100

    Show tag preprocessing errors on stderr

 tagmanager/tm_workspace.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit c17d128bcd64b4753607b87d2d5c27efc7e84970
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Apr 24 17:19:40 2012 +0100

    Add current dir to include path for tag preprocessing

 src/symbols.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 003185f897069ab44277dce8ecfa91f790785bd9
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Apr 24 16:33:31 2012 +0100

    Grep isn't required for tag file generation; remove replacing c99.tags
    
    This removes 'Replacing the default C/C++ tags file' - we should
    not encourage users to do this as it's unnecessary and error-prone
    when updating Geany.

 doc/geany.html | 688 +++++++++++++++++++++++++++++----------------------------
 doc/geany.txt  |  34 +--
 2 files changed, 358 insertions(+), 364 deletions(-)

commit 3275d510d8a64ce0d1be91aa8b11b3e845ff02fd
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Apr 23 16:58:55 2012 +0100

    Remove unportable pipe-to-grep tag generation hack
    
    Instead always ignore G_BEGIN_DECLS and G_END_DECLS tags.

 src/symbols.c             | 3 +++
 tagmanager/tm_workspace.c | 8 +-------
 2 files changed, 4 insertions(+), 7 deletions(-)

commit 1a9451bfc4915ada3ab2d0743293532f574cad00
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Apr 23 16:17:40 2012 +0100

    Fix NULL tags array warning in document_highlight_tags

 src/document.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit d2d4f0b6233a80cbe6294d0fb68695f35d0a62a3
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Apr 23 13:44:22 2012 +0100

    Enforce filetype extension for user tag files

 src/symbols.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 24359942bfe96d37c76cccfc3e9993ec83e912d1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Apr 22 17:31:38 2012 +0100

    Show selected line count on status bar when whole lines are selected

 src/ui_utils.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 4bd962ee8dde25b4ce5605ce7b4bf43d79d066f6
Author: Lex Trotman <elextr@gmail.com>
Date:   Sun Apr 22 10:54:41 2012 +1000

    Remove hard coded option that prevents 64 bit tag generation.
    
    On GNU X86-64 systems the predefined macros are required
    to choose the correct headers, so tag definition fails with
    -undef.  Removed it from hardcoded, systems that need it can
    add it to CFLAGS.

 src/symbols.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 6b22ab908c825cf30bae4b5468dd632e46a2b23a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Apr 15 16:54:05 2012 +0200

    Adding it into THANKS for Giuliano

 THANKS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 712cdd6aa0005f65bd77b15c34cd29067864628d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Apr 20 13:03:41 2012 +0100

    Merge global tags in order rather than resorting the whole array
    
    This is much faster than resorting, especially when there are many
    global tags files loaded.

 tagmanager/include/tm_tag.h |  3 +++
 tagmanager/tm_tag.c         | 45 +++++++++++++++++++++++++++++++++++++++++++++
 tagmanager/tm_workspace.c   |  8 ++++----
 3 files changed, 52 insertions(+), 4 deletions(-)

commit d3aed9f08b843ea8df7dc39c26e00deb59813845
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Apr 19 17:03:23 2012 +0200

    Adding a first version of Slovakian translation provided by Tomáš Vadina

 po/sk.po | 5381 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 5381 insertions(+)

commit 06d02e29db6694ff19ab47f39c7899fc96c9f6ba
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Apr 18 13:29:40 2012 +0100

    Indent with tabs

 tagmanager/docbook.c | 54 ++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

commit 495336ca1910ddbb5fb2b699316d9f7b1ab5cd4d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Apr 16 12:58:44 2012 +0100

    Fix DocBook styling (broken in 7ebdac)

 data/filetypes.docbook | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

commit ac34a19abe60def11a821d54fe2fbb0b9b6ca845
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Apr 16 12:05:18 2012 +0100

    Show SGML entity completion on first typing '&' again

 src/editor.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit f2a93d379010af6d584addf867c9c22ab86d8a00
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Apr 16 11:56:25 2012 +0100

    Don't autocomplete XML entities when outside of XML style range

 src/editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9ddeed5254dbb2b23a18c2685d4f2e2d2b224eed
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Apr 13 17:08:49 2012 +0100

    Enable entity completion for XML documents

 src/editor.c       | 21 +++++++++++----------
 src/highlighting.c |  2 ++
 2 files changed, 13 insertions(+), 10 deletions(-)

commit 9db1247b96d3815ff470cb02f40eb71eb881c0b6
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Apr 13 16:29:55 2012 +0100

    Cleanup HTML entity checks and fix HTML/PHP autocompletion

 src/editor.c | 56 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

commit 3ecfe90ad775ae297aa36a98ac78b6b13a745b11
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Apr 13 09:33:38 2012 +0200

    Update of Slovenian translation provided by Jože Klepec

 po/sl.po | 1765 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 803 insertions(+), 962 deletions(-)

commit 3eb8e23ecccaed54c70597fc95990db98fff70c6
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Thu Apr 12 23:07:33 2012 +0200

    Code style cleanup
    
    Several small fixes to be more PEP8 compliant (while not completely on purpose).
    There are no functional changes.

 wscript | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

commit 012a904e7496699b792761c12385cd289d7b6f68
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Thu Apr 12 23:00:39 2012 +0200

    Define minimum GTK and Glib versions globally to be reused later

 wscript | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 0249d3e90652b1aebabe32cfc7a9518596eb7fef
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Thu Apr 12 22:41:47 2012 +0200

    Don't warn about missing configure flags if configure shall be skipped

 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9fad7aaa55bbe4eeef6e4fd89ea6767c0325d846
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Apr 12 17:49:00 2012 +0100

    Hide autocompletion when the only entry has been typed
    
    Fixes #3516212.

 src/editor.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit 5f0963d4706d40d6beefd844d2c7e7b25847a191
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Apr 12 17:39:10 2012 +0200

    List package dependencies only in configure.ac
    
    This prevents from having to update both configure.ac and geany.pc.in
    every time our dependencies (e.g. GTK version) change.

 configure.ac | 6 ++++--
 geany.pc.in  | 2 +-
 wscript      | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

commit 890667db5ac473f4a40e8fd73591a7867bcff874
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Apr 11 21:58:45 2012 +0200

    Adding some more meta information to Norvegian translation

 po/nn.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bdf71ff58687684e574122b1b2a7d70589d54878
Author: Håkon Vågsether <hauk142@gmail.com>
Date:   Wed Feb 8 19:32:38 2012 +0100

    Added Norwegian Nynorsk translation

 po/nn.po | 5357 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 5357 insertions(+)

commit 78432b5806f492843af3eaf9a696e600fc4aad06
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Apr 10 04:07:16 2012 +0200

    Find in files: split extra options like a shell would do
    
    Don't simply split the the extra options string on spaces to build the
    grep argument list but rather split it in a shell-style fashion.
    
    This is probably more intuitive for most users, is more consistent with
    e.g. custom commands, and allows for spaces in an option or its
    argument.
    
    Closes #3516263.

 NEWS         |  4 ++++
 src/search.c | 13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

commit 728eeb854be9090595c16ce94918adeee23397fb
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sat Apr 7 18:21:51 2012 +0100

    Remove unnecessary fields from StashTreeValue

 src/stash.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 9f06d49f6f43aa54d00f7815a12bc8320dee8cfc
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sat Apr 7 18:09:28 2012 +0100

    Use union for StashTreeValue instead of void*
    
    This avoids many casts.

 src/stash.c | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

commit 4509dd6457948838eab37e4fc61d5823a55e22e1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Apr 6 17:46:02 2012 +0100

    Use union for StashPref extra fields that depend on widget_type
    
    This should make the code clearer vs. using a void*.

 src/stash.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

commit f2d33bc16ea8c8c6ef5f8f5cd6aee77ec63f2129
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Thu Apr 5 20:59:57 2012 +0300

    Add stash_group_free_settings() function to API
    
    Frees the memory allocated for setting values in a group.

 plugins/geanyfunctions.h |  2 ++
 src/plugindata.h         |  5 +++--
 src/plugins.c            |  3 ++-
 src/stash.c              | 23 +++++++++++++++++++++++
 src/stash.h              |  2 ++
 5 files changed, 32 insertions(+), 3 deletions(-)

commit c7b3a09f05b32078f827b05fc0070345f9f7c33c
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Apr 4 13:37:31 2012 +0100

    Update bold flag after editing shortcut

 src/prefs.c | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

commit 6286b288a483498fd427d2d22ca6b461bc914cbe
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Apr 4 13:17:41 2012 +0100

    Fix always showing Save All keybinding as overridden
    
    Defaults should use lowercase e.g. GDK_s, not GDK_S.

 src/keybindings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9e418d7aafeb1aa482255c723a095f2f92572c69
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Apr 3 16:56:32 2012 +0100

    Show overridden keybindings in bold for prefs dialog tree

 src/keybindings.c |  2 ++
 src/keybindings.h |  2 ++
 src/prefs.c       | 18 +++++++++++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)

commit fa7959f31652612f72cc6dadbeb5e846373eac61
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Apr 3 16:09:06 2012 +0100

    Maintain sidebar width when sidebar is on the right
    
    Resizing the window should not affect sidebar width.
    Fixes #3514436.

 src/ui_utils.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit 00143d2d78319c03574f0b393dd72e42ccf67c8a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Apr 2 20:38:23 2012 +0200

    Update of Italian translation. Thanks to Giuseppe Penone

 po/it.po | 1642 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 721 insertions(+), 921 deletions(-)

commit ba4ccc6653fd2a7940999a4f57ef793682da8c3e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 2 15:56:47 2012 +0200

    Waf: mark Scintilla as using GLib and GModule
    
    This doesn't change anything in practice since GTK brings GLib and
    GModule is linked with the Geany program, but it's cleaner for the lib
    to list its true dependencies.

 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7b2f0fe5aef6c389738f4a861cc19dfec5ce2c42
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Apr 2 14:56:19 2012 +0200

    Explicitly depend on GModule
    
    GIO used to bring GModule, but it became a private dependency since
    GIO 2.31.  So, add explicit checks for GModule so we still build with
    GLib/GIO >= 2.31.
    
    Closes #3483388.

 configure.ac | 2 +-
 wscript      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

commit e5ae146730241621fef781233f2446b1e44d6c1c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Mar 31 09:44:39 2012 +0200

    Update of Italian translation. Thanks to Giuseppe Penone

 po/it.po | 7018 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 3125 insertions(+), 3893 deletions(-)

commit 8a15fe80ec58ebc22d27e7177539055ac72b2f80
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Mar 31 09:41:41 2012 +0200

    Remove ChangeLog of po-files. git-backlog is way better

 po/ChangeLog | 2140 ----------------------------------------------------------
 1 file changed, 2140 deletions(-)

commit c670742316d9c7417bfc21055c2d6f4d6cd8620b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Mar 31 09:40:50 2012 +0200

    Update of German translation

 po/de.po | 3284 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1740 insertions(+), 1544 deletions(-)

commit 51dc2e9baff2ef9391ce8d5acbad7df3b834fb18
Author: Matthew Brush <matt@geany.org>
Date:   Wed Mar 28 22:50:18 2012 -0700

    Support plugins written in C++
    
    Rename use of C++ `template` keyword in plugin API function argument
    and add `G_BEGIN_DECLS` and `G_END_DECLS` to public header files to
    make them easier to include in C++ code. TagManager and Scintilla
    headers already have these `extern "C"` blocks so they shouldn't
    require any modifications.
    
    The Autotools build system already adds in a `dummy.cxx` to hint
    Automake into C++ linking to support Scintilla, which is quite
    convenient for dynamically loading of C++ plugins at run-time into
    the otherwise C-only program. The other build systems seem to also
    use the correct linking.

 doc/plugins.dox    | 23 ++++++++++++++++++++++-
 src/build.h        |  4 ++++
 src/document.h     |  4 ++++
 src/editor.h       |  4 ++++
 src/encodings.h    |  3 +++
 src/filetypes.h    |  4 ++++
 src/geany.h        |  8 ++++++--
 src/highlighting.h |  4 ++++
 src/keybindings.h  |  4 ++++
 src/msgwindow.h    |  3 +++
 src/plugindata.h   |  4 ++++
 src/prefs.h        |  4 ++++
 src/project.h      |  4 ++++
 src/search.h       |  4 ++++
 src/stash.h        |  4 ++++
 src/support.h      |  3 +++
 src/templates.c    | 10 +++++-----
 src/templates.h    |  6 +++++-
 src/toolbar.h      |  4 ++++
 src/ui_utils.h     |  3 +++
 src/utils.h        |  3 +++
 21 files changed, 101 insertions(+), 9 deletions(-)

commit 7b8add40192ac4dadd419666450adcb4b39176bd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Mar 18 14:23:13 2012 +0100

    Better handling of duplicated tags in the sidebar

 src/symbols.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 120 insertions(+), 11 deletions(-)

commit ec3efe04867c29ab64247ae62c77827fc743568a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Mar 20 12:59:29 2012 +0000

    Fix existing user's goto tag/move tab workaround (oops)
    
    Write an empty keybindings.conf for new users to prevent the workaround
    for old defaults being written.
    
    Also remove generated comment in keybindings.conf, this file doesn't
    need an explanation as it is generated by Geany.

 src/keybindings.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

commit 99e8ed495b442afdc30259a5928b80595cdf2dc6
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Mar 19 16:36:27 2012 +0000

    Don't change existing user's goto tag, move tab keybindings
    
    This provides a workaround so existing users who upgrade should now
    be unaffected.
    
    The default changed for these in commits
    82769a046c6394d073cc8a32677d8d4794c12c4c and
    9ae71ab6cc3bb8185939e1536ffba41beb896686, but this may be
    confusing/annoying for existing users who have not edited any
    keybindings.
    
    Those commit messages were wrong about never affecting existing
    users. Thanks to Lex for raising this.

 src/keybindings.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit f4afe96880ed01b4ecb6ffe32e10c34e2b661399
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Sat Mar 10 17:43:49 2012 +0400

    Fix opening project in already running instance (via socket).
    
    Previously the code didn't properly handle the case when other project
    is already opened.

 src/socket.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 6badca5201d808eac10cc5b04ed812145f07e884
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Mar 15 16:12:32 2012 +0000

    Destroy color scheme dialog after closing instead of just hiding it

 src/highlighting.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 4e42814ead5c2306779af2602ff564476bea262f
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Thu Mar 15 15:48:52 2012 +0000

    Automatically show color scheme dialog scrollbars, set shadow type

 src/highlighting.c | 3 +++
 1 file changed, 3 insertions(+)

commit d54504355e9eac6bd168c8c5934b2aed7b65255c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Mar 14 20:19:39 2012 +0100

    Update of Hungarian translation

 po/ChangeLog |    1 +
 po/hu.po     | 1912 ++++++++++++++++++++++++++--------------------------------
 2 files changed, 852 insertions(+), 1061 deletions(-)

commit d3e5f775db0409752c1238d94bca2ce33267f2cb
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Wed Mar 14 20:16:46 2012 +0100

    Update of Lithuanian translation

 po/ChangeLog |   5 +
 po/lt.po     | 909 +++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 513 insertions(+), 401 deletions(-)

commit dcc079d814fda67d99c2d36b8a49ae09c3c92b8b
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Mar 14 16:56:55 2012 +0000

    Replace Color Schemes menu with custom dialog
    
    A dialog makes it easier to select different items when comparing
    themes, and easier to see the descriptions.

 src/highlighting.c | 160 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 108 insertions(+), 52 deletions(-)

commit a2efc32d1fbdc58b91d10ef34371263656981971
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Mar 13 13:48:15 2012 +0000

    Add basic install target, requires admin privileges and MSYS

 makefile.win32 | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 43ee34f660418358f0970c3652d294030af2f18b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Mar 12 19:03:05 2012 +0100

    Added Lithuanian translation

 THANKS       |    1 +
 po/ChangeLog |    5 +
 po/lt.po     | 5476 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/about.c  |    1 +
 4 files changed, 5483 insertions(+)

commit f3cff26ef85eaa887c49cb79d15aedd86af11532
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Mar 9 16:55:21 2012 +0100

    Added Arabian translation

 THANKS       |    1 +
 po/ChangeLog |    5 +
 po/ar.po     | 5370 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/about.c  |    1 +
 4 files changed, 5377 insertions(+)

commit 0df9835fd5662ce040a68e90422da2e8fb2b33d0
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Thu Mar 8 18:53:23 2012 +0200

    free configfile in configuration_reload_default_session

 src/keyfile.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5584990fb642d0ac908390860837535c9ef3c288
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Mar 5 19:28:53 2012 +0100

    Update of German translation

 po/ChangeLog |   5 +
 po/de.po     | 805 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 415 insertions(+), 395 deletions(-)

commit 3bcd7fc40078efd601f0e9bed8efec971d505db2
Merge: 3d4e8b4 5cc8a96
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Sun Feb 26 21:04:50 2012 -0800

    Merge pull request #19 from techee/fixes
    
    Fixes

commit 3d4e8b41d419255ee1b0764fb60e45ea588bd800
Merge: d7d5a6d ca9dca9
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Sun Feb 26 20:50:01 2012 -0800

    Merge pull request #25 from techee/project_patches
    
    Project patches

commit d7d5a6d7fb48c9b86218f1e826ffd1b05207a128
Author: Matthew Brush <matt@geany.org>
Date:   Sun Feb 26 20:12:38 2012 -0800

    Add some more key links to the Help menu (wiki, bug tracker, donate)

 data/geany.glade | 199 +++++++++++++++++++++++++++++++++----------------------
 src/callbacks.c  |  18 +++++
 src/callbacks.h  |  11 ++-
 src/geany.h      |   3 +
 4 files changed, 149 insertions(+), 82 deletions(-)

commit c54489c86c52bb0896be38149bf85e54a5a6851a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sat Feb 25 19:42:21 2012 +0100

    Update of German translation

 po/ChangeLog |    5 +
 po/de.po     | 6193 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 3089 insertions(+), 3109 deletions(-)

commit 15bbe3633110759a137737ad5631bce0f644f2cd
Merge: 795ee4c f8fd930
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Feb 25 18:05:10 2012 +0100

    Merge branch 'earshinov/join-lines-2'

commit f8fd93039b577a21819baa7722314612e25b94e9
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Thu Jan 19 14:10:11 2012 +0400

    join_lines: Remove excessive comments

 src/keybindings.c | 54 ++++++------------------------------------------------
 1 file changed, 6 insertions(+), 48 deletions(-)

commit 2d29296302a40e5af39a81657d9a91f049fe579f
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Sat Feb 25 17:29:04 2012 +0400

    join_lines: Remove `sci_fix_selection_anchors` function.
    
    Previously it was useful because `reflow_lines`, in case when selection
    contained trailing newline, removed that newline from selection by
    calling `sci_set_selection_end` which only works when anchor > current
    cursor position (it's mentioned in Scintilla's documentation on
    SCI_SETSELECTIONEND).
    
    Now trailing newline is removed by calling `sci_deselect_last_newline`
    which uses `sci_set_selection` with `start` and `end` arguments.  This
    function works regardless of the interposition of current cursor
    position and anchor.

 src/keybindings.c | 13 -------------
 1 file changed, 13 deletions(-)

commit f318b2cca0fa9fa024d3dddb908c1e490ab78a0e
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Wed Jan 18 10:42:32 2012 +0400

    join_lines: Remove some obsolete code from `reflow_lines`.
    
    The code joined current line with the next one when no text is selected.
    For "Join lines" command this behaviour is wrong; for "Reflow paragraph"
    the case is already handled outside the `reflow_lines` function.

 src/keybindings.c | 4 ----
 1 file changed, 4 deletions(-)

commit 1816b0d7f4a8b4022950ae5abfd74dbb60ce580c
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Thu Feb 23 23:54:52 2012 +0400

    join_lines: Don't exclude trailing newline from the selection in `reflow_lines`
    
    This is now done by the calling code.

 src/keybindings.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

commit 6b760b99d45238c343493f0bfe9f95958c071096
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Thu Feb 23 12:56:28 2012 +0400

    join_lines: Add "Join lines" command.
    
    The code of existing "Reflow paragraph" command was refactored to
    extract the bits required for the new command.

 src/keybindings.c | 105 ++++++++++++++++++++++++++++++++++++++----------------
 src/keybindings.h |   1 +
 2 files changed, 76 insertions(+), 30 deletions(-)

commit 795ee4cf4bea525814b5793a6771d3da78f6c863
Merge: 9fa6cfe 5fb7522
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Feb 24 13:01:08 2012 -0800

    Merge pull request #28 from RetroX/patch-1
    
    Added size_t, ptrdiff_t, intN_t to filetypes.cpp.

commit 5fb7522b723b63a4eccdc9b1f13f1f44fb8c5f7c
Author: Alex Charron <classixretrox@gmail.com>
Date:   Fri Feb 24 15:29:17 2012 -0500

    Added size_t, ptrdiff_t, intN_t to filetypes.cpp.

 data/filetypes.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9fa6cfe47b606c447d8820613623a5a80b761cc0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Feb 22 14:58:47 2012 +0100

    Rebuild HTML manual

 doc/geany.html | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 373734980b1ad8ab9990eae87e1a3dfc42537d05
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Feb 20 21:20:48 2012 +0200

    altered Geany manual "Startup" to reflect that the default session is loaded even if opening file(s)

 doc/geany.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 2cf30ebadbf8fe7b23310cf7fb4e83983251f536
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Feb 21 22:55:36 2012 +0100

    Update of Kazakh translation. Thanks to Baurzhan Muftakhidinov

 po/ChangeLog |    5 +
 po/kk.po     | 6450 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 3253 insertions(+), 3202 deletions(-)

commit f5262a453ed7fbc4ab5f4387a066a597d147c8e9
Author: Eugene Arshinov <earshinov@gmail.com>
Date:   Sun Feb 19 10:46:00 2012 +0400

    Use Scintilla's MOVESELECTEDLINES{UP,DOWN} commands.

 src/keybindings.c | 35 ++---------------------------------
 src/sciwrappers.c | 10 ++++++++++
 src/sciwrappers.h |  3 +++
 3 files changed, 15 insertions(+), 33 deletions(-)

commit ad1c08ebbe6a7e33bddfea15fafb8f94fea95fb5
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Feb 20 19:18:21 2012 +0200

    Load the default session even if opening file(s)
    
    A slightly simplified variant of the "rewritten load startup files"
    from Geany patch tracker. Does not check for CLI files when deciding
    whether to load the default session.

 src/main.c | 60 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

commit 3d570d750f9d3787aac5e42ade34741f2f22e7c5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Feb 20 17:25:21 2012 +0100

    Map TCL "SUB_BRACE" style

 data/filetypes.tcl         | 1 +
 src/highlightingmappings.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit ca9dca94f890ed53741b2ec0b7bbdccaaeb72d36
Author: Jiří Techet <techet@gmail.com>
Date:   Mon Feb 20 00:06:24 2012 +0100

    Drop 'already' from the message in project close confirmation dialog
    
    Suppose you have project A open and want to open project B. Then the message
    saying "The 'A' project is already open" displays. This is slightly confusing
    and feels like if you were trying to re-open project A even though you
    are opening different project. The message without 'already' looks clearer
    in this context.

 src/project.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8e2f7db298f67960974fbca11427a50999aa3a8a
Author: Jiří Techet <techet@gmail.com>
Date:   Sun Feb 19 23:55:25 2012 +0100

    Modify project dialog signals
    
    Rename project-dialog-create signal to project-dialog-open because now
    the dialog exists all the time and the signal name is misleading. Add
    project-dialog-close signal to indicate that project dialog has been closed
    and plugins can remove their tabs when needed.
    
    In addition, bump plugin API and ABI version.

 doc/pluginsignals.c | 15 ++++++++++++---
 src/geanyobject.c   | 15 ++++++++++++---
 src/geanyobject.h   |  6 ++++--
 src/plugindata.h    |  4 ++--
 src/project.c       |  3 ++-
 5 files changed, 32 insertions(+), 11 deletions(-)

commit 4b1a3b39d43740899400e957d7e30ae2073f89cf
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Feb 19 10:30:31 2012 +0100

    Small changes on function documentation of ui_lookup_stock_label() as doxygen complained a bit

 src/ui_utils.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 33d5378508be235954e86aabc1688ac9d07defdd
Author: Lex Trotman <elextr@gmail.com>
Date:   Fri Feb 17 09:26:03 2012 +1100

    Add build.h to list of headers installed (autotools)

 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit c348ccae5841014a841f3649f194e9dd35691985
Author: Lex Trotman <elextr@gmail.com>
Date:   Fri Feb 17 09:02:34 2012 +1100

    Include build.h in headers installed for plugin use

 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 510bbfbb05bcec2e08bc2178fb05b142f3dd45bb
Author: Matthew Brush <matt@geany.org>
Date:   Wed Feb 15 17:05:25 2012 -0800

    Add .mm extension for Objective-C filetype

 data/filetype_extensions.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fa118fb12a0a2a98c6d80939d489cc57c5dcf23b
Author: Lex Trotman <elextr@gmail.com>
Date:   Wed Feb 15 14:18:34 2012 +1100

    Add build command access to plugin interface
    
    Add ability for plugins to read and edit the fields of the build commands.

 plugins/geanyfunctions.h |  10 +++
 src/build.c              | 162 +++++++++++++++++++++++++++++++++++++----------
 src/build.h              |  22 ++++---
 src/plugindata.h         |  25 ++++++--
 src/plugins.c            |  13 +++-
 5 files changed, 185 insertions(+), 47 deletions(-)

commit 589ffff377bdaa930bd4b547c98b8b84db3a46c9
Author: Matthew Brush <matt@geany.org>
Date:   Sun Feb 12 22:35:08 2012 -0800

    Add Scintilla wrapper function sci_set_lexer()
    
    When the lexer is changed it clears all styling information and resets
    the folding state.
    
    Closes #3486917 and #3486918

 src/highlighting.c | 4 ++--
 src/sciwrappers.c  | 7 +++++++
 src/sciwrappers.h  | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

commit b0b0ebb469a6b7eb74d321e6f5d7fe6f0bfcf6ba
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Feb 10 18:24:10 2012 +0100

    Make sure not to emit activation/change signals twice from entry action
    
    If connect_proxy() get called twice, then the handlers would have been
    connected twice, leading to wrongly emit activation/change signals twice
    for a single input signal.
    
    For whatever reason connect_proxy() is actually called twice for the
    quick search entry on Windows (but not on Linux), so this fixes the
    search entry behavior on Windows.

 src/geanyentryaction.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

commit 01fea3e7470756b51d1616e9b732a641f500de1b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Feb 10 01:18:30 2012 +0100

    Remove possible '/' from display name when building socket filename
    
    MacOS X seems to have slashes in the display name, which prevent the
    socket file from being created.  So, replace such characters that may
    not appear in a filename with an underscore.

 src/socket.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 9426104f0b18dcca295c7615abd99dc3f207463f
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Feb 6 16:41:18 2012 +0000

    Remove utils_build_path() - use g_build_filename instead

 src/editor.c       |  4 ++--
 src/filetypes.c    | 14 +++++++-------
 src/highlighting.c |  4 ++--
 src/keyfile.c      |  6 +++---
 src/symbols.c      |  8 ++++----
 src/templates.c    |  2 +-
 src/toolbar.c      |  6 +++---
 src/utils.c        | 39 ---------------------------------------
 src/utils.h        |  2 --
 9 files changed, 22 insertions(+), 63 deletions(-)

commit e7befb410c895b0136a6c38a3b3d534395592729
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Feb 6 16:36:51 2012 +0000

    Remove utils_make_filename() - use g_strconcat instead

 src/filetypes.c |  4 ++--
 src/utils.c     | 24 ------------------------
 src/utils.h     |  2 --
 3 files changed, 2 insertions(+), 28 deletions(-)

commit 402249f1b814952e80c8df01863450fe1cd41b93
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Feb 6 16:08:55 2012 +0000

    Revert "Don't append file truncation warning if file doesn't exist"
    
    This reverts commit 7cc443e1420b77d041815a464fe5b20bc62412f4.
    
    Showing the truncation message only when the file exists doesn't work
    when writing to a network file and the connection drops out (thanks to
    Lex).

 src/document.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 8f453d14cfa375a71b0687c79ed387752d2783d5
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Mon Feb 6 11:26:50 2012 +0100

    Update of Traditional Chinese translation provided by Matthew Lien.

 po/ChangeLog |    7 +-
 po/zh_TW.po  | 1390 +++++++++++++++++++++++++++++++---------------------------
 2 files changed, 739 insertions(+), 658 deletions(-)

commit 6e2d26b12498fe6b1a982eaf6f49f51205608524
Merge: e686681 cc6e85f
Author: elextr <elextr@gmail.com>
Date:   Sun Feb 5 14:39:02 2012 -0800

    Merge pull request #22 from RetroX/patch-1
    
    Added C++11 keywords to syntax highlighter.

commit cc6e85f454a0af91f2e4606cc428757605d5ecc9
Author: Alex Charron <classixretrox@gmail.com>
Date:   Sun Feb 5 16:30:22 2012 -0500

    Added C++11 keywords to syntax highlighter.

 data/filetypes.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e6866813853886ac577fdaa1c1cfbf16fef66033
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Feb 5 19:46:59 2012 +0100

    Don't set error twice (oops)

 src/build.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0a22e8a624a095161dd3bdb958243be51510aa3f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Feb 5 17:58:50 2012 +0100

    Improve error handling in build_create_shellscript()

 src/build.c | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

commit ce21bdfb215f60c270817b641b52ba954303ce9f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Feb 5 17:26:33 2012 +0100

    Use g_set_error() rather than manualy creating the GError

 src/win32.c | 42 ++++++++++++++----------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

commit e66a3ba38950d0fb802a3534fd33ec7029ce27ab
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Feb 5 17:08:54 2012 +0100

    Don't use nonexistant --export-dynamic linker flag on Windows

 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ca340a8aa332e0c9ff4e5a5f54de944d6a091a74
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Jan 31 15:04:23 2012 +0100

    Properly handle remote URIs received through drag 'n drop
    
    Closes #2966770, #3479567.

 src/document.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 9876ce5a3fdfe04936f23d5fd12fa47d66d524dd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Jan 30 18:21:15 2012 +0100

    Remove a redundant check

 src/main.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 9ff4eec8538549078d2011bd6be31d7c6f9b0194
Author: Matthew Brush <matt@geany.org>
Date:   Mon Jan 30 21:32:16 2012 -0800

    Fix Color Schemes menu items activation when used with libdbusmenu.
    
    I'm not even going to try to explain why this fixes it :)

 src/highlighting.c | 9 +++------
 src/main.c         | 4 +++-
 2 files changed, 6 insertions(+), 7 deletions(-)

commit cc3c2684fb969b2bdfc8fec30831eb0c9aee1677
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Jan 26 22:52:22 2012 +0100

    Fix makefile.win32 for included regex removal

 tagmanager/makefile.win32 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 58164c65f0bbc5bfd13c84aeabaca203befbb1a7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jan 26 16:10:53 2012 +0000

    Remove static function utils_slist_remove_next()

 src/utils.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

commit 7cc443e1420b77d041815a464fe5b20bc62412f4
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jan 26 15:13:30 2012 +0000

    Don't append file truncation warning if file doesn't exist
    
    This warning shown after a failed save is unnecessary when the
    filename is invalid.

 src/document.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 30ec6e6e2b06da5e04d3440d29b2329908b523d3
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Jan 26 11:42:24 2012 +0100

    Fix plural setting

 po/id.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit ae00745f48278da42afcf35ee7a0865ec9f8e482
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Jan 26 11:36:09 2012 +0100

    Added Indonesian translation provided by Fajar Wahyu

 po/ChangeLog |    5 +
 po/id.po     | 6572 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 6577 insertions(+)

commit b287553e4aaf6065952d524541d9d37ca087742f
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jan 25 16:26:16 2012 +0000

    Use 'SETPTR' instead of 'setptr'
    
    This makes it clearer we're using a macro.

 plugins/filebrowser.c | 24 ++++++++++++------------
 plugins/saveactions.c |  6 +++---
 src/build.c           | 52 +++++++++++++++++++++++++--------------------------
 src/callbacks.c       | 22 +++++++++++-----------
 src/dialogs.c         |  2 +-
 src/document.c        | 10 +++++-----
 src/editor.c          |  6 +++---
 src/encodings.c       | 10 +++++-----
 src/filetypes.c       | 26 +++++++++++++-------------
 src/highlighting.c    | 12 ++++++------
 src/keybindings.c     |  4 ++--
 src/keyfile.c         |  2 +-
 src/main.c            |  6 +++---
 src/msgwindow.c       |  8 ++++----
 src/notebook.c        |  4 ++--
 src/prefs.c           |  8 ++++----
 src/project.c         | 18 +++++++++---------
 src/search.c          |  2 +-
 src/socket.c          |  2 +-
 src/symbols.c         |  6 +++---
 src/templates.c       |  8 ++++----
 src/toolbar.c         |  2 +-
 src/ui_utils.c        |  2 +-
 src/utils.c           |  8 ++++----
 src/vte.c             |  4 ++--
 25 files changed, 127 insertions(+), 127 deletions(-)

commit ed66c2b29336d1edbaad4e7adaf4cf0737d02ccf
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jan 25 13:46:31 2012 +0000

    Remove LW() macro

 src/keybindings.c | 424 +++++++++++++++++++++++++++---------------------------
 1 file changed, 216 insertions(+), 208 deletions(-)

commit 011dd017e052ed6654d77db3fc99683f57aa08dd
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jan 25 13:40:39 2012 +0000

    Enable default Scintilla editing menu for Split Window
    
    This allows copying and pasting, undo etc.

 plugins/splitwindow.c | 1 +
 1 file changed, 1 insertion(+)

commit 951b5a9da5cd0a0492198164c0f1c7ff33e39dd5
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jan 25 12:45:01 2012 +0000

    Rectangular selection modifiers are Alt+Shift on Windows

 doc/geany.html | 12 +++++++-----
 doc/geany.txt  | 11 +++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

commit 9031335971a0f26625b3494d99b668c3af6befe0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jan 20 19:31:57 2012 +0100

    Set prefs' encoding combo boxes "wrap with" in the Glade file directly

 data/geany.glade | 2 ++
 src/prefs.c      | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

commit 7f16b9a4fb3af08239c928df3e634abd6af9ff16
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jan 20 19:22:22 2012 +0100

    Fix content of encodings and EOL style prefs ComboBoxes (oops)
    
    I broke them in ca922e0ddc8022283ec3c1f49aaa15ab7c5ba213
    
    Now the two encoding combo boxes shares the same data, which is
    built only once.

 data/geany.glade | 14 ++++++++++----
 src/prefs.c      | 26 ++++++++++++++++++--------
 2 files changed, 28 insertions(+), 12 deletions(-)

commit 9130b84d86f4e078df480a2f1e798d835b158f52
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Jan 20 19:14:31 2012 +0100

    Add ui_builder_get_object()
    
    This is used to get any object built from the UI file, not widgets only.

 src/ui_utils.c | 9 +++++++++
 src/ui_utils.h | 2 ++
 2 files changed, 11 insertions(+)

commit 21cd7bb2139fd67644e5777bb8e6387d34473d09
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jan 19 18:09:29 2012 +0000

    Add Project overrides for 'Saving files' checkbox options

 data/geany.glade     | 9071 +++++++++++++++++++++++++-------------------------
 src/document.c       |   11 +-
 src/project.c        |   97 +-
 src/project.h        |    2 +
 src/projectprivate.h |    4 +
 5 files changed, 4687 insertions(+), 4498 deletions(-)

commit 75ff98a2b6ed8deadbcf71a47e5f03e4b43c014f
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jan 19 12:54:12 2012 +0000

    Regenerate with Glade 3.8.1

 data/geany.glade | 6978 +++++++++++++++++++++++++++---------------------------
 1 file changed, 3489 insertions(+), 3489 deletions(-)

commit 6f64f31e0938ff743caf4f9d05cd87910ef2201b
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Jan 19 13:12:51 2012 +0000

    Make Glade object names unique throughout
    
    This fixes object name clashes when making changes using Glade 3.8.1 (maybe a Glade bug).

 data/geany.glade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 73bc824c8291f8940a9b9f7949515e1f0cb0d147
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jan 14 04:40:11 2012 +0100

    Restore line breaking preference's adjustment in Glade file
    
    It got removed by accident in commit
    c85b89afdd880b7a6aac42f953bab83d3938a4a3 "Port more of the Project properties dialog to Glade"

 data/geany.glade | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 380613866ca852b07e01262e8083787c2a9231f6
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Jan 14 04:27:27 2012 +0100

    Restore accelerator group in Glade file
    
    It got removed by accident in commit
    c85b89afdd880b7a6aac42f953bab83d3938a4a3 "Port more of the Project properties dialog to Glade"

 data/geany.glade | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

commit 5cc8a96d440274c15f50228ee55461fb557cee3e
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Jan 12 00:33:50 2012 +0100

    Do not show document change notification dialog when MRU switch is in progress
    
    When switching between MRU documents, Geany pops up a dialog about
    document change even for the intermediate non-final documents.
    This leads to both reload dialog and document switch dialog displayed
    at the same time and termination of document switching because the
    newly displayed dialog takes focus.
    
    This patch disables reload checks for the intermediate documents and
    forces reload check for the final document.

 src/document.c |  3 ++-
 src/notebook.c | 12 +++++++++++-
 src/notebook.h |  4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

commit ec6798d7614437d162ccab701ac690d6bb81be5f
Author: Jiří Techet <techet@gmail.com>
Date:   Wed Jan 11 23:30:10 2012 +0100

    Do not ignore system() return value to eliminate compiler warning

 tagmanager/tm_workspace.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 73f345eb09e52a195f823d6e28bc52702b735388
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Jul 24 01:29:15 2010 +0200

    Use standard include paths for "open selected file"
    
    Under linux, try to locate the file with the given
    name also under /usr/local/include and /usr/include.
    This feature is probably most often used for
    opening include files so this helps for the system
    ones.
    
    In addition, fix locale/utf8 encoding usage.

 src/callbacks.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

commit d4b2b89d009aa8c5314a86450ea13190f4a20241
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Aug 14 00:24:42 2010 +0200

    Maybe != may be

 src/editor.c | 4 ++--
 src/search.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 214367906c2548abe07999f3816a85f1aaf5b548
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Jan 10 15:28:43 2012 +0000

    Regenerate manual for Project Keybindings change

 doc/geany.html | 321 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 178 insertions(+), 143 deletions(-)

commit 8a928956a42c684476dbfb47fdeaa0989b0626a1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Jan 9 16:43:14 2012 +0000

    Fix project dialog recreation (oops)
    
    Remove memset - rely on static data to be zeroed.

 src/project.c | 2 --
 1 file changed, 2 deletions(-)

commit 5288dbe5d356d84feedc7b9cbd86e6b16012de0d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Jan 9 16:35:29 2012 +0000

    Add Project New, Close keybindings

 doc/geany.txt     |  4 +++-
 src/keybindings.c | 11 +++++++++++
 src/keybindings.h |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

commit 1fcff6f7bfaf5bb8c24bc896793e3d4a4a1e69ff
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Jan 9 15:58:10 2012 +0000

    Fix unused variable warning

 src/ui_utils.c | 1 -
 1 file changed, 1 deletion(-)

commit fa3b07bcff4f4b40b22ef9a4f2fe3ed1e823c1d5
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Jan 9 15:56:59 2012 +0000

    Fix missing initializers warning on = {0}

 src/project.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 0755b44db1a238a65d7b3cec7f8b11430c8b2f1e
Merge: ca922e0 31bc70d
Author: Matthew Brush <matt@geany.org>
Date:   Sun Jan 8 15:58:37 2012 -0800

    Merge branch 'project-dialog-fix'

commit ca922e0ddc8022283ec3c1f49aaa15ab7c5ba213
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jan 8 23:21:52 2012 +0100

    Remove duplicated lists and name them more sensibly

 data/geany.glade | 94 +++++++-------------------------------------------------
 1 file changed, 11 insertions(+), 83 deletions(-)

commit 2077347b3497706b844d105c81af5437f3be13de
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jan 8 23:12:09 2012 +0100

    Remove empty rows at the end of some lists

 data/geany.glade | 9 ---------
 1 file changed, 9 deletions(-)

commit aa96bc2cbfab0a8033d0ed600541c2d2e0c767bb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Jan 8 22:55:28 2012 +0100

    Add missing ComboBox cell renderers in Glade rather than manually
    
    This also fixes the duplicated renderers when there was already one
    in Glade, and a second one got added manually.

 data/geany.glade | 18 ++++++++++++++++++
 src/ui_utils.c   | 10 ----------
 2 files changed, 18 insertions(+), 10 deletions(-)

commit 31bc70d0f3f0d3854627aad6b2874950d1edcede
Author: Matthew Brush <matt@geany.org>
Date:   Sun Jan 8 11:48:54 2012 -0800

    Fix one-off leak by allocating PropertyDialogElements on the stack
    
    Also prevents following a whole code path for nothing, by only calling
    create_properties_dialog() once per run.

 src/project.c | 53 +++++++++++++++++++++++++----------------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

commit 6968a1a957f8c4d71ea9edc126e6af1ace996502
Author: Matthew Brush <matt@geany.org>
Date:   Sun Jan 8 11:34:27 2012 -0800

    Make it so project properties form errors can be corrected (oops)
    
    Was broken during last commit.

 src/project.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit c85b89afdd880b7a6aac42f953bab83d3938a4a3
Author: Matthew Brush <matt@geany.org>
Date:   Tue Dec 27 23:12:10 2011 -0800

    Port more of the Project properties dialog to Glade
    
    Fixes issue where dialog was being destroyed and would not show 2nd time.

 data/geany.glade | 897 +++++++++++++++++++++++++++++++++----------------------
 src/project.c    | 197 ++++++------
 2 files changed, 635 insertions(+), 459 deletions(-)

commit 3cb3826aad3e110f5309816e65394249369f24e7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jan 8 17:51:30 2012 +0000

    Fix using 'All files' instead of 'None' in Open dialogs (Windows)

 src/win32.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit eb04c514bab87af60f01ae3c8e9ee1d3fd9bccf8
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jan 8 17:37:58 2012 +0000

    Add API function ui_lookup_stock_label()
    
    Using this can avoid adding i18n strings unnecessarily.

 plugins/geanyfunctions.h |  2 ++
 plugins/splitwindow.c    | 14 +-------------
 src/keybindings.c        |  3 ++-
 src/plugindata.h         |  1 +
 src/plugins.c            |  3 ++-
 src/ui_utils.c           | 16 ++++++++++++++++
 src/ui_utils.h           |  2 ++
 7 files changed, 26 insertions(+), 15 deletions(-)

commit 8f44132dcd0835c00a57b4eb04ce1b4f7a8a6305
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jan 8 17:14:04 2012 +0000

    Add 'Open Project' keybinding

 doc/geany.txt     | 10 ++++++++++
 src/keybindings.c |  5 +++++
 src/keybindings.h |  1 +
 3 files changed, 16 insertions(+)

commit 6935af0485122e7092ee6d840658c6017836f713
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jan 8 14:33:26 2012 +0000

    Fix showing calltips for single character tags

 src/editor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 85b5e08c471c505b59218b1a94df9b95a01cca06
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Jan 8 13:44:21 2012 +0100

    Recognize #!/bin/dash as shebang for Shell files (closes #3470986)

 src/filetypes.c | 2 ++
 1 file changed, 2 insertions(+)

commit 5b02efb6f88a7689ff18905bdbaf620b87276d82
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Jan 6 13:39:26 2012 +0000

    Separate interfaces and structs in the symbol list

 src/symbols.c        | 17 +++++++++++------
 tagmanager/fortran.c |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

commit 296ecadf459876efb6262a93cba0bb64ab99be77
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Jan 6 12:48:08 2012 +0000

    Parse D parameterized template body

 tagmanager/c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 40499d75111e708513ba6f7d67a5a2a85b9d85b0
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jan 4 16:41:32 2012 +0000

    Parse D template blocks
    
    Note: they are listed under Module in the symbol list.

 tagmanager/c.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 39ff492e4b47e1ab2120a16339536ada555fc28c
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jan 4 16:08:38 2012 +0000

    Show D struct constructor calltips also

 src/editor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7aa5d9516d4d72dcc634aca14984b6ab0ced4b99
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Jan 4 15:57:45 2012 +0000

    Parse D class, struct, interface template bodies
    
    Previously they were parsed as functions.

 tagmanager/c.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 6c31ed4bc0ae52282ae8c696ee8c80ec5c352be6
Author: Matthew Brush <matt@geany.org>
Date:   Tue Jan 3 10:21:09 2012 -0800

    Re-highlight type keywords on notebook page switch

 src/callbacks.c |  1 +
 src/document.c  | 17 ++++++++++++-----
 src/document.h  |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

commit 8f489fc9fbab8a8c197f40536fac8ebd74c430eb
Author: Matthew Brush <matt@geany.org>
Date:   Tue Jan 3 08:54:12 2012 -0800

    Use static to avoid clashing with plugins' symbols

 src/toolbar.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 34e6bddde8f16cc6f9e077b2bfa4e294bc92a835
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Jan 3 16:29:32 2012 +0000

    Add File Browser path entry tooltip

 plugins/filebrowser.c | 1 +
 1 file changed, 1 insertion(+)

commit f0ca50cf20995ed6faf7720e5e6134135c655cba
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Jan 3 16:21:12 2012 +0000

    Fix showing Find/Replace regex errors on status bar

 src/search.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 308f98a2b96c96fa5a66d70561e2064e60854dc5
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Jan 3 13:30:38 2012 +0000

    Use gssize to avoid casts for encodings_convert_to_utf8_*()

 src/encodings.c  | 8 ++++----
 src/encodings.h  | 4 ++--
 src/plugindata.h | 6 +++---
 src/socket.c     | 2 +-
 src/symbols.c    | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

commit 6de8f97cb3c9da42b82d4c27ebcad0fc27fbd3b3
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jan 1 17:57:18 2012 +0000

    Remove GNU regex now we have GRegex

 TODO                           |    1 -
 configure.ac                   |    6 +-
 doc/geany.html                 |   10 +-
 doc/geany.txt                  |   10 +-
 m4/geany-gnu-regex.m4          |   26 -
 src/editor.c                   |    6 -
 src/main.c                     |    6 +-
 tagmanager/Makefile.am         |   12 +-
 tagmanager/include/Makefile.am |    3 -
 tagmanager/include/gnuregex.h  |  490 ----
 tagmanager/lregex.c            |   10 +-
 tagmanager/regex.c             | 4952 ----------------------------------------
 win32-config.h                 |    5 +-
 wscript                        |   17 +-
 14 files changed, 17 insertions(+), 5537 deletions(-)

commit 05949500380dd6fef22687b5341924d8242790d1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Jan 1 17:01:49 2012 +0000

    Parse PHP functions with multiline argument list, #3037797

 tagmanager/php.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1b56b6b5a988e3af50b95ccaf972f80a5e09b205
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Fri Dec 30 18:26:32 2011 +0100

    Update of Swedish translation

 po/ChangeLog |    6 +
 po/sv.po     | 5986 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 3018 insertions(+), 2974 deletions(-)

commit da8160ac98dadf5c38396dce3ca127f84e48c682
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Dec 30 16:13:40 2011 +0000

    Fix gcc 'ordered comparison of pointer' warnings

 src/build.c | 2 +-
 src/tools.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit e4d2e31b82e175179df468958582ce211f536e09
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Dec 30 16:12:17 2011 +0000

    Simplify encoding regex using \s now we have GRegex

 src/encodings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ab02beff5a0e39bca9e1c5d6cd34ec3d92770b0a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Dec 30 15:53:47 2011 +0000

    Use GRegex for encoding regex matching

 src/encodings.c | 50 +++++++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

commit f86ab3e41990a4fe184511423c2d009ccba2fee9
Merge: 7c348e6 fa70c16
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 26 20:08:53 2011 +0100

    Merge branch 'techee/mru-patches'

commit 7c348e6847d017c90216e6177ba444dc1919a3cf
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 26 19:14:55 2011 +0100

    Fix "vergeany" -> "version" typo in some license headers
    
    Honestly, WTF?

 src/geanyentryaction.c      | 4 ++--
 src/geanyentryaction.h      | 4 ++--
 src/geanymenubuttonaction.c | 4 ++--
 src/geanymenubuttonaction.h | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

commit 6c7e7096526cc11276cad88a7e94c2fcf996d668
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Dec 26 17:38:35 2011 +0000

    Fix memory leak when build regex changes

 src/filetypes.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

commit e503f8262a30cbda0cc5dcd69a8e5678deda1f40
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Dec 26 17:29:10 2011 +0000

    Use GRegex for build error regex matching

 src/filetypes.c        | 53 ++++++++++++++++++++++----------------------------
 src/filetypesprivate.h | 12 ++----------
 2 files changed, 25 insertions(+), 40 deletions(-)

commit fa70c160239fdc667332c2ece2ab3a31f4534221
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 26 16:56:36 2011 +0100

    Fix page switching after closing the first page in RTL non-MRU mode (oops)

 src/notebook.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit d79268b346a448a30c8f8db18d49de4dc41b3321
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 26 16:06:02 2011 +0100

    Fix a theoretically possible use of an uninitialized value

 src/notebook.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 804de2572e051de6694c3765b4868b8dad7c42fc
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 26 16:04:52 2011 +0100

    Properly include notebook.h for notebook_switch_tablastused() declaration

 src/keybindings.c | 1 +
 1 file changed, 1 insertion(+)

commit 59e84666edd915485f4f6369d08d358000454f52
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 26 00:58:24 2011 +0100

    Update HACKING to suggest MIO_FORCE_ANSI for building with -ansi

 HACKING | 3 +++
 1 file changed, 3 insertions(+)

commit d76d72518a5c46acd5dc142d1f627d30978875eb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Dec 25 18:39:01 2011 +0100

    Import upstream MIO changes

 tagmanager/mio/mio.c | 35 +++++++++++++++++++++++++++++++++++
 tagmanager/mio/mio.h |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

commit 387d071b608157fd4abd0f0e5f2a7dd81a5d1164
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Dec 26 13:01:54 2011 +0000

    Fix escaping replacement text for regex matching (oops)

 src/search.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 89a0a954e064e2d11199d2209394b86fac870aa0
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Dec 26 12:56:30 2011 +0000

    Remove unused parameter ft_id

 src/highlighting.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b347b4a6111275ea46a4f3911f0e5530c9199c32
Author: Matthew Brush <matt@geany.org>
Date:   Mon Dec 26 00:37:16 2011 -0800

    Improve handling of named styles and named colors

 src/highlighting.c | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

commit f3af82d40df3503495445c4f25bf7cbeda6d839e
Author: Matthew Brush <matt@geany.org>
Date:   Sun Dec 25 16:40:18 2011 -0800

    Handle failure of reading named style by trying to read it as a named color
    
    TODO: find a better way to handle this and restore the removed warning

 src/highlighting.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

commit fb8e061242c905356f2a9462fd0ab5c302c11a91
Author: Matthew Brush <matt@geany.org>
Date:   Sun Dec 25 14:44:32 2011 -0800

    Prevent warning about comparing signed and unsigned values
    
    The g_match_info_fetch_pos() function uses a signed value for the match_num
    parameter, even though values less than 0 are not valid, so a cast is used.

 src/search.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3efe11c4b9862a705629c6e46a2235033667f9c3
Author: Matthew Brush <matt@geany.org>
Date:   Sun Dec 25 14:37:30 2011 -0800

    Update documentation for HTML/CSS-style colors and [named_colors] section

 doc/geany.html | 13469 ++++++++++++++++++++++++++++---------------------------
 doc/geany.txt  |    37 +-
 2 files changed, 6769 insertions(+), 6737 deletions(-)

commit 2fe42bfc0cffecf1310cabe1ee5ded7f6be29420
Author: Matthew Brush <matt@geany.org>
Date:   Sun Dec 25 14:11:47 2011 -0800

    Support [named_colors] in filetypes.* and color schemes

 src/highlighting.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

commit 8a04222301008c7429d3c23c0fca3ba0e3a3cbf1
Author: Matthew Brush <matt@geany.org>
Date:   Sun Dec 25 13:41:16 2011 -0800

    Support normal and abbreviated HTML hex triplets in color schemes

 src/highlighting.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

commit 773d7e42d24ca83d5458ec78ac30f10b29884bca
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Dec 25 17:22:06 2011 +0000

    Let GRegex handle escape sequences itself

 src/search.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

commit 21f0715381a4a75298ca2fda2aa66c3003529070
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sun Dec 25 13:42:19 2011 +0000

    Fix \b regex word boundary always matching at start of search

 src/search.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

commit c2481ccb9544c22258278dcb1b503c2e26baecd1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Sat Dec 24 17:41:09 2011 +0000

    Use GRegex matching for Find & Replace commands

 src/search.c | 106 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 61 insertions(+), 45 deletions(-)

commit 624c11cec07c7eec88fc9212c55352fb383835d3
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Dec 24 12:27:50 2011 +0100

    Do not change notebook tab in document-close callback
    
    This can lead to unpredictable behavior of document_get_current()

 src/notebook.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

commit ddbb2535f456055e9a8ac9a5bcab0a544ecb555b
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Dec 24 00:47:15 2011 +0100

    Move MRU tab handing from keybindings.c to notebook.c because this is where it belongs

 src/keybindings.c | 246 +--------------------------------------------------
 src/main.c        |   1 +
 src/notebook.c    | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/notebook.h    |   6 ++
 4 files changed, 267 insertions(+), 245 deletions(-)

commit 23eede529178e3dc058d777f35c34d8de2d8cbab
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Dec 16 19:16:20 2011 +0100

    Make switch to MRU upon tab close configurable
    
    Add configuration option tab_close_switch_to_mru to allow the user
    to choose whether to switch to the most recently used tab or to the
    next one after closing the current tab.

 data/geany.glade  | 12 ++++++++++++
 src/document.h    |  1 +
 src/keybindings.c | 23 +++++++++++++++++------
 src/keyfile.c     |  2 ++
 4 files changed, 32 insertions(+), 6 deletions(-)

commit f6be8b47d76facd50266d1c59100cfec96c282d2
Author: Jiří Techet <techet@gmail.com>
Date:   Fri Jul 23 22:16:10 2010 +0200

    Make the tab switching dialog a bit more useful
    
    Right now the tab switching dialog shows the full
    path of the current file. However this dialog is too
    narrow and in my case usually displays one directory
    per line. This makes it hard to find the base
    filename, which is the thing you are most probably
    looking for.
    
    This patch displays only the base name - in bold. In
    addition, it displays the following three filenames
    in the MRU list, each on a new line (not in bold).
    This helps to see what file comes next and how many
    times one has to press ctrl+tab.

 src/keybindings.c | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

commit 0acb273c55869850113f81953772786cd1a8452a
Author: Jiří Techet <techet@gmail.com>
Date:   Sat Jul 3 23:49:03 2010 +0200

    Rewrite tab switching queue
    
    There was one more bug related to the tab switching. When we switch
    so many times that we return back to the original document (so we
    actually don't switch at all) then the following switch attempt
    doesn't switch immediately to the next document.
    
    After spending two hours thinking what is wrong, I gave up and rewrote
    the whole thing in a different way. The problem with the previous
    implementation was that before you couldn't just look what's in the queue
    "now" - you had to imagine what will be inserted there in the next step
    because the switch_in_progress variable was set after the first switch
    (this is also why I put the long comment why mru_pos = 2 - that is not
    clear at all when you first look at it). Also there were some not very
    nice "workarounds" like the idle function that was executed after the
    switch and removed the double entry on top of the queue.
    
    So with the new implementation things are much simpler IMO. The queue
    starts with the current document and the previously opened documments
    follow. It's *always* like that, no exceptions. The idle function
    is gone and cb_func_switch_tablastused() is simplified too. The rest of
    the functionality should be clear from the code.
    
    Signed-off-by: Jiří Techet <techet@gmail.com>

 src/keybindings.c | 65 +++++++++++++++++++++++++------------------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

commit d0892b95d1ed54a2ab0ce411adff210712573899
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Jul 1 01:50:49 2010 +0200

    When closing tab, return to the document at the top of the MRU list
    
    This is a pretty frequent work pattern of mine:
    
    1. Editing file A
    2. Searching for function and opening file B
    3. Closing file B because I just wanted to look at the function definition
    4. Without this patch I get to the file following the B's tab (which
    is just a random file) but my brain expects that I get to A
    
    I know it's possible to kind of simulate the behaviour I want with
    the "next to current" placement option but I really don't see a single
    advantage of having tabs closed in sequential order. This is also
    why I didn't make this behaviour optional. But maybe I miss some
    use case of tabs being closed sequentially - just tell me.
    
    Signed-off-by: Jiří Techet <techet@gmail.com>

 src/keybindings.c | 10 ++++++++++
 src/notebook.c    |  9 ---------
 2 files changed, 10 insertions(+), 9 deletions(-)

commit 0c6aed700dd89a7abab7b1b5bfca340e1a2d6c7f
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Dec 21 17:06:32 2011 +0000

    Make 'Replace Spaces by Tabs' only match leading spaces
    
    Replacing spaces used for alignment with tabs would often break the
    alignment as tab stop positions were not checked. It's also not
    possible to distinguish between a true space and a single aligning
    space, so we should ignore all spaces outside of indentation.

 doc/geany.html | 2 +-
 doc/geany.txt  | 2 +-
 src/editor.c   | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

commit a5995468efcab38c4812de4ac4e7e6396477b481
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Dec 19 18:23:46 2011 +0000

    Show marker margin in split window
    
    Although go to marker commands (or other keybindings) don't work, the
    marker margin can still be useful, and improves alignment with the
    original sci widget when using the Top & Bottom split.

 plugins/splitwindow.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

commit ffb33c52993256f8b21f9a62cf32c458c91e8e8d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Dec 19 17:58:51 2011 +0000

    Show/hide fold margin on sync, not on split

 plugins/splitwindow.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 8bdc2d376ba663e59955356e4766ca453a96267f
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Dec 19 17:50:58 2011 +0000

    Don't manually disconnect "sci-notify" signal
    
    This will get disconnected when the widget is destroyed.

 plugins/splitwindow.c | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

commit aaa62c39b436b7e973683c6a5551d6f5091a0ac6
Author: Matthew Brush <matt@geany.org>
Date:   Sun Dec 18 18:47:56 2011 -0800

    Make editor menu initially hidden
    
    Without this the menu won't emit the show signal the first time it's shown.

 data/geany.glade | 1 -
 1 file changed, 1 deletion(-)

commit ed1fe7903b437fa233730c10d4a09ee685822f40
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Dec 18 00:25:33 2011 +0100

    Explicit all required casts in sciwrappers
    
    There is still 3 signed values implicitly converted to unsigned not
    fixed, but they aren't really legitimate and would require a behavior
    change in some corner cases.

 src/sciwrappers.c | 231 ++++++++++++++++++++++++++++--------------------------
 src/sciwrappers.h |   2 +-
 2 files changed, 123 insertions(+), 110 deletions(-)

commit 0aea05d10d46e822316267a3a72a50672c4ba81a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Dec 17 23:10:03 2011 +0100

    Fix various integer signedness and minor styling issues
    
    Most noteworthy change is that all build commands IDs and groups are
    now unsigned everywhere negative values aren't explicitly handled with
    a special meaning.  This should not change anything in behavior, only
    makes clear the index won't underflow.

 src/about.c          |  12 +++---
 src/build.c          | 119 +++++++++++++++++++++++++++------------------------
 src/build.h          |  10 ++---
 src/dialogs.c        |   2 +-
 src/document.c       |   6 +--
 src/gb.c             |  52 ++++++++--------------
 src/geanywraplabel.c |   8 ++--
 src/keyfile.c        |   6 +--
 src/prefs.c          |  17 ++++----
 src/printing.c       |   2 +-
 src/project.c        |   2 +-
 src/socket.h         |   2 +-
 src/symbols.c        |   6 +--
 src/templates.c      |   4 +-
 src/toolbar.c        |   2 +-
 src/utils.c          |  24 ++++++-----
 16 files changed, 133 insertions(+), 141 deletions(-)

commit 53a98c303f69e5e16b214b4e44ef7ebde3b67521
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Dec 17 23:00:53 2011 +0100

    Clear error indicators upon build start even if no document is given

 src/build.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 9e7301cdef67f71ce4716ad1bce771b2c266349c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Dec 17 19:25:02 2011 +0100

    Fix initial back and forward items sensitivity
    
    These actions were marked as document sensitive but their sensitivity
    is already managed by the navqueue, so making them document sensitive
    only leads to them being wrongly updated when the document count
    changes from or to 0.
    
    So, make them initially insensitive and let the navqueue correctly
    handle their later sensitiveness.

 src/navqueue.c | 3 +++
 src/ui_utils.c | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

commit ef3d5b8417c92ce4b125ef614f947026be63ed9b
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Dec 16 21:02:39 2011 +0000

    Use 'comment' named style for D nested comments
    
    This also fixes a wrong style key name for filetypes.d.
    (Nested comments aren't necessarily doc-comments).

 data/filetypes.d           | 2 +-
 src/highlightingmappings.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit adfbfa5838749036728f19c440be90f9abb5190e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Dec 11 23:38:04 2011 +0100

    Remove useless warning message written in bad English (oops)

 src/keyfile.c | 3 ---
 1 file changed, 3 deletions(-)

commit e389168162835e9174d678656dab13d5615ecff0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Dec 11 23:13:24 2011 +0100

    Make main window geometry loading more robust
    
    Properly handle the case the saved geometry isn't valid, avoiding
    a crash with corrupted preferences.

 src/keyfile.c | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

commit a64c46c496b5f77a3a1b15adda3136bcbf01cd6f
Author: Matthew Brush <matt@geany.org>
Date:   Sun Dec 11 13:10:05 2011 -0800

    Initialize window geometry array on error conditions
    
    Instead of using the garbage values in memory for default size.
    This fixes what was attempted to be fixed in the last two reverted commits.

 src/keyfile.c | 4 ++++
 src/main.c    | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 77a900b976642a96a2521426790a70117fbbd129
Author: Matthew Brush <matt@geany.org>
Date:   Sun Dec 11 13:01:19 2011 -0800

    Revert "Use a sane default window size if config is missing"
    
    This reverts commit 00473dff4e95c6d1b128edfc26038f4e98cbddf8.

 src/main.c | 3 +++
 1 file changed, 3 insertions(+)

commit 36498ddfae150571e08275dd0a0e3e2c6b202f38
Author: Matthew Brush <matt@geany.org>
Date:   Sun Dec 11 13:00:49 2011 -0800

    Revert "Ensure Geany's default size takes effect (oops)"
    
    This reverts commit d090e7dd854e5eec99c8176aacb6759081e9a4d4.

 src/main.c | 4 ----
 1 file changed, 4 deletions(-)

commit 3b56ff37c8a0093f7202880f66dad6ef6c7b078c
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Dec 11 15:07:56 2011 +0100

    Add -Wl,--export-dynamic linker flag
    
    This seems required for GtkBuilder to be able to connect signals. However, this change may break Windows
    builds. Needs to be tested and worked around if it is the case.

 wscript | 1 +
 1 file changed, 1 insertion(+)

commit 8763854d763e211aa7b9a23acb11d08c6148d42a
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Dec 11 12:00:46 2011 +0100

    Adjust Waf build system for recent GtkBuilder changes
    
    The only necessary bits were to remove interface.c and to install the Glade file.

 wscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e64628745e0f08d10827f696b093515d0af9d299
Author: Lex Trotman <elextr@gmail.com>
Date:   Sun Dec 11 18:07:56 2011 +1100

    Move language specific snippets from global to filetype entries
    
    Having C language snippets as global is wrong, moved them to several
    language positions.  This files low rate of change and lack of ML
    interest in putting language specific snippets in it suggests that
    it isn't worth fixing the repitition or moving snippets to filetype
    files.

 data/snippets.conf | 71 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 62 insertions(+), 9 deletions(-)

commit d090e7dd854e5eec99c8176aacb6759081e9a4d4
Author: Matthew Brush <matt@geany.org>
Date:   Sat Dec 10 19:52:55 2011 -0800

    Ensure Geany's default size takes effect (oops)

 src/main.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 00473dff4e95c6d1b128edfc26038f4e98cbddf8
Author: Matthew Brush <matt@geany.org>
Date:   Sat Dec 10 19:27:59 2011 -0800

    Use a sane default window size if config is missing

 src/main.c | 3 ---
 1 file changed, 3 deletions(-)

commit 4fbabc1f71582650e70cba339f3ae94e3e2d2a08
Author: Matthew Brush <matt@geany.org>
Date:   Sat Dec 10 16:34:40 2011 -0800

    Update Glade section in HACKING file

 HACKING | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

commit b60413ed6030afa79c5a8f643f3445717397d665
Author: Matthew Brush <matt@geany.org>
Date:   Sat Dec 10 16:14:11 2011 -0800

    Clean up some compiler warnings (oops)

 src/ui_utils.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 2d41ee941b6d65fb1c13999066829645d21b9165
Merge: fb1c6c6 7d67312
Author: Matthew Brush <matt@geany.org>
Date:   Sat Dec 10 15:50:05 2011 -0800

    Merge branch 'gtkbuilder'

commit 7d6731279f19f6f98e631af06a9b93647b16638b
Author: Matthew Brush <matt@geany.org>
Date:   Sat Dec 10 15:44:37 2011 -0800

    Show error dialog if the Glade file could not be loaded
    
    Also remove old comment that doesn't apply anymore.

 src/ui_utils.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit f9ff3ee23379978362ca0a52fe9920172129580e
Author: Matthew Brush <matt@geany.org>
Date:   Sat Dec 10 14:44:56 2011 -0800

    Update POTFILES.in with the new data/geany.glade and remove interface.c

 po/POTFILES.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 467363adb9e51af451c8b9ede9aeea743ec3e00c
Author: Matthew Brush <matt@geany.org>
Date:   Sat Dec 10 14:39:07 2011 -0800

    Set translation domain for the GtkBuilder

 src/ui_utils.c | 2 ++
 1 file changed, 2 insertions(+)

commit 906ffc6aae7a8787cbdfd58700c4e8d8254c0f8c
Author: Matthew Brush <matt@geany.org>
Date:   Sat Dec 10 14:10:44 2011 -0800

    Fix some widget names in glade file and code so they match (oops)

 data/geany.glade  | 14 +++++++-------
 src/keybindings.c |  8 ++++----
 src/ui_utils.c    |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

commit fb1c6c63e609f9c1518c854537f19199d6d968e1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Dec 8 17:02:25 2011 +0000

    Print system plugin path debug message on startup

 src/plugins.c | 5 +++++
 1 file changed, 5 insertions(+)

commit d7f53f7f83b114e19c99980e315b4959e715e079
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Dec 8 16:31:21 2011 +0000

    Fix offscreen window after quitting when minimized
    
    Fixes #3421282.
    Occurred with Windows e.g. Vista, 7.

 src/keyfile.c | 19 ++++++++-----------
 src/main.c    | 20 +++++++++++++-------
 2 files changed, 21 insertions(+), 18 deletions(-)

commit 3baaa5367945c7a4cae44189bf6d746f1a1d2b93
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Dec 8 13:31:58 2011 +0000

    GTK tags are no longer distributed with Geany

 doc/geany.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8818ee3fc97c45c2e1e74a48f5d4fa398754a336
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Dec 8 12:53:11 2011 +0000

    Include gdk-pixbuf-2.0 path for recent GTK+ dev (Windows build)
    
    Fixes #3396195.
    
    Note: GTK+ 2.24 is the current maintained version of the developer
    files bundle:
    http://www.gtk.org/download/win32.php

 plugins/makefile.win32        | 7 ++++---
 scintilla/makefile.win32      | 7 ++++---
 src/makefile.win32            | 7 ++++---
 tagmanager/makefile.win32     | 7 ++++---
 tagmanager/mio/makefile.win32 | 7 ++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

commit 3f6b4f950d8eb570269df3e246330ab50fe5329b
Author: Matthew Brush <matt@geany.org>
Date:   Tue Dec 6 19:06:53 2011 -0800

    Remove `interface.c` file added back in from last merge (oops)

 src/interface.c | 5825 -------------------------------------------------------
 1 file changed, 5825 deletions(-)

commit 088b0bc36214c2967ec308b44c2fede73c94817c
Merge: 0a16ec7 4ffbd8f
Author: Matthew Brush <matt@geany.org>
Date:   Mon Dec 5 20:40:16 2011 -0800

    Merge branch 'master' into gtkbuilder
    
    Conflicts:
    	geany.glade
    	src/Makefile.am
    	src/callbacks.c

commit 4ffbd8f9ada26ed8d288865e910e96dbe5250bfc
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Dec 5 21:24:33 2011 +0200

    split "always wrap search and hide find dialog" pref into "always wrap search" and "hide find dialog"

 geany.glade     | 26 +++++++++++++++++++++++---
 src/document.c  |  2 +-
 src/interface.c | 19 +++++++++++++------
 src/keyfile.c   | 13 +++++++++++--
 src/search.c    |  8 +++++---
 src/search.h    |  3 ++-
 6 files changed, 55 insertions(+), 16 deletions(-)

commit eb064df5b6f74de9a1f1a3e0a0491aebd0391b9e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Dec 5 19:51:08 2011 +0100

    TCL: Highlight words as keywords after '{' as this highlights 'else'
    
    Upstream Scintilla applied it as 3924:e2385dff420a.
    
    Closes #3432877.

 scintilla/lexers/LexTCL.cxx | 1 +
 1 file changed, 1 insertion(+)

commit f0de946d3eb6e6c8ba1bd3157bd31ddc2a0a9a51
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Dec 4 00:21:41 2011 +0100

    Fix inserting multi-line comments with "Insert multiline comment"
    
    "Insert multiline comment" did insert single-line style comment when
    available even if multi-line style was also supported for the filetype.

 src/callbacks.c | 2 +-
 src/editor.c    | 9 +++++----
 src/editor.h    | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

commit c69b8eea234d193ba18571b2758670b521327334
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Dec 4 00:16:31 2011 +0100

    Fix and unify getting open/close/single comment markers
    
    Add filetype_get_comment_open_close() to get appropriate start and end
    comment markers from a filetype, and use it everywhere these markers
    are fetched.
    
    This fixes a crash in editor_insert_multiline_comment() if only single
    comments are available (closes #3449635).

 src/editor.c    | 76 +++++++++++++++++++++++----------------------------------
 src/filetypes.c | 37 ++++++++++++++++++++++++++++
 src/filetypes.h |  3 +++
 src/templates.c |  7 +-----
 4 files changed, 71 insertions(+), 52 deletions(-)

commit 903e69b388b935cfb135312a3a76b04608133a4e
Author: Joakim Gebart <joakim.gebart@jge.se>
Date:   Wed Nov 23 08:19:14 2011 +0100

    Fix broken default statusbar_template in Swedish translation.

 po/sv.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 77a484e9905323398b8a02082fac639b0547fbc5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 23 02:22:07 2011 +0100

    Don't leave some fields initialization to implicit initialization
    
    Although this doesn't change anything in practice, it started to be a
    nightmare trying to deal with compilers warnings about "missing"
    initializers, which are generally good but not in that file.

 src/highlightingmappings.h | 1714 ++++++++++++++++++++++----------------------
 1 file changed, 839 insertions(+), 875 deletions(-)

commit 4a0a5f0a09081d2240d7f37d3bb528d09c48f27a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 22 16:58:44 2011 +0100

    Don't try to parse 0-length data since TM don't support it

 src/document.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit c252b1f376845ace9a05aa5f98a4cf92e466f604
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 22 03:18:53 2011 +0100

    Fix finding duplicated keybindings
    
    When checking whether a keybinding is already in use before updating
    it in the preferences, check against the keybindings the user may have
    updated, not the ones that are currently applied.
    
    This fixes changing action A from key K to key L and action B from key
    L to key K, which led to conflicts back and forth since when setting B
    to K the check found A as a duplicate even after having changed it.

 src/prefs.c | 118 +++++++++++++++++++++++-------------------------------------
 1 file changed, 44 insertions(+), 74 deletions(-)

commit 6738d43dee95b2fe15d67bfcbff2f5b6e0971d7c
Author: Dimitar Zhekov <dimitar.zhekov@gmail.com>
Date:   Mon Nov 21 20:33:37 2011 +0200

    --read-only cleanup
    
    Use the global variable only when needed and add an initializer for it
    in the default options.

 src/document.c |  2 +-
 src/main.c     | 12 +++---------
 src/socket.c   |  4 +---
 3 files changed, 5 insertions(+), 13 deletions(-)

commit 102ce1d205f0f56ee3a56eb17a4be9e2d5846630
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 21 16:12:22 2011 +0100

    Prevent GCC to warn about missing initializers in highlightingmappings.h
    
    Use a GCC pragma to disable -Wmissing-field-initializers in this file.
    This works with both GCC and CLang, and should be harmless on other
    compilers since unknown pragmas are supposed to be ignored.

 src/highlightingmappings.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 425e0e39be146af5b642228bb8df0a3edc7b1739
Merge: 39606dd 319a635
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 21 15:31:49 2011 +0100

    Merge branch 'symbols-tree-update-fixes'

commit 319a6355fef68f2db541bbe4ae65473f83289c0c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 20 23:15:12 2011 +0100

    Use GSlice to allocate cached tree iters

 src/symbols.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit ef0b05991794cceabb2e255439cf7ea511100fd3
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 20 20:26:57 2011 +0100

    Rewrite symbols tree updating code
    
    Old implementation was not really fitting the updating needs and had a
    bug making symbols disappear if they haven't changed but their parent
    did (e.g. when a C++ constructor's signature changed).
    
    New implementation does:
    1) walk old tree, updating or removing rows;
    2) add remaining tags.
    
    It walks less than (new_tags + old_tags + new_tags) in the worst case,
    thanks to some hash table-based caching;  and also gets rid of the
    "valid" column in the symbols tree, saving a few bytes in memory.
    
    Finally, there is a ~7% performance gain (from 21 to 18ms) upon common
    tree updates, sometimes more.

 src/sidebar.c |   2 +-
 src/sidebar.h |   1 -
 src/symbols.c | 340 ++++++++++++++++++++++++++++------------------------------
 3 files changed, 164 insertions(+), 179 deletions(-)

commit 39606dd17cafb2392db9cb9daa318db9996146e8
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 20 16:10:02 2011 +0100

    Add Close menu item to the notebook tab menu
    
    This is especially useful if tab close buttons are disabled.

 src/notebook.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit cfa334de74cc7e1d0c5a8fea81ebeb258a79525a
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 20 16:05:39 2011 +0100

    Fix using the current document on 'Close Other Documents' from the GtkNotebook tab menu
    
    Instead we should use that tab which is under mouse cursor where the user clicked (this might be a
    different one than the current document). To be able to do so, we need to handle the right-click signal
    per tab not on the GtkNotebook tab area to identify the tab under the mouse cursor.

 src/callbacks.c | 15 +++++++++++++--
 src/notebook.c  | 27 ++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 7 deletions(-)

commit 7aa9160b5f8ed13a400424762d377152d995e709
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 20 14:48:05 2011 +0100

    Mention new openro command

 src/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a62d99a5f25d51586259dbe665c0f97448704a8e
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 20 14:46:30 2011 +0100

    Add --read-only option to the manpage

 doc/geany.1.in | 4 ++++
 1 file changed, 4 insertions(+)

commit 22ba6de142270ecf77dcc380f75052ddc2b23a30
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 20 13:39:20 2011 +0100

    Remove set but unused variable dwStatus (closes #3440276).

 src/win32.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 917ce32ccc4c9873fcd7ea7ccc0a5eb44085eff4
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 20 13:31:56 2011 +0100

    Prefix header guards with GEANY_ for consistency

 src/plugindata.h    | 4 ++--
 src/pluginprivate.h | 6 +++---
 src/plugins.h       | 4 ++--
 src/pluginutils.h   | 6 +++---
 src/prefix.h        | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

commit 7edcb7978fcbf5493a88ff091dbaf3cb5bf1e616
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 20 13:31:07 2011 +0100

    Remove double underscores around header guards (closes #3440258)
    
    While this is a violation of the C standard in theory, it should not affect anything.
    Anyway, removing the double underscores makes the header guard scheme more
    consistent with the rest of Geany header files so it's still a good thing.

 src/geanyentryaction.h      | 6 +++---
 src/geanymenubuttonaction.h | 6 +++---
 src/geanyobject.h           | 6 +++---
 src/geanywraplabel.h        | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

commit f99442731985dc893ddbcd44528b38ec90e0be38
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Nov 18 21:35:24 2011 +0100

    Fix walking a tree branch twice when removing the last leaf
    
    When removing the last leaf of a symbols tree branch, make sure not
    to start walking parent's children again.

 src/symbols.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 03152902a9de9bb242ec9e68457e3115af70ab6e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 17 16:15:38 2011 +0000

    Mention 'Go to tag' commands can use the current selection
    
    Cleanup 'Go to tag' sections and keybinding descriptions.

 doc/geany.html | 38 ++++++++++++++++----------------------
 doc/geany.txt  | 38 ++++++++++++++++----------------------
 2 files changed, 32 insertions(+), 44 deletions(-)

commit 9ae71ab6cc3bb8185939e1536ffba41beb896686
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 17 15:58:27 2011 +0000

    Add default keybindings for Go to Tag, remove Transpose default
    
    This does not affect existing users.
    
    Ctrl-T          Go to tag definition
    Ctrl-Shift-T    Go to tag declaration
    
    A default keybinding for 'Transpose current line' is no longer
    necessary as it does the same as 'Move line(s) up', which we now have
    a default for.

 doc/geany.html    | 8 ++++----
 doc/geany.txt     | 6 +++---
 src/keybindings.c | 8 +++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

commit 82769a046c6394d073cc8a32677d8d4794c12c4c
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 17 15:36:22 2011 +0000

    Set Move Line(s) default keybindings, change Move Tab defaults
    
    This does not affect existing users.
    
    Ctrl-Shift-PageUp   Move document left
    Ctrl-Shift-PageDown Move document right
    
    The above shortcuts were aliases for selecting left/rightmost
    documents, but those are not necessary as Alt-1/Alt-0 does the same.
    
    Alt-PageUp      Move line(s) up
    Alt-PageDown    Move line(s) down
    
    Alt is easier to press than Ctrl-Shift, so is better for moving lines
    as this needs more accuracy.

 doc/geany.html    | 13471 ++++++++++++++++++++++++++--------------------------
 doc/geany.txt     |    14 +-
 src/keybindings.c |    11 +-
 3 files changed, 6747 insertions(+), 6749 deletions(-)

commit 8f280ed884721a0a1c75462e428b9bcffb3ac527
Author: Thomas Martitz <thomas.martitz@student.htw-berlin.de>
Date:   Thu Nov 3 22:27:49 2011 +0100

    New --read-only commandline option
    
    This adds a new commandline option --read-only (or -r). It's implemented
    according to the behavior agreed on on the mailing list:
    
    --read-only applies to all files on the command line
    irrespective of positioning and has no effect on any other files
    opened by session or menu (...)
    
    Current behaviour on attempting to re-open a file with different
    read-only status is that nothing happens, the already open
    file is raised but not changed. (...)

 doc/geany.html | 9 ++++++++-
 doc/geany.txt  | 5 +++++
 src/document.c | 2 +-
 src/main.c     | 9 ++++++++-
 src/main.h     | 1 +
 src/socket.c   | 8 +++++++-
 6 files changed, 30 insertions(+), 4 deletions(-)

commit 80d5e07c6cbdf640abec0cc923cbdd6cfa63b73d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 17 03:50:27 2011 +0100

    Revert granting an unexpected check to an assertion
    
    It actually happens, and until fixing this properly, don't output
    useless useless scary warnings.  Anyway, this is not a big problem
    or anything.

 src/symbols.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 59eb0557b633da583b51aab9686c553119ef9ce0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 17 03:36:11 2011 +0100

    Add a configurable prefix for commands sent to the shell in the VTE
    
    This adds an hidden VTE preference, send_cmd_prefix, that allows to
    define a prefix for the commands Geany sends to the shell in the VTE
    like "cd" when following current path.
    
    This can be used for example to prevent some shells (Bash, ZSH, maybe
    others) from putting these commands in the history by setting this to
    a space.

 doc/geany.html | 13449 ++++++++++++++++++++++++++++---------------------------
 doc/geany.txt  |     9 +
 src/keyfile.c  |     3 +
 src/vte.c      |     3 +-
 src/vte.h      |     1 +
 5 files changed, 6746 insertions(+), 6719 deletions(-)

commit 5b41e177de3be70fce57c6479a48cb8ac313f1c1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Nov 16 17:26:19 2011 +0000

    Explain Windows paths for data and plugins

 doc/geany.html | 278 ++++++++++++++++++++++++++++++---------------------------
 doc/geany.txt  |  30 ++++---
 2 files changed, 164 insertions(+), 144 deletions(-)

commit 70b3cae060caa1f1f635f64f55f1929de1392b1a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Nov 16 16:44:19 2011 +0000

    Verify active plugin paths on startup
    
    Geany saves the path for each active plugin on shutdown, but the 3
    valid plugin paths can each change.

 src/plugins.c | 86 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 62 insertions(+), 24 deletions(-)

commit 58729d4de987383044beb2e6cea1653464059cd1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Nov 16 13:40:23 2011 +0000

    Use foo.o instead of foo.dll.o to enable Make Object (Windows build)

 plugins/makefile.win32 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 048e6a6c3c3309e7ee1660cdec144771eb98bdfd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 15 20:32:36 2011 +0100

    Fix an assertion logic

 src/document.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c73ee497588296122d579bdbf789a547eb4177ae
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 15 15:43:49 2011 +0100

    Fix a few things, most of them reported by clang's static analyzer

 src/editor.c  | 10 ++++------
 src/prefs.c   |  1 -
 src/symbols.c | 10 +++++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

commit 172825390ad7166987003245b26d8dd66b84fab3
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Nov 15 16:13:46 2011 +0000

    Deprecate setptr in favour of SETPTR
    
    SETPTR makes it clear that a macro is being used in code.
    Restore setptr without do/while in case of use without semi-colon.

 src/utils.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit a97c3597eba0093259d4f876df7aa95ce5065454
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Nov 15 13:41:54 2011 +0000

    Add default shortcuts for Find Usage, Forward/Back, Make Object
    
    Note: This doesn't affect existing user shortcuts.
    
    Ctrl-Shift-D    Find Document Usage
    Ctrl-Shift-E    Find [Session] Usage (one letter after doc usage and
                    close on the keyboard)
    
    These are standard shortcuts for browsers:
    Alt-Right   Forward
    Alt-Left    Back
    
    This matches the build/make symmetry for compile (F8):
    Shift-F8    Make Object

 doc/geany.html    | 13424 ++++++++++++++++++++++++++--------------------------
 doc/geany.txt     |    10 +-
 src/keybindings.c |    12 +-
 3 files changed, 6720 insertions(+), 6726 deletions(-)

commit 736c398467cc0e19f5c688d0a9b07fab88f8af92
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Nov 15 13:19:27 2011 +0000

    Fix setptr to work in an 'if' clause & improve documentation
    
    Use do {...} while (0) instead of {...}.
    Document the order of events and purpose of setptr properly.

 src/utils.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit 2e56a84b2ad1d01df2178fdc6cd5d2e43952ae77
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 14 19:54:28 2011 +0100

    Fix highlightingmappings documentation not to reference a removed macro

 src/highlightingmappings.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit cca258ddb70d1dac4273f613b5af032a98b45242
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Nov 14 18:40:20 2011 +0000

    Workaround gcc function address comparison warning
    
    E.g.
    highlighting.c:950:3: error: the address of
    'highlighting_styles_ADA' will always evaluate as 'true'
    
    Note: This commit also contains some trailing whitespace removal.

 src/highlightingmappings.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 1436bd6ee243e0e8233d2e5b3cddeaff4ad12129
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Nov 14 17:08:27 2011 +0100

    Quote C89 draft rather than C99 one

 src/highlightingmappings.h | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

commit a625955a43a484fbd23f9585cc4f4f4f256e87b5
Author: Lex Trotman <elextr@gmail.com>
Date:   Mon Nov 14 11:37:32 2011 +1100

    Provide error message for extract regex
    
    Print the GError message if the users filetype extract regex does
    not compile.

 src/filetypes.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit cb72e1d85fa687d88a47eba43c47b1ee4dddea80
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 13 20:39:39 2011 +0100

    Fix possible crashers in filetypes_detect_from_file_internal()
    
    * Never try to do a regex match on a NULL string;
    * Don't try to unref a possibly NULL regex.

 src/filetypes.c | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

commit 70f41f6485c717a6c5e988062f823628c559740f
Merge: 639e88a 6cee28d
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 13 17:35:29 2011 +0100

    Merge branch 'master' of github.com:geany/geany

commit 6cee28d677d7fd11058de7f4da5562475bd14d1a
Author: Matthew Brush <matt@geany.org>
Date:   Sun Nov 13 07:45:23 2011 -0800

    Get rid of warning in on_file_notify()
    
    Works around the issue discussed in commit 1e54fb6 by using the file
    chooser's property accessor function.
    Rename on_file_notify() to better explain its purpose.

 src/dialogs.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

commit 639e88add00270d7977d24541928175d7cb12ad2
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 13 13:32:05 2011 +0100

    Display the plugin's description in the list of plugins instead of the plugin's filename
    
    In the dialog, the plugin's description is more interesting and useful than the full filename.
    Instead, show the filename in the bottom box for those interested in.

 src/plugins.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit ed1c5060e1229f6dd07ddde62e3ed23ef6448591
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 13 13:24:47 2011 +0100

    Rename Search and Goto text fields action names
    
    This should avoid confusion in the toolbar customize dialog to not have
    two identical named items.

 src/toolbar.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d789c4d5467cda9b341bae472776b05e17881518
Author: Matthew Brush <matt@geany.org>
Date:   Sat Nov 12 18:15:28 2011 -0800

    Queue colourise of the Scintilla widget after (re)setting type keywords

 src/document.c | 1 +
 1 file changed, 1 insertion(+)

commit 8942bc810bc2091581027ea578717cf1d8342af1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 13 00:45:12 2011 +0100

    Add Objective-C support
    
    Based on a patch from Elias Pschernig, thanks.
    Parser was taken from upstream CTags.
    
    Closes patch#3325139.

 data/filetype_extensions.conf |    1 +
 data/filetypes.objectivec     |   48 ++
 src/document.c                |    1 +
 src/filetypes.c               |   10 +
 src/filetypes.h               |    1 +
 src/highlighting.c            |    2 +
 src/highlightingmappings.h    |   14 +
 tagmanager/Makefile.am        |    1 +
 tagmanager/makefile.win32     |    2 +-
 tagmanager/objc.c             | 1142 +++++++++++++++++++++++++++++++++++++++++
 tagmanager/parsers.h          |    4 +-
 wscript                       |    2 +-
 12 files changed, 1225 insertions(+), 3 deletions(-)

commit e53d5b82992550921451d30487b1a426477338f5
Merge: 9bffb94 a00366b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 12 19:21:36 2011 +0100

    Merge branch 'highlighting-rewrite'

commit a00366b266cac650134370103f5b3b5d3a08a700
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 12 02:07:36 2011 +0100

    Update HACKING for highlighting setup refactoring

 HACKING | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

commit 9bffb94cc43b8ca8a14214cfc8d5d47dfb6a2cd3
Author: Matthew Brush <matt@geany.org>
Date:   Thu Nov 10 19:18:02 2011 -0800

    Real-time type keyword highlighting
    
    * Add new function: document_update_tags().
    * Refactor the various tag update functions into document_update_tags().
    * Remove extra call to update the tags in document_new_file().

 HACKING           |   2 +-
 src/callbacks.c   |   1 -
 src/document.c    | 176 +++++++++++++++++++++++++-----------------------------
 src/document.h    |   4 +-
 src/keybindings.c |   2 +-
 5 files changed, 83 insertions(+), 102 deletions(-)

commit d8d6f2908eb6c810fa9a2f0a458c8c113353be45
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Nov 11 20:02:59 2011 +0100

    Remove an unnecessary macro indirection

 src/highlighting.c         | 32 ++++++++++++--------------------
 src/highlightingmappings.h |  3 +++
 2 files changed, 15 insertions(+), 20 deletions(-)

commit 8bf9a7cb0ca7fd9ef602d8f079f74467aaf5e66f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Fri Nov 11 16:37:36 2011 +0100

    Add Matthew Brush as developer

 AUTHORS          |  1 +
 README           |  3 ++-
 README.Packagers |  3 ++-
 src/about.c      | 10 +++++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

commit f70dcf038af428ecccf7941bbe93cebd7d0a27a8
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Nov 10 19:23:18 2011 +0100

    Update of Mongolian translation

 po/mn.po | 6421 ++++++++++++--------------------------------------------------
 1 file changed, 1263 insertions(+), 5158 deletions(-)

commit 511d5276a324033992d0142ae18d1dacd9cb4169
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 10 15:40:30 2011 +0100

    Merge apply_filetype_properties() into styleset_from_mapping()

 src/highlighting.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

commit cc63453a972bae703836bc80bd60d8116ee30387
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 10 15:35:03 2011 +0100

    Remove now unused old init_styleset_case() and rename new one

 src/highlighting.c | 196 +++++++++++++++++++++++++----------------------------
 1 file changed, 92 insertions(+), 104 deletions(-)

commit b96d22374a04e58fbb0eb017d8baf099ea34e7ad
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 9 22:59:56 2011 +0100

    Make HTML filetype the "primary" one XML and PHP inherits from
    
    XML used to be the one holding the actual definitions, but the HTML
    filetype is actually superset of XML (XML filetypes had definitions
    for non-XML things), and most definitions names referenced HTML rather
    than XML.
    
    So, move the actual definitions from filetypes.xml to filetypes.html
    and make XML and PHP inherit from HTML.

 data/filetypes.html | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 data/filetypes.php  |  4 +--
 data/filetypes.xml  | 86 ++---------------------------------------------------
 3 files changed, 88 insertions(+), 88 deletions(-)

commit ad1bc032ab58d5ec5f3b6751d3005f942ededcda
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 9 22:50:26 2011 +0100

    Port XML, HTML and PHP filetypes to new automated setup
    
    This changes these three filetypes to "normal" ones rather than HTML
    and PHP being hard-coded together with XML.  Now the definitions
    simply references each other and the filetypes.* files simply inherits
    styling and keywords from the appropriate filetype.
    
    This also makes these filetypes have their own Python styles like they
    had their own JavaScript ones, rather than trickily reference the
    Python ones.

 data/filetypes.html        |   5 +-
 data/filetypes.php         |   5 +-
 data/filetypes.xml         |  14 +++
 src/highlighting.c         | 288 +--------------------------------------------
 src/highlightingmappings.h | 164 ++++++++++++++++++++++++++
 5 files changed, 190 insertions(+), 286 deletions(-)

commit 55edeb876d208fb05aefb0ebca5fdb434a1a9a72
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 9 17:32:21 2011 +0100

    Fix a DocBook style mapping

 src/highlightingmappings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 21e0c037da6ca4ab55619e8c0f531fb47392fd52
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 9 17:14:48 2011 +0100

    Port DocBook filetype to new automated setup

 src/highlighting.c         | 88 ++--------------------------------------------
 src/highlightingmappings.h | 41 +++++++++++++++++++++
 2 files changed, 43 insertions(+), 86 deletions(-)

commit 69769e0edc3965af36fa47ed730200b963ac43ef
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 9 17:14:05 2011 +0100

    Add support for EOLFILLED style flag

 src/highlighting.c         | 4 ++++
 src/highlightingmappings.h | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

commit 493b5284f71cd3b4d8777a3233c5d52363e329ac
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 9 16:46:08 2011 +0100

    Remove some unnecessary initializers
    
    Leave some initialization to the implicit C initialization rules to
    have less unnecessary items in initializer lists

 src/highlightingmappings.h | 232 +++++++++++++++++++++++++--------------------
 1 file changed, 130 insertions(+), 102 deletions(-)

commit f67ed6b63670d88dead6b00b7aec340e9d61a7ed
Author: Lex Trotman <elextr@gmail.com>
Date:   Wed Nov 9 19:08:27 2011 +1100

    Fix potential NULL dereference
    
    Found by codebrainz using clang static analyser.

 src/build.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 80eeb484c696b3d8ae7f0ffb6cf7700b9503eeeb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 8 23:33:47 2011 +0100

    Remove lexer argument from STYLESET_FROM_MAPPING()

 src/highlighting.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 1a91e53586cf814e8dc7dd1154cb14d95b392f61
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 8 23:30:34 2011 +0100

    Rewrite two functions for better readability

 src/highlighting.c | 50 +++++++++++++++++---------------------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

commit ab2663e9aef8aa17af330c54eb7e6223647aa0f5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Nov 8 22:50:53 2011 +0100

    Refactor highlighting setup

 src/Makefile.am            |    1 +
 src/highlighting.c         | 2466 ++++----------------------------------------
 src/highlightingmappings.h | 1193 +++++++++++++++++++++
 3 files changed, 1384 insertions(+), 2276 deletions(-)

commit ba0e6353af9a8f69baba3d3ad97de6dc17a29b1a
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Tue Nov 8 17:17:23 2011 +0100

    Update of Mongolian translation

 po/mn.po | 1543 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 1003 insertions(+), 540 deletions(-)

commit c9cd6c096c3c1db0ba2a70045c23502fa4a3f348
Author: Matthew Brush <matt@geany.org>
Date:   Mon Nov 7 00:23:57 2011 -0800

    Set a parent GtkWindow on build command label edit input dialogs
    
    This prevents losing the label edit input dialog below the build command
    dialog which can be confusing since it prevents the build command dialog
    from accepting input even though it's on-top of the (potentially hidden)
    label edit input dialog.

 src/build.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 0a16ec75209bb6aa130119d10064e811b3423b95
Merge: 6099e8d c9a32bf
Author: Matthew Brush <matt@geany.org>
Date:   Sun Nov 6 23:44:24 2011 -0800

    Merge branch 'master' into gtkbuilder
    
    Conflicts:
    	src/interface.c
    	src/vte.c

commit c9a32bfdc9abe29c13c20eedd8b8142e625f6e76
Author: Matthew Brush <matt@geany.org>
Date:   Sun Nov 6 18:23:01 2011 -0800

    Make use of gtk_widget_get_window() added in GTK+ 2.14

 src/editor.c      |  2 +-
 src/keybindings.c |  2 +-
 src/keyfile.c     |  2 +-
 src/socket.c      |  8 +++++---
 src/win32.c       | 24 ++++++++++++------------
 5 files changed, 20 insertions(+), 18 deletions(-)

commit 28dc825e2a504cb139ebc9dc9d25e565ff0f4fc4
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Nov 6 13:53:46 2011 +0100

    Update developer list in the About dialog

 src/about.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f201434a280dcd8f37ac95f42923d838142d1093
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Nov 6 12:36:38 2011 +0100

    Adding Mongolian translation

 THANKS       |    1 +
 po/ChangeLog |    5 +
 po/mn.po     | 5582 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/about.c  |    1 +
 4 files changed, 5589 insertions(+)

commit 1e54fb6a015f02c5be2ab18faca7b2059ca0a114
Author: Lex Trotman <elextr@gmail.com>
Date:   Sun Nov 6 20:58:32 2011 +1100

    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.

 src/dialogs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 4d92e0530b7e64f4cbeda2d264b7e705cfd75699
Author: Lex Trotman <elextr@gmail.com>
Date:   Sun Nov 6 18:10:56 2011 +1100

    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’

 src/dialogs.c   | 2 +-
 src/sidebar.c   | 1 -
 tagmanager/js.c | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

commit 3f31453acee15b09925ddca5dde1ea5d7bfaf194
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Nov 6 01:12:42 2011 +0100

    Fix various integer sign and size issues

 src/build.c        |   8 +-
 src/callbacks.c    |   6 +-
 src/document.c     |   2 +-
 src/editor.c       |   4 +-
 src/filetypes.c    |   8 +-
 src/filetypes.h    |   2 +-
 src/highlighting.c | 224 ++++++++++++++++++++++++++---------------------------
 src/highlighting.h |   2 +-
 src/sciwrappers.c  |   2 +-
 src/sciwrappers.h  |   2 +-
 src/symbols.c      |   2 +-
 src/symbols.h      |   2 +-
 12 files changed, 133 insertions(+), 131 deletions(-)

commit 19da0ce965901090f803805c53c3c3d33d6ac4f9
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Nov 5 23:56:33 2011 +0100

    Fix or add a few Scintilla styles mappings
    
    Closes #3432760.

 data/filetypes.asm  |   3 +-
 data/filetypes.caml |   2 +
 data/filetypes.lisp |   5 +-
 data/filetypes.sql  |   3 +
 data/filetypes.tcl  |   2 +
 src/highlighting.c  | 216 ++++++++++++++++++++++++++++++----------------------
 6 files changed, 135 insertions(+), 96 deletions(-)

commit c1df8a7263075b537950aba147c04a192c2f612e
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Fri Nov 4 19:17:20 2011 -0700

    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.

 src/document.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit b55a30c2bf1fe2070b2edc4711d9a1bb93645291
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Nov 3 20:45:52 2011 +0100

    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.

 src/document.c |  8 ++++----
 src/main.c     |  4 ++--
 src/ui_utils.c | 32 ++++++++++++++++++++++++++------
 src/ui_utils.h |  2 +-
 4 files changed, 33 insertions(+), 13 deletions(-)

commit 0167f589b314056517627f88069a933daf56ee4d
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Nov 2 00:04:35 2011 +0100

    Small code cleanup
    
    Use foreach_document() in a few places where appropriate and make
    some code more consistent.

 src/callbacks.c   |  1 +
 src/document.c    | 15 ++++++---------
 src/keybindings.c |  3 +--
 src/keyfile.c     |  2 +-
 src/sidebar.c     | 11 +++--------
 src/ui_utils.c    |  6 +++---
 6 files changed, 15 insertions(+), 23 deletions(-)

commit c39390aae8df5c65c0371f288eb1272b3b3e1b6c
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 3 18:16:13 2011 +0000

    Fix using American spelling of color

 doc/geany.html | 14 +++++++++++---
 doc/geany.txt  |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

commit 822240d17f19ca03720e1d5a2a244fc6b3e45702
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 3 17:34:06 2011 +0000

    Add Style example for structs, doc-comments

 HACKING | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

commit efcce8808e92ba56684605790959cb014a11c9c8
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Nov 3 17:00:48 2011 +0000

    Add note not to use G_LIKELY or G_UNLIKELY (except in critical loops)
    
    These add noise to the code with little real benefit.

 HACKING | 2 ++
 1 file changed, 2 insertions(+)

commit ff663c16785a4b49a420e1b9a5977d95f140a242
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Wed Nov 2 22:44:26 2011 -0700

    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().

 src/document.c | 81 +++++++++++++++-------------------------------------------
 1 file changed, 20 insertions(+), 61 deletions(-)

commit ea51c487d3f1eb0baaed021249b39f775ed6992c
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Sat Oct 22 23:48:53 2011 -0700

    Use Scintilla's buffer directly for parsing tags

 src/document.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

commit 6ceb5ac1640dcf15f5bfb1415777fc7d5e58767e
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Wed Nov 2 20:18:12 2011 -0700

    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().

 HACKING        |  2 +-
 src/document.c | 27 +++++++++++----------------
 src/editor.c   | 16 ----------------
 src/editor.h   |  2 --
 4 files changed, 12 insertions(+), 35 deletions(-)

commit de559ef5d4150e2485ef3ffb865e9c9d3249bcd8
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Nov 2 15:17:17 2011 +0000

    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.

 src/build.c     |  3 ---
 src/callbacks.c | 20 ++++----------------
 src/dialogs.c   | 12 +++---------
 src/document.c  | 35 +++++++++++++++++++++--------------
 4 files changed, 28 insertions(+), 42 deletions(-)

commit f1b9c58612293f90d465ade5ada014ef324e365d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Nov 2 15:10:50 2011 +0000

    Fix auto-saving documents when the current document has no filename

 plugins/saveactions.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 83d9f9e82bc26bcd4c59644883bca58f70a96e4a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Nov 2 15:03:17 2011 +0000

    Fix generating API docs (Windows makefile).
    
    Also fixes a doxygen warning.

 doc/makefile.win32  | 5 +++++
 doc/pluginsymbols.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

commit f31a84869d45980a7ecb27f5a4d6c3588c547eee
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Nov 1 16:07:52 2011 +0000

    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).

 src/document.c | 5 ++---
 src/editor.c   | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 13597df9dffdcbd3091aac224d20b1924c563bde
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Nov 1 15:46:11 2011 +0000

    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.

 src/utils.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 5f0e46e07e3deaf5543b9920ae092711a31f6445
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Nov 1 13:27:00 2011 +0000

    Fix finding paths in the document list on Windows
    
    Finding paths in the tree was not case-insensitive either.

 src/sidebar.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit fdd5537cc0fcdb0e0ce1a5f58d2e08647436b847
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Oct 31 17:22:39 2011 +0000

    Use g_return_val_if_fail for some invalid NULL arguments

 src/document.c | 6 +-----
 src/utils.c    | 9 +++------
 2 files changed, 4 insertions(+), 11 deletions(-)

commit 42b3e7212a21a7518c65b088e436699085111783
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Oct 31 16:48:52 2011 +0000

    Fix document list path comparison on Windows
    
    Use case-insensitive matching for project base path and home
    directory in document filenames.

 src/sidebar.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit b69198691aa7b2a8a0d759aab10f64292b3e75b1
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Oct 31 16:47:18 2011 +0000

    Add utils_filenamecmp().

 src/document.c | 11 ++---------
 src/utils.h    |  7 +++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

commit af838cda7b9a40c677437bd1828c31491f5c0f89
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 30 23:11:04 2011 +0100

    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.

 src/sidebar.c | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

commit 274e01f5551c52374e49eb44690d3b5a665f2b21
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 30 22:52:29 2011 +0100

    Fix various coding style issues

 src/symbols.c  |  6 +++---
 src/ui_utils.c | 31 ++++++++++++++-----------------
 2 files changed, 17 insertions(+), 20 deletions(-)

commit 36ebb1f2b70f35dd802e98a628df070cff4f4d09
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 30 22:01:49 2011 +0100

    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).

 plugins/saveactions.c |  2 +-
 src/build.c           |  8 ++++----
 src/gb.c              | 12 ++++++------
 src/msgwindow.c       |  6 +++---
 src/project.c         |  4 ++--
 src/search.c          |  2 +-
 src/sidebar.c         |  8 ++++----
 src/ui_utils.c        |  2 +-
 src/vte.c             | 10 +++++-----
 9 files changed, 27 insertions(+), 27 deletions(-)

commit 0337b19dcb2aa952c07fb5ceab31dc3fdff48127
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Oct 30 12:55:09 2011 +0100

    Adding Wojciech Świderski to list of Polish translators

 THANKS       | 1 +
 po/ChangeLog | 2 +-
 src/about.c  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

commit e9973cc990fe13d87f94cfa2b807b2db764bf30b
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Oct 30 12:51:58 2011 +0100

    Just use pl as language code for Polish translation

 src/about.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a4194c5a63e255774e134f533653afe503628cea
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Oct 30 12:51:24 2011 +0100

    Move Jarosław to list of prev. Polish translators

 src/about.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit c7639863884e8779c3be765869c84b414cd65ae8
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Oct 30 12:50:44 2011 +0100

    Correct ChangeLog entry

 po/ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3cc02e6aa1f92a106a0817990ba6623dbfc7b66c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Sun Oct 30 12:26:48 2011 +0100

    Update of Polish translation

 po/ChangeLog |    5 +
 po/pl.po     | 4692 +++++++++++++++++++++++++++-------------------------------
 2 files changed, 2174 insertions(+), 2523 deletions(-)

commit a23e999b7bde54cc23184e6991ca5fdb58cdc47c
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Fri Oct 28 10:25:58 2011 -0700

    Bump GTK+ version to 2.16

 HACKING               | 10 +++++-----
 README                |  2 +-
 configure.ac          |  2 +-
 doc/geany.html        |  6 +++---
 doc/geany.txt         |  4 ++--
 geany.pc.in           |  2 +-
 plugins/filebrowser.c | 18 +++---------------
 src/callbacks.c       |  2 --
 src/dialogs.c         |  6 ++----
 src/ui_utils.c        | 18 +++++-------------
 src/utils.c           | 26 ++++++++++++--------------
 wscript               |  4 ++--
 12 files changed, 37 insertions(+), 63 deletions(-)

commit c4980f8c1e0a758e3da21369862865bfbb546304
Author: Matthew Brush <matt@geany.org>
Date:   Fri Oct 28 01:12:29 2011 -0700

    classbuilder: Move caret to start of generated documents

 plugins/classbuilder.c | 2 ++
 1 file changed, 2 insertions(+)

commit 65e20780e43c80141cbadf19ae6510d9c3b2bfcc
Author: Matthew Brush <matt@geany.org>
Date:   Thu Oct 27 23:58:32 2011 -0700

    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.

 plugins/classbuilder.c | 80 ++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 42 deletions(-)

commit d33f511fc49b09168284bfe030f738635f748258
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Oct 27 21:30:12 2011 +0200

    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.

 data/filetypes.latex | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit f6e135435b3d8cf6c382ab0504ff71c3ab6217f7
Author: Matthew Brush <matt@geany.org>
Date:   Sun Oct 23 13:44:52 2011 -0700

    Fixup various filedefs mappings

 data/filetypes.ada       | 4 ++--
 data/filetypes.asm       | 2 +-
 data/filetypes.c         | 4 ++--
 data/filetypes.caml      | 2 +-
 data/filetypes.cobol     | 2 +-
 data/filetypes.css       | 4 ++--
 data/filetypes.d         | 6 +++---
 data/filetypes.freebasic | 2 +-
 data/filetypes.haskell   | 4 ++--
 data/filetypes.lisp      | 2 +-
 data/filetypes.nsis      | 2 +-
 data/filetypes.pascal    | 4 ++--
 data/filetypes.perl      | 2 +-
 data/filetypes.python    | 2 +-
 data/filetypes.ruby      | 2 +-
 data/filetypes.sh        | 4 ++--
 data/filetypes.sql       | 2 +-
 data/filetypes.xml       | 4 ++--
 18 files changed, 27 insertions(+), 27 deletions(-)

commit 3fd7e9f68e6b859b80095fc609ffbdebf16306bc
Author: Enrico Tr�ger <enrico.troeger@uvena.de>
Date:   Sun Oct 23 16:32:22 2011 +0200

    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.

 src/main.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

commit c51129db6e703b6227e45130fcfc3243945fec3f
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Oct 23 16:29:17 2011 +0200

    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.

 src/win32.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit deb2d4a7f9ad385aa0c0be3a50ce683c88687890
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Oct 23 16:24:39 2011 +0200

    Add a few notes about generating tags files on Windows

 doc/geany.html | 13 +++++++++++--
 doc/geany.txt  | 11 +++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

commit 82146e953fa1bd41611ae1414159491818c412d7
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Sun Oct 23 00:41:50 2011 -0700

    Remove max length limit of 248 characters on search dialogs

 src/search.c | 5 -----
 1 file changed, 5 deletions(-)

commit 03dd57f148425401ba366ff6905a57e0f1f10a17
Author: Lex Trotman <elextr@gmail.com>
Date:   Sun Oct 23 13:41:10 2011 +1100

    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.

 src/keyfile.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

commit a0367acd2dc154ed0158b0b85f1b2ebf88a3246f
Merge: cdb748c 24dd733
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Oct 22 23:28:46 2011 +0200

    Merge branch 'scintilla-update'

commit 6099e8d3dfffb47ec1eddc1a720eb1af3e192427
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Sat Oct 22 11:58:09 2011 -0700

    Rename duplicate widgets in project dialog

 data/geany.glade | 10 +++++-----
 src/project.c    | 34 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 22 deletions(-)

commit cdb748c2c48f4e845e8354a58d75db5ec6e73487
Author: Lex Trotman <elextr@gmail.com>
Date:   Sat Oct 22 22:55:57 2011 +1100

    Add filetype extraction by regex
    
    Adds the ability to set filetype on open by extracting it from the
    file using a regex on the first few lines (default 2).

 doc/geany.html  | 84 ++++++++++++++++++++++++++++++++++++++++++---------------
 doc/geany.txt   | 44 +++++++++++++++++++++---------
 src/document.h  |  1 +
 src/filetypes.c | 70 ++++++++++++++++++++++++++++++++++++++++-------
 src/keyfile.c   |  3 +++
 5 files changed, 158 insertions(+), 44 deletions(-)

commit 24dd7330b213d1e7a4ba5bbaded74ceb53394349
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 19 15:37:34 2011 +0200

    Update code and comment styles for new Scintilla styles

 src/highlighting.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 89ab83cfbad80f083dfb68883d8dfb26810c74ff
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 19 03:18:54 2011 +0200

    Add Scintilla update to the NEWS

 NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

commit 5fc6764b9b0f9abd7d02db5953a612815b774620
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 19 03:18:19 2011 +0200

    Update highlighting styles for new Scintilla styles

 data/filetypes.latex |  9 +++++++++
 data/filetypes.lua   |  1 +
 data/filetypes.perl  | 12 ++++++++++++
 src/highlighting.c   | 44 +++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 63 insertions(+), 3 deletions(-)

commit b1b88286cf2c71a1be8e0bccc207063e93755bbd
Author: Matthew Brush <matt@geany.org>
Date:   Wed Oct 19 21:39:17 2011 -0700

    Simplify updating Scintilla keywords on reload config and tab switch.
    
    Remove type keywords caching function since it doesn't really speed up
    anything and we don't care if the keywords change since they can/should
    still be reloaded.  This also prevents "leaking" a static GString once
    when the application closes and saves a call to g_string_free() when the
    type keywords have changed.
    
    Rename document_update_highlighting() to document_update_type_keywords()
    since no re-highlighting is needed when updating Scintilla keywords.
    Scintilla highlights the new keywords automatically so this saves a call
    to queue_colourise().
    
    Remove update_type_keywords() function since this is now all handled
    in the document_update_type_keywords() function.  This function had a
    comment about updating all documents when sci is NULL but it was never
    used in this way since it was only called on document_load_config() which
    always operates on a single document and the sci should not be NULL.

 src/callbacks.c |   2 +-
 src/document.c  | 139 ++++++++++++--------------------------------------------
 src/document.h  |   2 +-
 3 files changed, 30 insertions(+), 113 deletions(-)

commit 6c8e80271e7307671b3ccb16552abf13924256c7
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Oct 19 13:09:13 2011 +0100

    Refactor without stash_foreach_various_pref
    
    Function was only used once.

 src/stash.c | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

commit 1a14e4869f3d16cb17331ff4c108eb10e87f0833
Author: Matthew Brush <matt@geany.org>
Date:   Wed Oct 19 01:29:10 2011 -0700

    Update Scintilla keywords and highlighting when changing document tabs

 src/callbacks.c |  1 +
 src/document.c  | 33 +++++++++++++++++++++++++++++++++
 src/document.h  |  2 ++
 3 files changed, 36 insertions(+)

commit bb745e8f3bb427ddd981b2ca9fa3eaca6e14a6c3
Author: Ondřej Žára <ondrej.zara@firma.seznam.cz>
Date:   Wed Oct 19 01:10:42 2011 -0700

    Add 'prototype' keyword for JavaScript

 data/filetypes.javascript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 72e856947e9d6183b2d04cffd65805fa7426caeb
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Wed Oct 19 00:35:24 2011 -0700

    Rework GtkBuilder code to behave more like old Glade 2 code
    
    * Put back ui_hookup_widget and ui_lookup_widget functions
    * Put back lookup_widget code in stash.c
    * Emulate old create_*() functions from interface.[ch].
    * Hookup all the GtkBuilder widget's to their top widgets like Glade 2
      generated code would've done.
    * Misc changes to accomodate the above.

 plugins/geanyfunctions.h |   4 -
 src/main.c               |   8 +-
 src/plugindata.h         |   2 -
 src/plugins.c            |   4 +-
 src/prefs.c              |   2 +-
 src/project.c            |   2 +-
 src/stash.c              |  26 +++++--
 src/ui_utils.c           | 198 +++++++++++++++++++++++++++++------------------
 src/ui_utils.h           |  20 +++--
 src/vte.c                |  16 ++--
 10 files changed, 166 insertions(+), 116 deletions(-)

commit cbc5600a1a775dc351093cb8ea2be36fb9595e95
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 18 15:51:50 2011 +0200

    Update to Scintilla 2.29

 scintilla/gtk/PlatGTK.cxx          |  344 +++++++---
 scintilla/gtk/ScintillaGTK.cxx     |  645 ++++++++++++++++---
 scintilla/include/Platform.h       |   17 +-
 scintilla/include/SciLexer.h       |   19 +
 scintilla/include/Scintilla.h      |   47 +-
 scintilla/include/Scintilla.iface  |  103 ++-
 scintilla/lexers/LexBasic.cxx      |  372 +++++++----
 scintilla/lexers/LexCOBOL.cxx      |    8 +
 scintilla/lexers/LexCPP.cxx        |   55 +-
 scintilla/lexers/LexHTML.cxx       |  125 ++--
 scintilla/lexers/LexLua.cxx        |  119 +++-
 scintilla/lexers/LexMarkdown.cxx   |   23 +-
 scintilla/lexers/LexMatlab.cxx     |   12 +-
 scintilla/lexers/LexOthers.cxx     |  260 +++++++-
 scintilla/lexers/LexPerl.cxx       | 1236 +++++++++++++++++++++++-------------
 scintilla/lexers/LexPython.cxx     |   71 +--
 scintilla/lexers/LexRuby.cxx       |   11 +-
 scintilla/lexers/LexSQL.cxx        |   22 +-
 scintilla/lexers/LexVHDL.cxx       |    2 +-
 scintilla/lexers/LexVerilog.cxx    |   30 +-
 scintilla/lexlib/Accessor.cxx      |    2 +-
 scintilla/lexlib/CharacterSet.h    |    1 -
 scintilla/lexlib/PropSetSimple.cxx |    7 +-
 scintilla/lexlib/SparseState.h     |    6 +-
 scintilla/lexlib/StyleContext.h    |    2 +-
 scintilla/lexlib/WordList.cxx      |   28 +-
 scintilla/scintilla_changes.patch  |    2 +-
 scintilla/src/CallTip.cxx          |    2 +-
 scintilla/src/ContractionState.cxx |   12 +-
 scintilla/src/ContractionState.h   |    1 +
 scintilla/src/Decoration.cxx       |    6 +-
 scintilla/src/Document.cxx         |  185 +++++-
 scintilla/src/Document.h           |   48 +-
 scintilla/src/Editor.cxx           |  699 ++++++++++++++------
 scintilla/src/Editor.h             |   20 +-
 scintilla/src/Indicator.cxx        |   58 +-
 scintilla/src/Indicator.h          |    3 +-
 scintilla/src/KeyMap.cxx           |   47 +-
 scintilla/src/KeyMap.h             |    1 +
 scintilla/src/LineMarker.cxx       |  153 +++--
 scintilla/src/LineMarker.h         |   18 +-
 scintilla/src/PerLine.cxx          |    4 +-
 scintilla/src/PositionCache.cxx    |   87 ++-
 scintilla/src/PositionCache.h      |   25 +-
 scintilla/src/RESearch.cxx         |    6 +-
 scintilla/src/RunStyles.cxx        |   34 +-
 scintilla/src/RunStyles.h          |    8 +-
 scintilla/src/ScintillaBase.cxx    |   17 +-
 scintilla/src/Style.cxx            |  146 ++---
 scintilla/src/Style.h              |   62 +-
 scintilla/src/ViewStyle.cxx        |  135 +++-
 scintilla/src/ViewStyle.h          |   20 +
 scintilla/src/XPM.cxx              |  143 ++++-
 scintilla/src/XPM.h                |   50 +-
 scintilla/version.txt              |    2 +-
 55 files changed, 4153 insertions(+), 1408 deletions(-)

commit c56788b7a781b6518235e1da8d58c948cf027954
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Wed Oct 19 03:26:18 2011 +0200

    Fix a few style mappings

 data/colorschemes/alt.conf | 2 +-
 data/filetypes.common      | 2 +-
 data/filetypes.perl        | 8 ++++----
 data/filetypes.sh          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

commit a3e5044d4fbc636c1ac5be12586de338f55c4ddd
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 16 21:03:06 2011 +0200

    Plug a few memory leaks
    
    These leaks actually were not "real" leaks since the memory will anyway
    be kept until quit.  Fixing those only makes the code "cleaner" and
    will prevent them to "hide" some other (real) ones at debug times.

 src/ui_utils.c | 11 ++++++++---
 src/vte.c      |  2 ++
 2 files changed, 10 insertions(+), 3 deletions(-)

commit 90cf307265e45cdf33e544d5faaaffa0bce4c9af
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Tue Oct 18 23:53:44 2011 +0200

    Adjust error line parsing for newer Python versions
    
    The format of the error message output of the py_compile module has changed in
    Python 2.6. The code now tries to detect the format and parse it accordingly.

 src/msgwindow.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

commit cf88abfe4d50038ab2bcfb16dd3a77674f58b735
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Oct 17 18:03:56 2011 +0100

    Speed up & simplify stash tree display/update
    
    Store a pointer to the stash pref for each row, so display/update is just
    O(n) instead of O(n^2) time.
    
    This changes the order prefs are updated in, but this doesn't matter.

 src/prefs.c |  4 ++--
 src/stash.c | 40 +++++++++++++++-------------------------
 src/stash.h |  4 ++--
 3 files changed, 19 insertions(+), 29 deletions(-)

commit d6fc1f74f13ef7f9ef516c45a9094942cddb66a6
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Oct 17 16:12:41 2011 +0100

    Use GPtrArray and g_slice to allocate prefs.
    
    This allows us to return StashPref pointers - before with GArray the
    address could change on future appends.

 src/stash.c | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

commit dc9ba7d074b9f7fcbc2c0be875f030ac3c562cee
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Sat Oct 15 14:27:53 2011 -0700

    Improve highlighting for PHP and JS

 data/filetypes.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit a670edfbe542c18290dbf95ddb0c097af917e532
Author: Matthew Brush <matt@geany.org>
Date:   Fri Oct 14 21:23:52 2011 -0700

    Remove no longer used global variable
    
    This should've been removed in the previous commit (oops).

 src/vte.c | 1 -
 1 file changed, 1 deletion(-)

commit 389d996b830f01f598433a2cd4301d4518683f33
Author: Matthew Brush <matt@geany.org>
Date:   Fri Oct 14 21:19:06 2011 -0700

    Show the correct Preferences tab when activated from  the VTE context menu

 src/vte.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit caaf824f70562138324da02c9720460f77c4a015
Author: Matthew Brush <matt@geany.org>
Date:   Fri Oct 14 20:58:13 2011 -0700

    Fix VTE font and foreground/background colour preference callbacks
    
    Remove `font-set` signal from Glade file since it's dependent on the VTE
    being available and connect it from `vte.c`.
    
    Add `color-set` handlers for foreground and background color preferences.

 data/geany.glade |  1 -
 src/vte.c        | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

commit c7c9eec6d07dad81fc275fea60f19b3f6d564112
Author: Matthew Brush <matt@geany.org>
Date:   Fri Oct 14 20:12:06 2011 -0700

    Fix minor style and visibility issue

 src/ui_utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit feb917d5e167e3e797e1831c510826562561823d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Oct 14 13:28:14 2011 +0100

    Fix uninitalized 'name' access.

 src/ui_utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4c633741c89f14dd00703425000f2273049599c0
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Oct 14 13:23:45 2011 +0100

    Use app->datadir instead of GEANY_DATADIR
    
    The latter doesn't work on Windows.

 src/ui_utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit eb6f740aff6eabcbd260e252353b74a295cca399
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Oct 14 13:00:01 2011 +0100

    Fix uninitialized access error

 src/ui_utils.c | 2 --
 1 file changed, 2 deletions(-)

commit 55646df83def1cf21d85145301439eb50d267330
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 13 16:56:40 2011 +0100

    Windows: Fix detecting a changed file on opening from command-line.
    
    The file timestamp can actually be in advance of the current time in
    this case.

 src/document.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit e9021f2174c62d30eee9231c4eafbd7320e3a02c
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 13 16:33:15 2011 +0100

    Windows: Fix wrongly shown debug message 'GetExitCodeProcess failed'

 src/win32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c2ce2403f4fe12d2130c2acd9b556643e80ef1f4
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 13 16:18:40 2011 +0100

    Windows: Fix 'Create process failed' message to show correct error
    
    This helps when trying to run build commands that don't exist;
    the status bar message for that is now:
    Process failed (The system cannot find the file specified.)

 src/win32.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit fd6c538795d573a79d1cda62347914d3fb274588
Merge: 02da53d 4fb9629
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 13 13:29:47 2011 +0100

    Merge branch 'master' of github.com:geany/geany

commit 02da53d7116e269cec1d4c6234ed5a176c38ca8e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 13 13:26:57 2011 +0100

    Fix focusing editor after startup on Windows

 src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4fb9629f5bdc62b6348ca18ec4e0b3b0f46d7626
Author: Matthew Brush <matt@geany.org>
Date:   Wed Oct 12 22:42:41 2011 -0700

    Detect HTML embedded filetypes from the current line
    
    When using the commenting features (ex. toggle line commentation),
    detect the the type of comments for the filetype of the line with
    the caret rather than using the filetype of the current document.
    
    Filetype is determined by the Scintilla state/style at the
    beginning of the line where the caret is.
    
    This does not fix the existing bug where using the commenting
    features on lines with things like `<script>` will result in an
    HTML-style comment to be wrapped around it and also where using
    the commenting feature on a line with something like `<?php`
    will not only wrap it in an HTML-style comment but it also won't
    be able to uncomment the line.
    
    This closes bug ID 2863829[1] and 3127598[2].
    
    [1] https://sourceforge.net/tracker/?func=detail&aid=2863829&group_id=153444&atid=787791
    [2] https://sourceforge.net/tracker/?func=detail&aid=3127598&group_id=153444&atid=787791

 src/editor.c | 97 ++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 69 insertions(+), 28 deletions(-)

commit 2662c6b8ca89314e2d29cd9e55227297495966ac
Merge: ea9c37a cbadf17
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Oct 12 17:53:56 2011 +0100

    Merge branch 'master' of github.com:geany/geany

commit ea9c37abca135710c6f9dd5cc57c2e1bdb21afea
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Oct 12 17:42:57 2011 +0100

    Ignore generated files from makefile.win32

 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

commit cbadf177f4ec4b85f76962dc73fd421481f072af
Author: Joshua Hoff <joshua.rh@comcast.net>
Date:   Tue Oct 11 20:42:09 2011 -0500

    simplify "append toolbar to menu" packing code

 src/toolbar.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit f9265535a36860e20f1dfc1aa80c01ad64ac6949
Author: Lex Trotman <elextr@gmail.com>
Date:   Wed Oct 12 17:45:24 2011 +1100

    Mention trailing whitespace in style

 HACKING | 5 +++++
 1 file changed, 5 insertions(+)

commit cc045b6736a4475d0123542a43306340a2f28ac4
Author: Lex Trotman <elextr@gmail.com>
Date:   Wed Oct 12 17:40:36 2011 +1100

    Document building plugins for hacked Geany

 HACKING | 49 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

commit bd5fba7eb57063c5f7d387d7cd36b21c6d3591bf
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Tue Oct 11 21:52:58 2011 -0700

    Remove extra whitespace at end of lines in all source files.
    
    * Processed with rstrip-whitespace.py script added to scripts/ directory.
    * Script run on all .c and .h files in src/ and plugins/ directories.
    * Also remove more than one newline at the end of files.

 plugins/htmlchars.c          |  2 --
 scripts/rstrip-whitespace.py | 23 +++++++++++++++++++++++
 src/build.c                  |  4 +---
 src/dialogs.c                |  4 +---
 src/editor.c                 |  4 ++--
 src/filetypes.c              |  1 -
 src/gb.c                     |  2 --
 src/geanyentryaction.c       |  1 -
 src/geanyobject.c            |  1 -
 src/highlighting.c           |  1 -
 src/images.c                 |  1 -
 src/interface.c              |  1 -
 src/keyfile.c                |  2 +-
 src/msgwindow.c              |  2 --
 src/notebook.c               |  2 --
 src/printing.c               |  1 -
 src/socket.c                 |  2 --
 src/symbols.c                |  2 --
 src/toolbar.c                |  2 --
 src/tools.c                  |  2 --
 src/utils.c                  |  4 ++--
 src/win32.c                  |  2 +-
 22 files changed, 31 insertions(+), 35 deletions(-)

commit 182bdc3b1784287725026c6423f9a1ca5471af39
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Tue Oct 11 21:30:28 2011 -0700

    Replace GTK_BIN(...)->child with gtk_bin_get_child(...)

 plugins/filebrowser.c |  6 +++---
 src/dialogs.c         |  2 +-
 src/search.c          | 10 +++++-----
 src/ui_utils.c        |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

commit 2aafa6a197e68f0185885f72c95807f950c81765
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Tue Oct 11 23:58:38 2011 +0200

    Improve the part about committing in HACKING

 HACKING | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

commit 5be552b04084f7f2b9a84abd70f3e386d149be54
Merge: 4bf5aef 9a2466a
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Tue Oct 11 15:58:44 2011 -0700

    Merge branch 'master' into gtkbuilder

commit 9a2466a1ef753dc5810b76d6940dc6195a3f5c95
Merge: 010be55 9b508b7
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Tue Oct 11 15:43:09 2011 -0700

    Merge branch 'geany-themes'

commit 9b508b712a7823a4a3755355c67539875af3d76e
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Tue Oct 11 15:33:40 2011 -0700

    Fix typo in comment in many filedefs.

 data/filetypes.ada       | 2 +-
 data/filetypes.asm       | 2 +-
 data/filetypes.c         | 2 +-
 data/filetypes.caml      | 2 +-
 data/filetypes.cobol     | 2 +-
 data/filetypes.conf      | 2 +-
 data/filetypes.css       | 2 +-
 data/filetypes.d         | 2 +-
 data/filetypes.diff      | 2 +-
 data/filetypes.erlang    | 2 +-
 data/filetypes.f77       | 2 +-
 data/filetypes.forth     | 2 +-
 data/filetypes.freebasic | 2 +-
 data/filetypes.haskell   | 2 +-
 data/filetypes.lisp      | 2 +-
 data/filetypes.lua       | 2 +-
 data/filetypes.makefile  | 2 +-
 data/filetypes.markdown  | 2 +-
 data/filetypes.matlab    | 2 +-
 data/filetypes.nsis      | 2 +-
 data/filetypes.pascal    | 2 +-
 data/filetypes.perl      | 2 +-
 data/filetypes.po        | 2 +-
 data/filetypes.python    | 2 +-
 data/filetypes.r         | 2 +-
 data/filetypes.ruby      | 2 +-
 data/filetypes.sh        | 2 +-
 data/filetypes.sql       | 2 +-
 data/filetypes.tcl       | 2 +-
 data/filetypes.txt2tags  | 2 +-
 data/filetypes.verilog   | 2 +-
 data/filetypes.vhdl      | 2 +-
 data/filetypes.xml       | 2 +-
 data/filetypes.yaml      | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

commit 010be558cd4ff2e568478e4e28cc804d06cab112
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 10 21:16:53 2011 +0200

    Plug a few memory leaks

 src/dialogs.c               |  9 ++++-----
 src/document.c              |  4 ++++
 src/geanymenubuttonaction.c |  7 ++++++-
 src/sidebar.c               | 16 +++++-----------
 4 files changed, 19 insertions(+), 17 deletions(-)

commit b6eccc01aed00240c8b0f9db1d6d65b28dca8d37
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Oct 11 18:02:21 2011 +0100

    Set Colomban as maintainer

 src/about.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 055779fb9fa472e9e168b80087d94e203d837109
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Oct 11 16:19:24 2011 +0100

    Cleanup dialogs_show_unsaved_file().

 src/dialogs.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

commit 7ebdacac2db5271f1f1bdfa3d8b0d41b33ee2a85
Author: Matthew Brush <mbrush@codebrainz.ca>
Date:   Mon Oct 10 20:35:05 2011 -0700

    Make all filetypes.* files use named styles.
    
    Fix colorschemes/alt.conf to use the new changes.

 data/colorschemes/alt.conf  |  92 ++++++++++++++++++++++++++++----
 data/filetypes.actionscript |  25 +--------
 data/filetypes.ada          |  26 +++++-----
 data/filetypes.asm          |  32 ++++++------
 data/filetypes.c            |  36 ++++++-------
 data/filetypes.caml         |  30 +++++------
 data/filetypes.cmake        |  30 +++++------
 data/filetypes.cobol        |  18 +++----
 data/filetypes.common       | 111 ++++++++++++++++++++++++++++-----------
 data/filetypes.conf         |  14 ++---
 data/filetypes.cpp          |  25 +--------
 data/filetypes.cs           |  25 +--------
 data/filetypes.css          |  48 ++++++++---------
 data/filetypes.d            |  28 +++++-----
 data/filetypes.diff         |  19 ++++---
 data/filetypes.docbook      |  32 +-----------
 data/filetypes.erlang       |  18 +++----
 data/filetypes.f77          |  34 ++++++------
 data/filetypes.ferite       |  25 +--------
 data/filetypes.forth        |  26 +++++-----
 data/filetypes.fortran      |  21 +-------
 data/filetypes.freebasic    |  41 +++++++--------
 data/filetypes.glsl         |  28 +---------
 data/filetypes.haskell      |  36 ++++++-------
 data/filetypes.haxe         |  25 +--------
 data/filetypes.java         |  26 +---------
 data/filetypes.javascript   |  25 +--------
 data/filetypes.latex        |  12 ++---
 data/filetypes.lisp         |  26 +++++-----
 data/filetypes.lua          |  42 +++++++--------
 data/filetypes.makefile     |  19 +++----
 data/filetypes.markdown     |  36 ++++++-------
 data/filetypes.matlab       |  20 +++----
 data/filetypes.nsis         |  41 +++++++--------
 data/filetypes.pascal       |  32 ++++++------
 data/filetypes.perl         |  72 ++++++++++++-------------
 data/filetypes.po           |  24 ++++-----
 data/filetypes.python       |  25 +++++----
 data/filetypes.r            |  31 +++++------
 data/filetypes.ruby         |  71 +++++++++++++------------
 data/filetypes.sh           |  30 +++++------
 data/filetypes.sql          |  32 ++++++------
 data/filetypes.tcl          |  36 ++++++-------
 data/filetypes.txt2tags     |  46 ++++++++--------
 data/filetypes.vala         |  25 +--------
 data/filetypes.verilog      |  22 ++++----
 data/filetypes.vhdl         |  34 ++++++------
 data/filetypes.xml          | 124 ++++++++++++++++++++------------------------
 data/filetypes.yaml         |  23 ++++----
 49 files changed, 773 insertions(+), 946 deletions(-)

commit 4bf5aef08a7507db6de873e5b2aaf7a5ab644c59
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Sun Sep 25 12:29:59 2011 -0700

    Make some menu items not all active.

 data/geany.glade | 11 -----------
 1 file changed, 11 deletions(-)

commit 92bd63bc64af27727aa9399904cacb91a5626883
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Sat Sep 24 17:10:20 2011 -0700

    Make the 'Various' tab the last tab in the main prefs notebook.

 data/geany.glade | 256 +++++++++++++++++++++++++++----------------------------
 1 file changed, 128 insertions(+), 128 deletions(-)

commit 9ce76ef067a679e62e67a37b3a0e77453a1d0c8d
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Sat Sep 24 16:50:09 2011 -0700

    Make main window initially invisible.
    
    This prevents the window from flashing up in the default location with the
    default size before Geany sets it's saved size and position.

 data/geany.glade | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

commit b8c5be4d1183f504a3b22482b195271865dc5162
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Sat Sep 24 15:29:20 2011 -0700

    Add note to ui_hookup_widget() doc comments.

 src/ui_utils.h | 4 ++++
 1 file changed, 4 insertions(+)

commit cc118515ba27afd3ba17d5bdaf4d040da55be9d0
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Sat Sep 24 15:08:16 2011 -0700

    Delete unused Glade 2 ui file.

 geany.glade2 | 10913 ---------------------------------------------------------
 1 file changed, 10913 deletions(-)

commit 6086749e51dd372c4d7838b178372692f9f7d47e
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Sat Sep 24 14:47:00 2011 -0700

    Cleanup comments in ui_utils.c/h.

 src/ui_utils.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

commit f78e8e602a19174e8cc7187095966d4586f5ed72
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Sat Sep 24 14:35:33 2011 -0700

    Add ui_hookup_object() and ui_lookup_object() functions to the plugin API.
    
    TODO: Increment the plugin API number if/when this gets committed.

 plugins/geanyfunctions.h | 4 ++++
 src/plugindata.h         | 2 ++
 src/plugins.c            | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

commit af093c2ddf4a07a17cf67c207fe68f6cd4017439
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Sat Sep 24 14:34:05 2011 -0700

    Remove interface.c/h files and put code into ui_utils.c/h.

 src/Makefile.am    |   1 -
 src/interface.c    | 182 -----------------------------------------------------
 src/interface.h    |  28 ---------
 src/main.c         |   5 +-
 src/makefile.win32 |   8 +--
 src/prefs.c        |   1 -
 src/project.c      |   1 -
 src/stash.c        |   6 +-
 src/ui_utils.c     | 154 ++++++++++++++++++++++++++++++++++++++++++++-
 src/ui_utils.h     |  14 ++++-
 10 files changed, 173 insertions(+), 227 deletions(-)

commit 9109c6b4e09cb09f101e572b5d6e7687907cb3f4
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Fri Sep 23 21:49:02 2011 -0700

    Cleanup some comments.

 src/interface.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

commit d7538c83e1db0e93bf073fc0481ac2ec604cf347
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Fri Sep 23 21:29:32 2011 -0700

    Make builder and interface_file local to the init function.

 src/interface.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit fb4f21613b30a0b72a0af3c9421c68846781c857
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Thu Sep 22 23:10:45 2011 -0700

    Document that the widget param for ui_lookup_widget() is no longer.
    
    Cast it to void to avoid warnings and tell other programmers.

 src/ui_utils.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit cfedadae270dc35fe357f80829c0a2f2adaa098f
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Thu Sep 22 23:00:06 2011 -0700

    Remove lingering Glade 2 create_*() functions.
    
    Add interface.h includes in prefs.c, project.c, stash.c and ui_utils.c.

 src/interface.c | 34 ----------------------------------
 src/interface.h |  8 --------
 src/main.c      |  6 +++---
 src/prefs.c     |  2 +-
 src/project.c   |  2 +-
 src/stash.c     |  1 +
 src/ui_utils.c  |  1 +
 7 files changed, 7 insertions(+), 47 deletions(-)

commit a474046741732f39e773cc3f9685c33d224b0949
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Thu Sep 22 21:20:15 2011 -0700

    Change order of name retrieval.

 src/interface.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit fa6c666c2c7e78abcf05d91f82050eb307d2e5ab
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Thu Sep 22 18:43:42 2011 -0700

    Make sure interface is finalized after the rest of Geany is done with it's objects.

 src/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 93b0b1bed1456838d755aaf885c82ac68552513d
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Thu Sep 22 18:42:30 2011 -0700

    Use a GHashTable to store and lookup key/name mapping rather than GSList.

 src/interface.c | 88 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 45 insertions(+), 43 deletions(-)

commit 6429f36d881adf3c47b05e06db5d9057485e4e2e
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Thu Sep 22 17:49:07 2011 -0700

    Remove -wl,--export-dynamic from Makefile.am for Win32 since it's not needed and might not even work.

 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7c9430884f6e26e3218a5feb9ce4e0aa7c2f6bcf
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Thu Sep 22 00:08:39 2011 -0700

    Cleanup code, comments and refactor a bit.

 src/interface.c | 130 +++++++++++++++++++++++++++++++++-----------------------
 src/interface.h |  40 +++++++++++++----
 src/main.c      |   3 ++
 src/ui_utils.c  |  16 -------
 src/ui_utils.h  |   4 +-
 5 files changed, 113 insertions(+), 80 deletions(-)

commit a42161181a07b2ff48a92a904b9ea60eae112c8c
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Wed Sep 21 22:46:31 2011 -0700

    Remove debugging print statement that shouldn't have been committed (oops).

 src/interface.c | 3 ---
 1 file changed, 3 deletions(-)

commit 6b1088ea96f484054c2d3655501edce1fb3cc9be
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Wed Sep 21 22:45:23 2011 -0700

    Port the Terminal UI to Glade 3/GtkBuilder.
    
    Just don't show it if we don't have a VTE (ex. on Win32 or if it's disabled).

 data/geany.glade | 422 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/vte.c        | 212 ++++------------------------
 2 files changed, 451 insertions(+), 183 deletions(-)

commit 2a5164f098f601cdacc0819179ae48c065c1a08f
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Wed Sep 21 21:33:18 2011 -0700

    Change some widget names that were changed in the Glade 3 file.

 src/keybindings.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 14e880dd967afafc19b67519bbf3222f4516d679
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Wed Sep 21 21:31:51 2011 -0700

    Update stash widget lookup code.

 src/stash.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

commit c39ad3e29d85b01931ffc8c6e5e99098b0b9c2f6
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Wed Sep 21 21:30:11 2011 -0700

    Update ui_lookup_widget() and ui_hookup_widget() to use new interface.c/h code.

 src/ui_utils.c | 35 +++++++++++++++++++----------------
 src/ui_utils.h |  6 ++++--
 2 files changed, 23 insertions(+), 18 deletions(-)

commit 63080efd408b4808f16d4104179da1fb8cd1fd48
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Wed Sep 21 21:29:09 2011 -0700

    Remove old Glade 2 generated code and add some compatibility code.

 src/interface.c | 5920 ++-----------------------------------------------------
 src/interface.h |    7 +-
 2 files changed, 149 insertions(+), 5778 deletions(-)

commit 0d3040bf86f68e4d9855d023fb4f25865183c5ba
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Wed Sep 21 21:26:02 2011 -0700

    Export symbols from Geany to allow GtkBuilder to find the callbacks.
    
    Link with --export-dynamic and add G_MODULE_EXPORT to make the callback
    symbols visible on Win32.

 src/Makefile.am |    4 +-
 src/callbacks.c |  302 +++++++--------
 src/callbacks.h | 1089 ++++++++++++++++++++++++++++---------------------------
 3 files changed, 699 insertions(+), 696 deletions(-)

commit ca6f36b7364b625ae7b9873940ff6e4c870b2ab0
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Wed Sep 21 21:24:50 2011 -0700

    Move the Glade file to the data/ directory and ship it on install.

 Makefile.am      |    5 +-
 data/geany.glade | 8651 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 geany.glade      | 8632 -----------------------------------------------------
 3 files changed, 8653 insertions(+), 8635 deletions(-)

commit 473b3aa10e43dfe75ed017e1ce3de0ad1a3cb9e5
Author: Matthew Brush <codebrainz@codebrainz.ca>
Date:   Wed Sep 21 15:29:30 2011 -0700

    Convert old Glade2 user-interface file to Glade3/GtkBuilder format.
    
    Using Glade 3.8 and GTK+ version set to 2.16 to avoid errors on save.

 geany.glade  | 19545 +++++++++++++++++++++++++--------------------------------
 geany.glade2 | 10913 ++++++++++++++++++++++++++++++++
 2 files changed, 19545 insertions(+), 10913 deletions(-)

commit 5762981165db403a6e2552d05f05a11f8f5235c0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 10 16:50:51 2011 +0200

    Revert adding reStructuredText extension to README
    
    This reverts commits fbf77f586d65e319ecc1da11e98dcd932dd88b28 and
    3816e40190c2f5331992f795f297669a399803fb.
    
    While having the .rst extension helps GitHub formatting the file, the
    renaming broke both Autotools and Waf build systems.

 Makefile.am  |   1 -
 README       | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.rst   | 109 -----------------------------------------------------------
 configure.ac |   2 +-
 4 files changed, 110 insertions(+), 111 deletions(-)

commit 3816e40190c2f5331992f795f297669a399803fb
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 10 01:42:04 2011 +0200

    Fix Autotools failure requiring README (oops)
    
    Automake requires README to exist by default, but it was renamed to
    README.rst recently.  Thus, change Automake strictness to `foreign'
    for README to be optional, and distribute README.rst explicitly.
    
    Although `foreign' strictness don't require any of the README, INSTALL,
    COPYING, etc. files, it still includes them if available, so the
    distribution still includes them.

 Makefile.am  | 1 +
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 8ed1664fc602c6664e01faee7de9a13e93cc6d5b
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Mon Oct 10 00:37:14 2011 +0200

    If we didn't find a revision, set it to "-1" not just "None"

 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 50ae63002b48cafcfe43dda101f4f90204253a53
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Mon Oct 10 00:34:42 2011 +0200

    Strip trailing whitespace from the revision

 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 447b5e379c2e57f11cf6fbd6835d7a936dc9f07a
Author: Matthew Brush <matt@geany.org>
Date:   Sun Oct 9 23:04:10 2011 +0200

    Add .gitignore

 .gitignore | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

commit fbf77f586d65e319ecc1da11e98dcd932dd88b28
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 9 22:54:27 2011 +0200

    Add reStructuredText extension to README
    
    This will help GitHub to detect the content type and format it nicely.

 README     | 109 -------------------------------------------------------------
 README.rst | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+), 109 deletions(-)

commit d06e9f4575728093b3355de31ac8efb89e1a38b1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 9 22:48:31 2011 +0200

    Remove $Id$ and $Date$ SVN keywords

 configure.ac                | 1 -
 doc/geany.txt               | 2 +-
 doc/making-a-release        | 2 +-
 doc/plugins.dox             | 3 ---
 doc/pluginsignals.c         | 2 --
 doc/pluginsymbols.c         | 2 --
 geany.nsi                   | 1 -
 plugins/classbuilder.c      | 2 --
 plugins/demoplugin.c        | 2 --
 plugins/export.c            | 2 --
 plugins/filebrowser.c       | 2 --
 plugins/geanyplugin.h       | 2 --
 plugins/htmlchars.c         | 2 --
 plugins/saveactions.c       | 2 --
 plugins/splitwindow.c       | 2 --
 src/Makefile.am             | 1 -
 src/about.c                 | 2 --
 src/about.h                 | 2 --
 src/build.c                 | 2 --
 src/build.h                 | 2 --
 src/callbacks.c             | 2 --
 src/callbacks.h             | 2 --
 src/dialogs.c               | 2 --
 src/dialogs.h               | 2 --
 src/document.c              | 2 --
 src/document.h              | 2 --
 src/documentprivate.h       | 2 --
 src/editor.c                | 2 --
 src/editor.h                | 2 --
 src/encodings.c             | 2 --
 src/encodings.h             | 2 --
 src/filetypes.c             | 2 --
 src/filetypes.h             | 2 --
 src/filetypesprivate.h      | 2 --
 src/gb.c                    | 2 --
 src/geany.h                 | 2 --
 src/geanyentryaction.c      | 2 --
 src/geanymenubuttonaction.c | 2 --
 src/geanymenubuttonaction.h | 2 --
 src/geanyobject.c           | 2 --
 src/geanyobject.h           | 2 --
 src/geanywraplabel.c        | 2 --
 src/geanywraplabel.h        | 2 --
 src/highlighting.c          | 2 --
 src/highlighting.h          | 2 --
 src/keybindings.c           | 2 --
 src/keybindings.h           | 2 --
 src/keyfile.c               | 2 --
 src/keyfile.h               | 2 --
 src/log.c                   | 2 --
 src/log.h                   | 2 --
 src/main.c                  | 2 --
 src/main.h                  | 2 --
 src/msgwindow.c             | 2 --
 src/msgwindow.h             | 2 --
 src/navqueue.c              | 2 --
 src/navqueue.h              | 2 --
 src/notebook.c              | 2 --
 src/notebook.h              | 2 --
 src/plugindata.h            | 2 --
 src/pluginprivate.h         | 2 --
 src/plugins.c               | 2 --
 src/plugins.h               | 2 --
 src/pluginutils.c           | 2 --
 src/pluginutils.h           | 2 --
 src/prefs.c                 | 2 --
 src/printing.c              | 2 --
 src/printing.h              | 2 --
 src/project.c               | 2 --
 src/project.h               | 2 --
 src/projectprivate.h        | 2 --
 src/sciwrappers.c           | 2 --
 src/sciwrappers.h           | 2 --
 src/search.c                | 2 --
 src/search.h                | 2 --
 src/sidebar.c               | 2 --
 src/sidebar.h               | 2 --
 src/socket.c                | 2 --
 src/socket.h                | 2 --
 src/stash.c                 | 2 --
 src/stash.h                 | 2 --
 src/support.h               | 2 --
 src/symbols.c               | 2 --
 src/symbols.h               | 2 --
 src/templates.c             | 2 --
 src/templates.h             | 2 --
 src/toolbar.c               | 2 --
 src/toolbar.h               | 2 --
 src/tools.c                 | 2 --
 src/tools.h                 | 2 --
 src/ui_utils.c              | 2 --
 src/ui_utils.h              | 2 --
 src/utils.c                 | 2 --
 src/utils.h                 | 2 --
 src/vte.c                   | 2 --
 src/vte.h                   | 2 --
 src/win32.c                 | 2 --
 src/win32.h                 | 2 --
 tagmanager/Makefile.am      | 1 -
 tagmanager/asm.c            | 2 --
 tagmanager/basic.c          | 2 --
 tagmanager/cobol.c          | 2 --
 tagmanager/docbook.c        | 2 --
 tagmanager/fortran.c        | 2 --
 tagmanager/get.c            | 2 --
 tagmanager/get.h            | 2 --
 tagmanager/html.c           | 2 --
 tagmanager/js.c             | 2 --
 tagmanager/latex.c          | 2 --
 tagmanager/lregex.c         | 2 --
 tagmanager/lua.c            | 2 --
 tagmanager/make.c           | 2 --
 tagmanager/nestlevel.c      | 2 --
 tagmanager/nestlevel.h      | 2 --
 tagmanager/nsis.c           | 2 --
 tagmanager/pascal.c         | 2 --
 tagmanager/perl.c           | 2 --
 tagmanager/php.c            | 2 --
 tagmanager/python.c         | 2 --
 tagmanager/r.c              | 2 --
 tagmanager/ruby.c           | 2 --
 tagmanager/sh.c             | 2 --
 tagmanager/sql.c            | 2 --
 tagmanager/strlist.c        | 2 --
 tagmanager/strlist.h        | 2 --
 tagmanager/tcl.c            | 2 --
 tagmanager/verilog.c        | 2 --
 wscript                     | 2 --
 128 files changed, 2 insertions(+), 251 deletions(-)

commit 3fda333717bd5b662dd84fec5144d8a71a82cbb5
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Oct 9 22:47:32 2011 +0200

    Cleanup

 wscript | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 9330f053389e955d71968b2aeb01baa78dd2be37
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date:   Sun Oct 9 22:46:19 2011 +0200

    Check for Git revision rather than SVN one (Waf-based build system)

 wscript | 60 ++++++++++++++++--------------------------------------------
 1 file changed, 16 insertions(+), 44 deletions(-)

commit ca33ea62cf48e5187d4e6d2048918af57c43142a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 9 20:48:02 2011 +0200

    Update HACKING for Git switch
    
    Remove references to SVN in HACKING and add some tips and rules for
    committing.

 HACKING | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 7 deletions(-)

commit 69313263e7bde140eba16a87535beb089e4f97c1
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sun Oct 9 20:46:02 2011 +0200

    Check for Git revision rather than SVN one

 m4/geany-revision.m4 | 27 ++++++---------------------
 src/main.c           |  2 +-
 2 files changed, 7 insertions(+), 22 deletions(-)

commit 534f10454d2bd7dbcb9757d354ee6567180ff04a
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Oct 7 16:50:15 2011 +0000

    Remove unnecessary document_show_tab() call (oops).
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6018 ea778897-0a13-0410-b9d1-a72fbfd435f5

 src/dialogs.c | 1 -
 1 file changed, 1 deletion(-)

commit 1563c625f79d1a3b041ac49775dcad87d01cbf61
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Oct 7 16:47:31 2011 +0000

    Add document_show_tab().
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6017 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog         |  7 +++++++
 src/callbacks.c   |  3 +--
 src/dialogs.c     | 13 +++++++------
 src/document.c    | 11 ++++++++---
 src/document.h    |  2 ++
 src/editor.c      |  6 +-----
 src/keybindings.c |  3 +--
 src/notebook.c    |  3 +--
 src/sidebar.c     |  4 +---
 9 files changed, 29 insertions(+), 23 deletions(-)

commit be81fafafb86c9c2aacbc2229d5387de1ade2712
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 6 16:18:31 2011 +0000

    Use utils_get_setting() for string keys.
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6015 ea778897-0a13-0410-b9d1-a72fbfd435f5

 src/highlighting.c | 60 ++++++------------------------------------------------
 1 file changed, 6 insertions(+), 54 deletions(-)

commit 8dbc838f1a0ef9781b98dfa899061fbb4773fe5c
Author: Frank Lanitz <frank@frank.uvena.de>
Date:   Thu Oct 6 15:42:00 2011 +0000

    Update of Swedish translation
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6014 ea778897-0a13-0410-b9d1-a72fbfd435f5

 po/ChangeLog |  10 +
 po/sv.po     | 842 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 418 insertions(+), 434 deletions(-)

commit d9b7ae92b86eed01755d8b484f477cf18502b4ee
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 6 12:36:28 2011 +0000

    Fix missing tagmanager/mio/makefile.win32 in EXTRA_DIST.
    Include makefile.win32 in EXTRA_DIST recursively, not at top-level.
    
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6013 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog                  | 4 ++++
 Makefile.am                | 5 +----
 scintilla/Makefile.am      | 3 ++-
 src/Makefile.am            | 3 ++-
 tagmanager/Makefile.am     | 3 ++-
 tagmanager/mio/Makefile.am | 3 ++-
 6 files changed, 13 insertions(+), 8 deletions(-)

commit 75da162c1cc6694ad0bb07552e3bd34d76c5c7a0
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 6 12:21:06 2011 +0000

    Add doc/makefile.win32 for docs generation.
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6012 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog          |  6 ++++++
 doc/Makefile.am    |  1 +
 doc/makefile.win32 | 21 +++++++++++++++++++++
 3 files changed, 28 insertions(+)

commit 4781509a172b6d63a672ff69b38f4c1adc1f9016
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Oct 6 12:02:38 2011 +0000

    Initialize invalid matches for safety.
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6011 ea778897-0a13-0410-b9d1-a72fbfd435f5

 tagmanager/lregex.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 7c7bf882638d5700888f271282d44ad8b01d338a
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:46:09 2011 +0000

    Move configure check for The Force to its own file
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6010 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog             |  2 +-
 configure.ac          | 14 +-------------
 m4/geany-the-force.m4 | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 14 deletions(-)

commit 974bb4c254f60f8e11004b049a7287b07a4f61ee
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:45:49 2011 +0000

    Reorder configure.ac a bit
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6009 ea778897-0a13-0410-b9d1-a72fbfd435f5

 configure.ac | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

commit 93a349005f7642266bb90af0c32daaa03999d1a2
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:45:33 2011 +0000

    Auto-generate final configure summary
    
    Add and use macros to generate final configure summary rather than
    hard-code it.  This allows for the status to be registered from where
    they comes rather than all in the end.
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6008 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog             |  2 +-
 configure.ac          | 28 +++++++++-------------------
 m4/geany-binreloc.m4  |  2 ++
 m4/geany-gnu-regex.m4 |  2 ++
 m4/geany-plugins.m4   |  2 ++
 m4/geany-revision.m4  |  1 +
 m4/geany-socket.m4    |  1 +
 m4/geany-status.m4    | 45 +++++++++++++++++++++++++++++++++++++++++++++
 m4/geany-vte.m4       |  1 +
 9 files changed, 64 insertions(+), 20 deletions(-)

commit c955de3ffcf0a65483e7952b9099acfb1b679eab
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:45:08 2011 +0000

    Move various tricky configure logic to their own file
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6007 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog         |  3 ++-
 configure.ac      | 15 ++-------------
 m4/geany-utils.m4 | 26 ++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 14 deletions(-)

commit f1bce08535f50f0072608ad9b443ec16295dbf17
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:44:48 2011 +0000

    Move configure logic for MinGW, socket and VTE to their own files
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6006 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog          |  3 ++-
 configure.ac       | 57 +++++++-----------------------------------------------
 m4/geany-mingw.m4  | 20 +++++++++++++++++++
 m4/geany-socket.m4 | 42 ++++++++++++++++++++++++++++++++++++++++
 m4/geany-vte.m4    | 46 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 117 insertions(+), 51 deletions(-)

commit 574d5ce336ea6eb0da876b53b1ccee36d178f63c
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:44:25 2011 +0000

    Move configure logic for i18n to its own file
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6005 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog        |  2 +-
 configure.ac     | 25 +------------------------
 m4/geany-i18n.m4 | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 25 deletions(-)

commit ff3ad0e642c09564bd66c46202597c7b1d1704e8
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:44:06 2011 +0000

    Move configure logic for enabling plugins to its own file
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6004 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog           |  2 +-
 configure.ac        | 19 ++-----------------
 m4/geany-plugins.m4 | 27 +++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 18 deletions(-)

commit c7b57e24e2fd49c6fd423f0b3b99c5a72694ac82
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:43:46 2011 +0000

    Move configure logic for internal GNU regex usage to its own file
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6003 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog             |  3 ++-
 configure.ac          | 18 +-----------------
 m4/geany-gnu-regex.m4 | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 18 deletions(-)

commit 294a21db8864d87fa353bf4ae9e7b262432d7023
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:43:28 2011 +0000

    Move configure logic for binary relocation support to its own file
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6002 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog            |  4 ++--
 configure.ac         | 53 +----------------------------------------------
 m4/geany-binreloc.m4 | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 54 deletions(-)

commit 680064b42c29d0abf6f517bf9ddd5a6a27d64fa5
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:43:09 2011 +0000

    Move configure logic that checks for SVN revision to its own file
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6001 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog            |  3 +++
 autogen.sh           |  2 +-
 configure.ac         | 38 ++------------------------------------
 m4/geany-revision.m4 | 45 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 37 deletions(-)

commit 4dd7092726569cfbe2eba15d77e4171d3556e19f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Thu Oct 6 00:42:48 2011 +0000

    Modernize configure.ac a bit
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6000 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog    |   6 ++
 autogen.sh   |   1 +
 configure.ac | 322 +++++++++++++++++++++++++++++++++--------------------------
 3 files changed, 186 insertions(+), 143 deletions(-)

commit d63f1f052bfccfe6155b75ee03412731502cc56e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Oct 5 15:59:26 2011 +0000

    Use <geanyplugin.h> not "geanyplugin.h" in the howto.
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5999 ea778897-0a13-0410-b9d1-a72fbfd435f5

 doc/plugins.dox | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b673f0534e3ac1485ec7d8b365c15b35c8219f3e
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Oct 5 15:33:40 2011 +0000

    Fix argument description.
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5998 ea778897-0a13-0410-b9d1-a72fbfd435f5

 src/utils.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 03d22bec52c285ec4c49a9b428409bc8f5ee17e0
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Oct 5 12:00:38 2011 +0000

    Fix CTags bug 2970274 - when using addCallbackRegex the callback
    receives less than the number of matches. The number is still not
    correct (due to POSIX regex compatibility) but at least includes
    all non-empty matches now.
    http://sourceforge.net/tracker/index.php?func=detail&aid=2970274
    &group_id=6556&atid=106556
    
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5997 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog           | 11 +++++++++++
 tagmanager/lregex.c |  9 +++++++--
 tagmanager/php.c    |  7 +------
 3 files changed, 19 insertions(+), 8 deletions(-)

commit 3462cc900a07de6e7e1c35b34d7afc4e6a45e50d
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Oct 4 17:10:42 2011 +0000

    Add note about using GRegex for tag parsers instead of POSIX regex.
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5996 ea778897-0a13-0410-b9d1-a72fbfd435f5

 HACKING | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 24530e59c183fa89967930847b3682ca549da4c3
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Tue Oct 4 12:22:36 2011 +0000

    Update from CTags SVN jscript.c.
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5995 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog       |   6 +++
 tagmanager/js.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 148 insertions(+), 15 deletions(-)

commit 965ef1a285aa4b166bb90a9c1241b9ecbbf1ee4f
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 3 17:06:12 2011 +0000

    Cleanup utils_strpos()
    
    Use strstr() to find the substring, which makes the code simpler and
    is way faster (new version is nearly 2 times faster on my machine).
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5994 ea778897-0a13-0410-b9d1-a72fbfd435f5

 src/utils.c | 39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

commit 7ff6f6b799dbc690451f3060043aab9a9c0718e0
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 3 17:05:57 2011 +0000

    Cleanup utils_remove_ext_from_filename()
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5993 ea778897-0a13-0410-b9d1-a72fbfd435f5

 src/utils.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

commit 386b32122e70c2107d7b8b9437b9af80f8e3630e
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 3 17:05:41 2011 +0000

    Avoid an unnecessary string duplication in utils_str_casecmp()
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5992 ea778897-0a13-0410-b9d1-a72fbfd435f5

 src/utils.c | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

commit 33f471c6f185614c042fd497aace305d7bdb5416
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 3 17:05:25 2011 +0000

    Fix "toggle case" when there is no selection
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5991 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog       | 2 ++
 src/callbacks.c | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

commit abefcc3375c157c3310994592f8a227d8d1861ca
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Oct 3 14:57:02 2011 +0000

    Support visual reordering of keybinding groups without breaking the
    plugin ABI.
    Reorder Project group to follow main menu order.
    Move Focus, Notebook tab groups last as they don't have
    corresponding menu items.
    Use keybindings_get_core_group() for fixed group IDs instead of
    indexing keybinding_groups.
    Make keybindings_lookup_item() only work with a GEANY_KEY_GROUP_
    ID, not an index into keybinding_groups.
    
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5990 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog         |  10 ++++++
 src/build.c       |   2 +-
 src/keybindings.c | 105 +++++++++++++++++++++++++++++++++---------------------
 src/keybindings.h |   6 ++--
 src/prefs.c       |  14 ++++++--
 5 files changed, 92 insertions(+), 45 deletions(-)

commit d6dfedf4a0f73de193cb19e72fab5a164ab78f4b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Mon Oct 3 14:39:01 2011 +0000

    Post-release version bump
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5989 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog        | 7 +++++++
 TODO             | 6 +++---
 configure.ac     | 2 +-
 doc/geany.txt    | 2 +-
 geany.nsi        | 4 ++--
 geany_private.rc | 4 ++--
 src/geany.h      | 2 +-
 win32-config.h   | 2 +-
 wscript          | 2 +-
 9 files changed, 19 insertions(+), 12 deletions(-)

commit 5b220d70a21dfe65bd6c50d80becc4bd74080b33
Merge: b32bd2b 19fe99b
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Oct 3 14:35:11 2011 +0000

     * Merge branches/unstable:
     - tagmanager/php.c:
       Fix parsing keyword-qualified functions strictly, e.g. don't
       parse 'staticfunction' or 'fatfunction'.
     - src/utils.c, src/utils.h, src/editor.c:
       Use GRegex for snippet indentation replacement - fixes wrong
       behaviour with Mac line endings.
     - tagmanager/lregex.c, TODO:
       Use GRegex for CTags instead of POSIX regex - GRegex is more
       powerful. This also fixes a (HTML) performance issue on Windows.
       Geany will now print a debug warning when using the "b" CTags
       regex flag option for non-extended syntax. This is not currently
       used by Geany's parsers.
       Note: GNU regex can't be removed yet as it's still used elsewhere
       by Geany.
     - src/build.c, doc/pluginsignals.c:
       When saving on build, prompt for a filename if necessary.
       Emit the "build-start" signal only if saving succeeds.
     - src/build.c:
       Use #ifdef SYNC_SPAWN instead of G_OS_WIN32 for easier testing with
       glib's asynchronous spawning (which doesn't work on Windows).
     - src/win32.c, src/win32.h, src/dialogs.c:
       Use GTK unsaved file dialog on Windows too because the button names
       should be specific.
    
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5987 ea778897-0a13-0410-b9d1-a72fbfd435f5

commit 19fe99b106f2bca2adacb5bdd3cc0fe094dd1147
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Mon Oct 3 14:14:33 2011 +0000

    Fix parsing keyword-qualified functions strictly, e.g. don't
    parse 'staticfunction' or 'fatfunction'.
    
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5986 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog        | 7 +++++++
 tagmanager/php.c | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

commit b079b19da088242337c882670222707e53decaa9
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Sep 30 14:43:18 2011 +0000

    Use GRegex for CTags instead of POSIX regex - GRegex is more
    powerful. This also fixes a (HTML) performance issue on Windows.
    Geany will now print a debug warning when using the "b" CTags
    regex flag option for non-extended syntax. This is not currently
    used by Geany's parsers.
    Note: GNU regex can't be removed yet as it's still used elsewhere
    by Geany.
    
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5976 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog           |  8 +++++
 TODO                |  2 +-
 tagmanager/lregex.c | 85 ++++++++++++++++++++++++-----------------------------
 3 files changed, 47 insertions(+), 48 deletions(-)

commit 53a0121f695f64a6977f3575ff3e77b159e70cce
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Sep 30 11:11:29 2011 +0000

    Fix accept pointer signedness warning portably (hopefully) using socklen_t.
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5974 ea778897-0a13-0410-b9d1-a72fbfd435f5

 src/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9ca8db635a588a362756fc61fae90b88709fb064
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Fri Sep 30 11:10:22 2011 +0000

    Use GRegex for snippet indentation replacement - fixes wrong
    behaviour with Mac line endings.
    
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5973 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog    |  7 +++++++
 src/editor.c | 61 ++++++++----------------------------------------------------
 src/utils.c  | 39 ++++++++++++++++++++++++++++++++++++++
 src/utils.h  |  3 +++
 4 files changed, 57 insertions(+), 53 deletions(-)

commit c6b38b861e5fa7bbe7f7b57d73a13f116247a5c3
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Thu Sep 29 18:03:36 2011 +0000

    When saving on build, prompt for a filename if necessary.
    Emit the "build-start" signal only if saving succeeds.
    
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5972 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog           |  7 +++++++
 doc/pluginsignals.c |  2 +-
 src/build.c         | 10 ++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

commit a80bab9e3c33fd65e25dcc13573838a021730f70
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 21 15:35:38 2011 +0000

    Use GTK unsaved file dialog on Windows too because the button names
    should be specific.
    
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5941 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog     |  3 +++
 src/dialogs.c |  8 +-------
 src/win32.c   | 27 ---------------------------
 src/win32.h   |  2 --
 4 files changed, 4 insertions(+), 36 deletions(-)

commit b4bdd530dac47ebfd9a02df3a94395ca846db0ec
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 21 13:47:37 2011 +0000

    Use #ifdef SYNC_SPAWN instead of G_OS_WIN32 for easier testing with
    glib's asynchronous spawning (currently doesn't work on Windows).
    
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5940 ea778897-0a13-0410-b9d1-a72fbfd435f5

 ChangeLog   |  7 +++++++
 src/build.c | 25 +++++++++++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)

commit cae3037d20400e91374feb8dfd0d1c74262f6680
Author: Nick Treleaven <nick.treleaven@btinternet.com>
Date:   Wed Sep 21 13:43:23 2011 +0000

    Create unstable branch until 0.21 is released from trunk r5938.
    
    
    git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5939 ea778897-0a13-0410-b9d1-a72fbfd435f5
