@techee commented on this pull request.
@@ -2133,7 +2132,8 @@ static void on_config_file_clicked(GtkWidget *widget, gpointer user_data)
g_file_get_contents(global_file, &global_content, NULL, NULL);
doc = document_new_file(utf8_filename, ft, global_content); - if (global_content) + // comment conf entries so we don't override defaults unnecessarily + if (g_str_has_suffix(file_name, ".conf") || (ft && ft->id == GEANY_FILETYPES_CONF))
As @elextr pointed out, this is in a separate patch and should be removed here.