# Generated by Makefile. Do not edit.

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 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 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 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 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 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

 0 files changed

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
