Branch: refs/heads/master Author: Nick Treleaven nick.treleaven@btinternet.com Committer: Nick Treleaven nick.treleaven@btinternet.com Date: Mon, 19 Mar 2012 16:52:38 Commit: 99e8ed495b442afdc30259a5928b80595cdf2dc6 https://github.com/geany/geany/commit/99e8ed495b442afdc30259a5928b80595cdf2d...

Log Message: ----------- 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.

Modified Paths: -------------- src/keybindings.c

Modified: src/keybindings.c 15 files changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -656,8 +656,23 @@ static void load_kb(GeanyKeyGroup *group, GeanyKeyBinding *kb, gpointer user_dat static void load_user_kb(void) { gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "keybindings.conf", NULL); + gchar *geanyconf = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); GKeyFile *config = g_key_file_new();

+ /* backwards compatibility with Geany 0.21 defaults */ + if (!g_file_test(configfile, G_FILE_TEST_EXISTS) && + g_file_test(geanyconf, G_FILE_TEST_EXISTS)) + { + utils_write_file(configfile, "[Bindings]\n" + "popup_gototagdefinition=\n" + "edit_transposeline=<Control>t\n" + "edit_movelineup=\n" + "edit_movelinedown=\n" + "move_tableft=<Alt>Page_Up\n" + "move_tabright=<Alt>Page_Down\n"); + } + g_free(geanyconf); + /* now load user defined keys */ if (g_key_file_load_from_file(config, configfile, G_KEY_FILE_KEEP_COMMENTS, NULL)) {

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).