Revision: 4971
http://geany.svn.sourceforge.net/geany/?rev=4971&view=rev
Author: statc
Date: 2010-05-31 09:24:21 +0000 (Mon, 31 May 2010)
Log Message:
-----------
Apply patches by Dimitar Zhekov to not save settings edited in the Preferences Dialog to geany.conf on exit.
Modified Paths:
--------------
branches/sm/ChangeLog.sm
branches/sm/src/keyfile.c
branches/sm/src/keyfile.h
branches/sm/src/main.c
branches/sm/src/prefs.c
branches/sm/src/project.c
Modified: branches/sm/ChangeLog.sm
===================================================================
--- branches/sm/ChangeLog.sm 2010-05-31 09:23:56 UTC (rev 4970)
+++ branches/sm/ChangeLog.sm 2010-05-31 09:24:21 UTC (rev 4971)
@@ -3,6 +3,9 @@
* src/main.c:
Fix a bug: files specified in command line did not open together
with default session if the session "referenced" a project.
+ * src/keyfile.c, src/keyfile.h, src/main.c, src/prefs.c, src/project.c:
+ Apply patches by Dimitar Zhekov to not save settings edited in the
+ Preferences Dialog to geany.conf on exit.
2010-02-23 Eugene Arshinov <earshinov(at)gmail(dot)com>
Modified: branches/sm/src/keyfile.c
===================================================================
--- branches/sm/src/keyfile.c 2010-05-31 09:23:56 UTC (rev 4970)
+++ branches/sm/src/keyfile.c 2010-05-31 09:24:21 UTC (rev 4971)
@@ -332,8 +332,14 @@
}
-static void save_dialog_prefs(GKeyFile *config)
+void configuration_save_dialog_prefs(void)
{
+ GKeyFile *config = g_key_file_new();
+ gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL);
+ gchar *data;
+
+ g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL);
+
/* new settings should be added in init_pref_groups() */
settings_action(config, SETTING_WRITE);
@@ -481,6 +487,14 @@
g_key_file_set_string(config, "VTE", "last_dir", vte_info.dir);
}
#endif
+
+ /* write the file */
+ data = g_key_file_to_data(config, NULL, NULL);
+ utils_write_file(configfile, data);
+ g_free(data);
+
+ g_key_file_free(config);
+ g_free(configfile);
}
@@ -546,7 +560,6 @@
/* this signal can be used e.g. to prepare any settings before Stash code reads them below */
g_signal_emit_by_name(geany_object, "save-settings", config);
- save_dialog_prefs(config);
save_ui_prefs(config);
project_save_prefs(config); /* save project filename, etc. */
save_recent_files(config, ui_prefs.recent_queue, "recent_files");
Modified: branches/sm/src/keyfile.h
===================================================================
--- branches/sm/src/keyfile.h 2010-05-31 09:23:56 UTC (rev 4970)
+++ branches/sm/src/keyfile.h 2010-05-31 09:24:21 UTC (rev 4971)
@@ -37,6 +37,8 @@
void configuration_add_pref_group(struct StashGroup *group, gboolean for_prefs_dialog);
+void configuration_save_dialog_prefs(void);
+
void configuration_save(void);
gboolean configuration_load(void);
Modified: branches/sm/src/main.c
===================================================================
--- branches/sm/src/main.c 2010-05-31 09:23:56 UTC (rev 4970)
+++ branches/sm/src/main.c 2010-05-31 09:24:21 UTC (rev 4971)
@@ -1196,7 +1196,8 @@
if (interactive && !document_account_for_unsaved())
return FALSE;
- configuration_save();
+ if (!cl_options.new_instance)
+ configuration_save();
if (app->project)
project_save(FALSE);
Modified: branches/sm/src/prefs.c
===================================================================
--- branches/sm/src/prefs.c 2010-05-31 09:23:56 UTC (rev 4970)
+++ branches/sm/src/prefs.c 2010-05-31 09:24:21 UTC (rev 4971)
@@ -1182,7 +1182,7 @@
ui_update_view_editor_menu_items();
/* store all settings */
- configuration_save();
+ configuration_save_dialog_prefs();
}
if (response != GTK_RESPONSE_APPLY)
Modified: branches/sm/src/project.c
===================================================================
--- branches/sm/src/project.c 2010-05-31 09:23:56 UTC (rev 4970)
+++ branches/sm/src/project.c 2010-05-31 09:24:21 UTC (rev 4971)
@@ -1006,7 +1006,8 @@
if (project_prefs.project_session)
{
/* save current (non-project) session (it could has been changed since program startup) */
- configuration_save_default_session();
+ if (!cl_options.new_instance)
+ configuration_save_default_session();
/* now close all open files */
document_close_all(FALSE);
/* read session files so they can be opened with configuration_open_files() */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4970
http://geany.svn.sourceforge.net/geany/?rev=4970&view=rev
Author: statc
Date: 2010-05-31 09:23:56 +0000 (Mon, 31 May 2010)
Log Message:
-----------
Fix a bug: files specified in command line did not open together with default session if the session "referenced" a project.
Modified Paths:
--------------
branches/sm/ChangeLog.sm
branches/sm/src/main.c
Modified: branches/sm/ChangeLog.sm
===================================================================
--- branches/sm/ChangeLog.sm 2010-05-31 09:23:33 UTC (rev 4969)
+++ branches/sm/ChangeLog.sm 2010-05-31 09:23:56 UTC (rev 4970)
@@ -1,3 +1,10 @@
+2010-05-30 Eugene Arshinov <earshinov(at)gmail(dot)com>
+
+ * src/main.c:
+ Fix a bug: files specified in command line did not open together
+ with default session if the session "referenced" a project.
+
+
2010-02-23 Eugene Arshinov <earshinov(at)gmail(dot)com>
* src/main.c:
Modified: branches/sm/src/main.c
===================================================================
--- branches/sm/src/main.c 2010-05-31 09:23:33 UTC (rev 4969)
+++ branches/sm/src/main.c 2010-05-31 09:23:56 UTC (rev 4970)
@@ -826,12 +826,10 @@
/* open files from command line */
-static gboolean open_cl_files(gint argc, gchar **argv)
+static void open_cl_files(gint argc, gchar **argv)
{
gint i;
- if (argc <= 1) return FALSE;
-
for (i = 1; i < argc; i++)
{
gchar *filename = main_get_argv_filename(argv[i]);
@@ -849,7 +847,6 @@
}
g_free(filename);
}
- return TRUE;
}
@@ -927,11 +924,10 @@
load_session = TRUE;
}
- any_files_opened = open_cl_files(argc, argv);
- if (any_files_opened && !prefs.load_session_even_if_any_files_opened)
+ if (!cl_options.load_session)
load_default_session = FALSE;
- if (!cl_options.load_session)
+ if (argc > 1 && !prefs.load_session_even_if_any_files_opened)
load_default_session = FALSE;
if (load_default_session)
@@ -945,12 +941,14 @@
{
/* load files into tabs, as they are found in the session_files variable */
configuration_open_files();
+ }
- if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 0)
- {
- ui_update_popup_copy_items(NULL);
- ui_update_popup_reundo_items(NULL);
- }
+ open_cl_files(argc, argv);
+
+ if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 0)
+ {
+ ui_update_popup_copy_items(NULL);
+ ui_update_popup_reundo_items(NULL);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4969
http://geany.svn.sourceforge.net/geany/?rev=4969&view=rev
Author: statc
Date: 2010-05-31 09:23:33 +0000 (Mon, 31 May 2010)
Log Message:
-----------
Add g_assert() to ensure that `optentries' and `optentries_aux' are of the same size.
Modified Paths:
--------------
branches/sm/src/main.c
Modified: branches/sm/src/main.c
===================================================================
--- branches/sm/src/main.c 2010-05-31 09:23:04 UTC (rev 4968)
+++ branches/sm/src/main.c 2010-05-31 09:23:33 UTC (rev 4969)
@@ -125,9 +125,9 @@
* NOTE: Currently optentries of type G_OPTION_ARG_CALLBACK are not supported by
* X session management support implementation.
*/
-/* in alphabetical order of short options */
GOptionEntry optentries[] =
{
+ /* in alphabetical order of short options */
{ "column", 0, 0, G_OPTION_ARG_INT, &cl_options.goto_column, N_("Set initial column number for the first opened file (useful in conjunction with --line)"), NULL },
{ "config", 'c', 0, G_OPTION_ARG_FILENAME, &alternate_config, N_("Use an alternate configuration directory"), NULL },
{ "ft-names", 0, 0, G_OPTION_ARG_NONE, &ft_names, N_("Print internal filetype names"), NULL },
@@ -980,6 +980,9 @@
log_handlers_init();
+ g_assert_cmpint(sizeof(optentries)/sizeof(optentries[0]) - 1 /* null */, ==,
+ sizeof(optentries_aux)/sizeof(optentries_aux[0]));
+
app = g_new0(GeanyApp, 1);
memset(&main_status, 0, sizeof(GeanyStatus));
memset(&prefs, 0, sizeof(GeanyPrefs));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4968
http://geany.svn.sourceforge.net/geany/?rev=4968&view=rev
Author: statc
Date: 2010-05-31 09:23:04 +0000 (Mon, 31 May 2010)
Log Message:
-----------
Merge trunk (revisions 4485..4960)
Modified Paths:
--------------
branches/sm/ChangeLog
branches/sm/HACKING
branches/sm/Makefile.am
branches/sm/NEWS
branches/sm/README
branches/sm/README.I18N
branches/sm/README.Packagers
branches/sm/THANKS
branches/sm/TODO
branches/sm/autogen.sh
branches/sm/data/filetypes.common
branches/sm/data/filetypes.java
branches/sm/data/filetypes.javascript
branches/sm/data/filetypes.perl
branches/sm/data/filetypes.python
branches/sm/data/filetypes.r
branches/sm/data/filetypes.restructuredtext
branches/sm/data/snippets.conf
branches/sm/doc/Doxyfile.in
branches/sm/doc/Makefile.am
branches/sm/doc/geany.1.in
branches/sm/doc/geany.html
branches/sm/doc/geany.txt
branches/sm/doc/plugins.dox
branches/sm/doc/pluginsymbols.c
branches/sm/geany.desktop.in
branches/sm/geany.glade
branches/sm/geany.nsi
branches/sm/geany.pc.in
branches/sm/geany.spec.in
branches/sm/geany_private.rc
branches/sm/icons/Makefile.am
branches/sm/plugins/Makefile.am
branches/sm/plugins/classbuilder.c
branches/sm/plugins/demoplugin.c
branches/sm/plugins/export.c
branches/sm/plugins/filebrowser.c
branches/sm/plugins/geanyfunctions.h
branches/sm/plugins/geanyplugin.h
branches/sm/plugins/genapi.py
branches/sm/plugins/htmlchars.c
branches/sm/plugins/makefile.win32
branches/sm/plugins/saveactions.c
branches/sm/plugins/splitwindow.c
branches/sm/po/ChangeLog
branches/sm/po/be.po
branches/sm/po/bg.po
branches/sm/po/ca.po
branches/sm/po/cs.po
branches/sm/po/de.po
branches/sm/po/el.po
branches/sm/po/en_GB.po
branches/sm/po/es.po
branches/sm/po/fi.po
branches/sm/po/fr.po
branches/sm/po/geany.pot
branches/sm/po/gl.po
branches/sm/po/hu.po
branches/sm/po/it.po
branches/sm/po/ja.po
branches/sm/po/ko.po
branches/sm/po/lb.po
branches/sm/po/nl.po
branches/sm/po/pl.po
branches/sm/po/pt.po
branches/sm/po/pt_BR.po
branches/sm/po/ro.po
branches/sm/po/ru.po
branches/sm/po/sl.po
branches/sm/po/sv.po
branches/sm/po/tr.po
branches/sm/po/uk.po
branches/sm/po/vi.po
branches/sm/po/zh_CN.po
branches/sm/po/zh_TW.po
branches/sm/scintilla/AutoComplete.cxx
branches/sm/scintilla/AutoComplete.h
branches/sm/scintilla/CallTip.cxx
branches/sm/scintilla/CallTip.h
branches/sm/scintilla/CellBuffer.cxx
branches/sm/scintilla/CellBuffer.h
branches/sm/scintilla/CharClassify.cxx
branches/sm/scintilla/CharClassify.h
branches/sm/scintilla/Converter.h
branches/sm/scintilla/Decoration.h
branches/sm/scintilla/Document.cxx
branches/sm/scintilla/Document.h
branches/sm/scintilla/DocumentAccessor.h
branches/sm/scintilla/Editor.cxx
branches/sm/scintilla/Editor.h
branches/sm/scintilla/ExternalLexer.cxx
branches/sm/scintilla/ExternalLexer.h
branches/sm/scintilla/KeyWords.cxx
branches/sm/scintilla/LexAda.cxx
branches/sm/scintilla/LexCaml.cxx
branches/sm/scintilla/LexCmake.cxx
branches/sm/scintilla/LexHTML.cxx
branches/sm/scintilla/LexHaskell.cxx
branches/sm/scintilla/LexMarkdown.cxx
branches/sm/scintilla/LexNsis.cxx
branches/sm/scintilla/LexOthers.cxx
branches/sm/scintilla/LexPython.cxx
branches/sm/scintilla/LexR.cxx
branches/sm/scintilla/LexSQL.cxx
branches/sm/scintilla/Makefile.am
branches/sm/scintilla/PerLine.cxx
branches/sm/scintilla/PlatGTK.cxx
branches/sm/scintilla/PositionCache.cxx
branches/sm/scintilla/PositionCache.h
branches/sm/scintilla/PropSet.cxx
branches/sm/scintilla/RESearch.cxx
branches/sm/scintilla/SVector.h
branches/sm/scintilla/ScintillaBase.cxx
branches/sm/scintilla/ScintillaBase.h
branches/sm/scintilla/ScintillaGTK.cxx
branches/sm/scintilla/Style.cxx
branches/sm/scintilla/Style.h
branches/sm/scintilla/StyleContext.h
branches/sm/scintilla/UniConversion.cxx
branches/sm/scintilla/UniConversion.h
branches/sm/scintilla/ViewStyle.cxx
branches/sm/scintilla/ViewStyle.h
branches/sm/scintilla/XPM.h
branches/sm/scintilla/include/KeyWords.h
branches/sm/scintilla/include/Platform.h
branches/sm/scintilla/include/PropSet.h
branches/sm/scintilla/include/SciLexer.h
branches/sm/scintilla/include/Scintilla.h
branches/sm/scintilla/include/Scintilla.iface
branches/sm/scintilla/include/ScintillaWidget.h
branches/sm/scintilla/include/WindowAccessor.h
branches/sm/scintilla/makefile.win32
branches/sm/scintilla/scintilla_changes.patch
branches/sm/scripts/changelist.pl
branches/sm/scripts/create_py_tags.py
branches/sm/scripts/fix-alignment.pl
branches/sm/src/Makefile.am
branches/sm/src/about.c
branches/sm/src/about.h
branches/sm/src/build.c
branches/sm/src/build.h
branches/sm/src/callbacks.c
branches/sm/src/callbacks.h
branches/sm/src/dialogs.c
branches/sm/src/dialogs.h
branches/sm/src/document.c
branches/sm/src/document.h
branches/sm/src/documentprivate.h
branches/sm/src/editor.c
branches/sm/src/editor.h
branches/sm/src/encodings.c
branches/sm/src/encodings.h
branches/sm/src/filetypes.c
branches/sm/src/filetypes.h
branches/sm/src/gb.c
branches/sm/src/geany.h
branches/sm/src/geanyentryaction.c
branches/sm/src/geanyentryaction.h
branches/sm/src/geanymenubuttonaction.c
branches/sm/src/geanymenubuttonaction.h
branches/sm/src/geanyobject.c
branches/sm/src/geanyobject.h
branches/sm/src/geanywraplabel.c
branches/sm/src/geanywraplabel.h
branches/sm/src/highlighting.c
branches/sm/src/highlighting.h
branches/sm/src/images.c
branches/sm/src/interface.c
branches/sm/src/keybindings.c
branches/sm/src/keybindings.h
branches/sm/src/keyfile.c
branches/sm/src/keyfile.h
branches/sm/src/log.c
branches/sm/src/log.h
branches/sm/src/main.c
branches/sm/src/main.h
branches/sm/src/makefile.win32
branches/sm/src/msgwindow.c
branches/sm/src/msgwindow.h
branches/sm/src/navqueue.c
branches/sm/src/navqueue.h
branches/sm/src/notebook.c
branches/sm/src/notebook.h
branches/sm/src/plugindata.h
branches/sm/src/pluginprivate.h
branches/sm/src/plugins.c
branches/sm/src/plugins.h
branches/sm/src/pluginutils.c
branches/sm/src/pluginutils.h
branches/sm/src/prefix.c
branches/sm/src/prefs.c
branches/sm/src/prefs.h
branches/sm/src/printing.c
branches/sm/src/printing.h
branches/sm/src/project.c
branches/sm/src/project.h
branches/sm/src/projectprivate.h
branches/sm/src/sciwrappers.c
branches/sm/src/sciwrappers.h
branches/sm/src/search.c
branches/sm/src/search.h
branches/sm/src/sidebar.c
branches/sm/src/sidebar.h
branches/sm/src/socket.c
branches/sm/src/socket.h
branches/sm/src/stash.c
branches/sm/src/stash.h
branches/sm/src/support.h
branches/sm/src/symbols.c
branches/sm/src/symbols.h
branches/sm/src/templates.c
branches/sm/src/templates.h
branches/sm/src/toolbar.c
branches/sm/src/toolbar.h
branches/sm/src/tools.c
branches/sm/src/tools.h
branches/sm/src/ui_utils.c
branches/sm/src/ui_utils.h
branches/sm/src/utils.c
branches/sm/src/utils.h
branches/sm/src/vte.c
branches/sm/src/vte.h
branches/sm/src/win32.c
branches/sm/src/win32.h
branches/sm/tagmanager/Makefile.am
branches/sm/tagmanager/ctags.c
branches/sm/tagmanager/entry.c
branches/sm/tagmanager/entry.h
branches/sm/tagmanager/include/tm_source_file.h
branches/sm/tagmanager/include/tm_tag.h
branches/sm/tagmanager/makefile.win32
branches/sm/tagmanager/nestlevel.c
branches/sm/tagmanager/nestlevel.h
branches/sm/tagmanager/nsis.c
branches/sm/tagmanager/parse.c
branches/sm/tagmanager/parse.h
branches/sm/tagmanager/parsers.h
branches/sm/tagmanager/pascal.c
branches/sm/tagmanager/php.c
branches/sm/tagmanager/python.c
branches/sm/tagmanager/rest.c
branches/sm/tagmanager/tm_source_file.c
branches/sm/tagmanager/txt2tags.c
branches/sm/tagmanager/vstring.c
branches/sm/wscript
Added Paths:
-----------
branches/sm/ChangeLog.sm
branches/sm/configure.ac
branches/sm/doc/stash-example.c
branches/sm/po/ast.po
branches/sm/scintilla/PropSetSimple.h
branches/sm/scintilla/Selection.cxx
branches/sm/scintilla/Selection.h
branches/sm/scripts/plugin_test.c
branches/sm/tagmanager/r.c
Removed Paths:
-------------
branches/sm/configure.in
branches/sm/data/latex.tags
branches/sm/plugins/pluginmacros.h
branches/sm/po/LINGUAS
Modified: branches/sm/ChangeLog
===================================================================
--- branches/sm/ChangeLog 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/ChangeLog 2010-05-31 09:23:04 UTC (rev 4968)
@@ -1,73 +1,1197 @@
-2010-02-23 Eugene Arshinov <earshinov(at)gmail(dot)com>
+2010-05-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/main.c:
- Change the behaviour of the setting controlled by "Preferences >
- General > Misc > Use project-based session files" check button. Now
- if you open a project via command-line, files from the default
- session are not automatically appended to it.
+ Print locale information in debug output.
+ * src/build.c:
+ Fix some labels which were marked as translatable but were not
+ handled properly by gettext().
+ Add a missing const.
+ * src/msgwindow.c:
+ Try to convert text into UTF-8 before adding it to the Compiler and
+ Messages Window (closes #3007919).
-2010-02-22 Eugene Arshinov <earshinov(at)gmail(dot)com>
+2010-05-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * src/main.c, src/main.h, src/socket.c:
- Use a separate command-line option to specify a project to be opened.
- * src/sm.c:
- Remember opened project across restarts.
- * src/socket.c:
- Fix opening project in already running instance (via socket).
+ * plugins/Makefile.am, src/Makefile.am, tagmanager/Makefile.am,
+ wscript:
+ Pass G_LOG_DOMAIN to source files for better logging.
-2010-02-15 Eugene Arshinov <earshinov(at)gmail(dot)com>
+2010-05-24 Frank Lanitz <frank(a)frank.uvena.de>
- * src/project.c, src/sm.c, src/utils.c, src/utils.h:
- Use absolute paths to project files. Particularly, paths to recent
- projects' files are now stored as absolute.
+ * THANKS, src/about.c:
+ Update of translation credits to reflect a change on Spanish
+ translation team better.
+
+
+2010-05-23 Lex Trotman <elextr.at.gmail.dot.com>
+
+ * src/build.c:
+ Fix infinite loop reading build command output
+
+
+2010-05-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/msgwindow.c:
+ Fix duplicate accelerators for Clear and Copy in the
+ Messages Window popup menu.
+ * src/pluginutils.c:
+ Expand child widgets in the Plugin Preferences dialog
+ (patch by Colomban Wendling, thanks).
+
+
+2010-05-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/ui_utils.c:
+ Fix Undo/Redo button state after the last document has been closed.
+ Add Print and Replace toolbar items to the list of document
+ sensitive widgets.
+ * src/toolbar.c:
+ Fix crash when the toolbar is reloaded without any open documents.
+ * src/build.c:
+ Fix Run toolbar item sensitivity after the last document has been
+ closed.
+ * plugins/classbuilder.c:
+ Remove two unnecessary g_strdups().
+ * doc/geany.html, doc/geany.txt, src/keyfile.c, src/msgwindow.c,
+ src/plugindata.h, src/ui_utils.h:
+ Add hidden preference to disable automatic scrolling in the
+ Compiler tab (closes #3004714).
+
+
+2010-05-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * plugins/classbuilder.c:
+ Fix a memory leak. (patch by Daniel Marjamaki, thanks)
+
+
+2010-05-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/prefs.c, src/project.c:
+ win32.h can be included unconditionally.
+ * src/sidebar.c:
+ Fix project base_path detection if the path has a trailing slash.
+ * src/document.c, src/editor.c, src/project.c:
+ Small improvements to speed up quit process with many open documents.
+ Avoid calling gtk_notebook_remove_page() on exit as it takes
+ a lot of time.
+ * src/geanymenubuttonaction.c:
+ Explicitly check for the type when iterating the action's proxies.
+ For some reason on Windows, a GtkImageMenuItem proxy is created.
+ * geany.pc.in, wscript, plugins/Makefile.am, src/Makefile.am,
+ src/plugindata.h, scintilla/*, scintilla/include/*:
+ Update Scintilla to version 2.11.
+ * plugins/Makefile.am, plugins/makefile.win32, src/Makefile.am,
+ src/makefile.win32:
+ Add new GTK define also for Mingw cross compilation and
+ makefile.win32 based Windows builds.
+ * plugins/filebrowser.c:
+ Implement reading and evaluating hidden file attribute on Windows.
+ Fix broken "Go Up" if the current path ends with a slash.
+ * THANKS, src/about.c, src/prefix.c:
+ Replace free() by g_free() (patch by Daniel Marjamaki, thanks).
+ * geany.glade, src/document.h, src/interface.c, src/keyfile.c,
+ src/main.c, src/notebook.c, src/prefs.c:
+ Add preference to add new document tabs beside the current one
+ (patch by Colomban Wendling, thanks).
+ * geany.glade, src/dialogs.c, src/geany.h, src/interface.c,
+ src/keyfile.c, src/prefs.c, src/ui_utils.h:
+ Add a preference for choosing between GTK and native
+ File Open/Save dialogs (only available on Windows).
+ * doc/geany.html, doc/geany.txt:
+ Update documentation.
+
+
+2010-05-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/win32.c:
+ Sort file filters for the native Windows file open dialog by name.
+ Don't use file filters for the native Windows Save As dialog.
+ * src/dialogs.c, src/win32.c, src/win32.h:
+ Remove old code.
+ Pass and use also parent and title arguments to
+ win32_show_document_open_dialog().
+ * src/dialogs.c:
+ Call handle_save_as() only when the Save As dialog was not cancelled.
+ * src/toolbar.c:
+ Improve adding/removing of the special separator between menubar and
+ toolbar when the toolbar is appended to the menubar.
+ * src/toolbar.c, src/templates.c:
+ Explicitly disconnect menus from GeanyMenuButtonAction on quit to
+ not trigger updating the menus on each item removal.
+
+
+2010-05-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * src/support.h:
+ Replace one non breaking space by normal space. Patch by
+ Daniel Marjamak.
+
+
+2010-05-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * plugins/classbuilder.c:
+ Don't make the 'Create Class' menu item document-sensitive
+ (patch by Colomban Wendling, thanks).
+ Add namespace support for GTK+ classes.
+ Add GET_CLASS() macro for GTK+ classes.
+ Add typedef of the private structure in the header file instead
+ of declaring it
+ (all the above from a patch by Colomban Wendling, thanks).
+ * src/highlighting.c:
+ Set common default "fold.comment" to 0 to disable it. This can
+ be overridden if desired.
+ * src/sidebar.c:
+ Improve sorting of document list items
+ (patch by Colomban Wendling, thanks).
* src/main.c:
- Load files from command line even if a project is being opened.
- * geany.glade, src/interface.c, src/keyfile.c, src/main.c,
- src/prefs.c, src/prefs.h:
- Add a GUI preference to control whether the default session is
- loaded if any files are opened via command-line (fix #2838686).
- Location of the preference: General > Startup tab > Startup frame.
+ Remove unnecessary textdomain() call.
-2010-02-07 Eugene Arshinov <earshinov(at)gmail(dot)com>
+2010-05-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * src/search.c:
+ Fix search_find_text not returning -1 when match is out of range.
+ This fixes invalid memory reads and wrong template filename
+ wildcard replacement.
+ * src/search.c, src/document.c:
+ Only replace template filename matching start of word on saving.
+ * plugins/filebrowser.c:
+ Add 'Refresh' popup menu item (part of geany-plugins #2999858).
+ * src/build.c, src/build.h, src/project.c:
+ Make some ugly build.h global variables static.
+ * src/build.c, src/build.h, src/project.c:
+ Add Build prefix for TableFields, TableData.
+
+
+2010-05-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/dialogs.c:
+ Fix Cancel on Goto Line dialog (patch by Dimitar Zhekov, thanks).
+ * src/dialogs.c, src/win32.c, src/win32.h:
+ (Re-)Implement a (still basic) native Windows Save As dialog when
+ compiled with GEANY_USE_WIN32_DIALOG.
+
+
+2010-05-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * THANKS, src/about.c, plugins/classbuilder.c:
+ Add support for creating PHP classes (patch by Ondrej Donek, thanks).
+ * src/ui_utils.h, src/ui_utils.c:
+ Add public, generic callback ui_editable_insert_text_callback()
+ to restrict GtkEntry text inputs to +/- and numeric values only.
+ * src/dialogs.h, src/dialogs.c:
+ Add special variant dialogs_show_input_goto_line() to use a normal
+ GtkEntry together with dialogs_show_input_goto_line() for text input.
+ * src/geanyentryaction.c, src/callbacks.c, src/editor.c, src/editor.h:
+ Allow '+<number' and '-<number>' as values for Goto Line inputs
+ to jump relative to the current line (closes #2997238).
+
+
+2010-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/highlighting.c:
+ Apply foreground and background colours of the folding margin
+ style properly (closes #2998347).
+ * src/utils.c:
+ Don't auto-close short XML tags (closes #2994852).
+ * THANKS, src/about.c, src/keybindings.c:
+ Improve jumping to matching braces by consistently position the
+ cursor before or after the matching brace dependent where it
+ was before (patch by Dimitar Zhekov, thanks).
* src/main.c:
- Rewrite load_startup_files() function. Fix the bug with opening a
- project while specifying -s command line option. E.g.,
- `geany -s project.geany' now correctly loads the project instead of
- showing a blank document and clearing the project silently.
+ Fix crash when generating global tags files (patch by Colomban
+ Wendling, thanks).
-2010-01-24 Eugene Arshinov <earshinov(at)gmail(dot)com>
+2010-05-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
- * doc/Doxyfile.in, src/Makefile.am, src/main.c, src/makefile.win32,
- src/sm.c, src/sm.h, wscript:
- Extract libSM-related code into separate sm.{c,h} files, make some
- refactoring, and write code comments for Doxygen.
- * src/keyfile.c, src/main.c:
- Make --new-instance command line option imply --no-session.
- * src/sm.c:
- Handle --no-session command line option properly.
- * src/main.c, src/main.h, src/sm.c, src/utils.c, src/utils.h:
- Add "reverse parser" of GOptionEntry. Handle all command-line options.
+ * src/templates.c:
+ Avoid connecting signals more than once.
-2009-12-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+2010-05-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * src/Makefile.am, configure.in, wscript:
- Detect libSM X session management library (patch by Eugene Arshinov,
- thanks).
- * src/project.c, src/project.h, src/callbacks.c, src/document.c,
- src/document.h, src/main.c, src/main.h:
- Refactor quitting code into main_save() and main_finalize() (patch by
- Eugene Arshinov, thanks).
+ * wscript:
+ Don't ignore the 'intltool' check on non-Windows system, instead
+ raise a configure error.
+
+
+2010-05-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/build.c:
+ Fix marking some strings as translatable (cannot be done in the
+ ASSIGNIF macro).
+ * src/templates.c, doc/geany.txt, doc/geany.html:
+ Reload templates if saving a document in the templates config dir.
+
+
+2010-05-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/search.c, src/search.h, src/document.c, doc/geany.txt,
+ doc/geany.html:
+ Fix replacing {filename} template wildcard for custom file
+ templates with non-default file extension.
+ Add search_find_text() for POSIX regex searches.
+ * src/templates.c, doc/geany.txt, doc/geany.html:
+ Add {project}, {description} template wildcards (#2954737).
+ * doc/geany.txt, doc/geany.html:
+ Divide template wildcards into groups.
+ * src/plugindata.h, src/plugins.c, src/symbols.c,
+ plugins/geanyfunctions.h:
+ Add symbols_get_context_separator() to plugin API (patch by Colomban
+ Wendling, thanks).
+
+
+2010-05-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/keybindings.c:
+ Fix setting wrong accelerator for 2 Edit->Commands items (patch by
+ Anonymous, thanks; #2995593).
+ * src/sciwrappers.c, src/plugindata.h, src/plugins.c,
+ plugins/geanyfunctions.h:
+ Add sci_set_line_indentation(), sci_get_line_indentation() to API
+ (patch by Colomban Wendling, thanks).
+
+
+2010-04-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+ Warn user if hidden hard tab width setting is not 8.
+
+
+2010-04-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/interface.c, src/project.c, src/keyfile.c, geany.glade,
+ doc/geany.txt, doc/geany.html:
+ Hide 'Tabs and Spaces: Hard tab width' preference - it should
+ always be 8. (Hidden setting kept in case users have modified it).
+
+
+2010-04-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * doc/geany.txt, doc/geany.html:
+ Add Folding section link to filetypes.common custom settings.
+
+
+2010-04-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/callbacks.c:
+ When switching documents, don't call document_set_text_changed()
+ as this does much more than necessary. Instead call the necessary
+ UI update functions explicitly.
+
+
+2010-04-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * tagmanager/vstring.c:
+ Fix invalid memory read (patch by Colomban Wendling, thanks).
+
+
+2010-04-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/build.c, src/dialogs.c, src/msgwindow.c, src/ui_utils.c:
+ Replace g_vsnprintf() by g_strdup_vprintf() to avoid truncated
+ strings in case of reaching the buffer size limit (part of #2979697).
+ * src/win32.c:
+ Change the limit for the command line length when executing commands
+ to a maximum of 32768 characters (closes #2979697).
+ Fix broken opening URLs e.g. when using the 'builtin' Run command.
+ * tagmanager/ctags.c:
+ Change eFree() to simply ignore NULL pointers instead of asserting.
* src/main.c:
- Restart Geany and restore some state when logging in (patch by
- Eugene Arshinov, thanks).
+ Remove malloc() fallback since we completely rely on g_malloc()
+ nowadays.
+ * plugins/export.c, plugins/filebrowser.c, plugins/htmlchars.c,
+ plugins/saveactions.c:
+ Make string arguments const where appropriate (patch by
+ Colomban Wendling, thanks).
+ * src/build.c, src/build.h, src/callbacks.c, src/editor.c,
+ src/encodings.c, src/encodings.h, src/gb.c, src/geanyentryaction.c,
+ src/geanymenubuttonaction.c, src/geanyobject.c, src/geanywraplabel.c,
+ src/keyfile.c, src/project.c, src/sidebar.c, src/socket.c,
+ src/symbols.c, src/templates.c, src/ui_utils.c:
+ Make string arguments const where appropriate (patch by
+ Colomban Wendling, thanks).
+2010-04-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/plugindata.h, src/pluginutils.c, src/pluginutils.h, THANKS:
+ Make plugin_signal_connect() string argument const (patch by
+ Colomban Wendling, thanks).
+ * src/keybindings.c, src/keybindings.h, src/plugindata.h:
+ Constify some more string pointers in the API (patch by
+ Colomban Wendling, thanks).
+ * src/templates.c, src/templates.h, src/editor.c, doc/geany.txt,
+ doc/geany.html:
+ Support {pc} wildcard in snippets to escape percent char.
+ * src/editor.c:
+ Recalculate line margin width when zooming (fixes #2990553).
+ * src/highlighting.c, doc/geany.txt, doc/geany.html,
+ data/filetypes.common:
+ Support more folding icon styles: arrows, +/- and no lines
+ (#2935059).
+
+
+2010-04-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/socket.c:
+ Fix Windows build by properly guarding Unix-only code.
+
+
+2010-04-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/templates.c, doc/geany.txt, doc/geany.html:
+ Support {ob} and {cb} in fileheader and file templates; they are
+ replaced last with { and }. This allows 'escaping' of wildcard
+ strings.
+ * src/editor.c, plugins/classbuilder.c:
+ Fix Class Builder plugin to use correct indentation instead of
+ always tabs.
+ Make editor_insert_text_block() only replace leading tabs for the
+ 'Tabs' indent type; also group edits for undo.
+ * src/templates.c, src/templates.h, src/editor.c, doc/geany.txt,
+ doc/geany.html:
+ Support {ob} and {cb} wildcards for snippets too (fixes #2937008).
+
+
+2010-04-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * tagmanager/pascal.c:
+ More fixes to prevent possible crashes by trying to free NULL
+ pointers.
+ * src/sidebar.c:
+ Automatically show and hide the sidebar notebook tabs according
+ to the amount of visible pages (patch by Adrian Dimitrov, thanks).
+ * src/editor.c:
+ Add a static global variable to monitor autocompletion mode in order
+ to prevent cancellation of the struct/class (C/C++) auto completion
+ list (patch by Thomas Martitz, thanks).
+ * src/socket.c:
+ When starting and trying to access the Unix Domain socket of a
+ potentially running instance, first compare file ownership with the
+ user id of the running process to prevent accessing a wrong socket
+ file (part of #2985463, this might not yet be the final solution).
+
+
+2010-04-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * plugins/filebrowser.c:
+ Synchronize popup menu and plugin preferences dialog 'Show Hidden
+ Files' option (fixes #2989288).
+
+
+2010-04-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * tagmanager/entry.c, tagmanager/entry.h,
+ tagmanager/include/tm_source_file.h, tagmanager/parse.c,
+ tagmanager/parse.h, tagmanager/tm_source_file.c:
+ Add tm_source_file_set_tag_arglist() to manually set the argument
+ list of a tag.
+ * tagmanager/python.c:
+ Use tm_source_file_set_tag_arglist() to set the argument list
+ field of Python class tags to the argument list of their
+ __init__() methods.
+ Backport a fix from CTags SVN to prevent possible crashes by trying
+ to free NULL pointers.
+
+
+2010-04-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * tagmanager/txt2tags.c:
+ Remove duplicate code from Txt2Tags parser.
+ Remove the title control characters ('=') when parsing titles.
+ Also parse numbered titles (closes #2984703).
+ * doc/geany.html, doc/geany.txt, src/keybindings.c, src/keybindings.h,
+ src/plugindata.h:
+ Add 'Remove Markers' and 'Remove Error Indicators' keybindings.
+ Add missing documentation for 'Reset Zoom' keybinding.
+ * tagmanager/php.c:
+ Another attempt to fix the PHP parser regexp for parsing functions.
+ Fix wrong parsing of function arguments when those contain nested
+ brackets (as reported by Harold Aling).
+ * src/notebook.c:
+ Fix Ctrl-Click on notebook tab if Numpad is active.
+
+
+2010-04-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * geany.glade, doc/geany.txt, plugins/geanyfunctions.h,
+ src/callbacks.c, src/interface.c, src/keyfile.c, src/plugindata.h,
+ src/plugins.c, src/prefs.c, src/toolbar.c, src/toolbar.h,
+ src/ui_utils.c, src/ui_utils.h:
+ Add option 'System Default' for toolbar icon style and size to
+ use the GTK default value.
+ * geany.glade, src/callbacks.c, src/callbacks.h, src/interface.c,
+ src/toolbar.c, src/toolbar.h:
+ Shorten the toolbar popup menu, only provide items for Toolbar
+ Preferences and to Hide the toolbar.
+ * src/toolbar.c:
+ Instantly update the toolbar icon size and style when the
+ corresponding global GTK settings are changed.
+ * doc/geany.1.in, doc/geany.txt, src/main.c, src/main.h,
+ src/plugindata.h, src/socket.c:
+ Add new command line option --list-documents to return a list
+ of currently opened documents (closes #2979933).
+
+
+2010-04-09 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * plugins/htmlchars.c:
+ Make plugin remember whether replacement of special characters was
+ activated even after restart of Geany or reloading of plugin.
+
+
+2010-04-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+ Fix inserting snippets with an indent when using Mac CR line
+ endings.
+ * src/callbacks.c:
+ Update status bar after using Document->Set Line Endings.
+ * src/editor.c:
+ Improve API docs for editor_insert_text_block().
+
+
+2010-04-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+ Refactor snippets_complete_constructs().
+ Remove an unnecessary TODO.
+ * src/editor.c:
+ Fix indenting a snippet when there is whitespace after the
+ snippet key name.
+
+
+2010-04-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * doc/geany.txt, doc/geany.html:
+ Improve wording.
+ * src/build.c, src/msgwindow.c:
+ Fix disabled compiler message tracking if using indicators to
+ show build errors is disabled (closes #2982834).
+
+
+2010-04-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * scintilla/Editor.cxx:
+ Backport fix from Scintilla CVS to fix using SCI_GETSELECTIONSTART
+ and SCI_GETSELECTIONEND with rectangular selections. This fixes
+ replacing in a rectangular selection.
+
+
+2010-04-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/filetypes.c:
+ Re-detect any document filetypes set to None after reloading
+ filetype extensions (closes #2979661).
+ * src/editor.c:
+ Fix showing '...' item last instead of first for document word
+ completion.
+
+
+2010-04-05 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * data/filetypes.perl:
+ Adjust Perl Compile command to use the -c command
+ line option to perform a syntax check instead of using the
+ deprecated ByteCompile module.
+ Add error_regex to parse error messages and warnings when performing
+ syntax checks on Perl files.
+
+
+2010-04-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/keybindings.c, src/keybindings.h, doc/plugins.dox:
+ Add API docs for keybinding enums.
+ * src/notebook.c, doc/geany.txt, doc/geany.html:
+ Make Ctrl-click on any notebook tab switch to the last used
+ document.
+
+
+2010-04-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/geanymenubuttonaction.c, src/geanymenubuttonaction.h,
+ src/geanyentryaction.c, src/geanyentryaction.h,
+ src/geanywraplabel.c:
+ Cache G_TYPE_INSTANCE_GET_PRIVATE() result when initializing an
+ object for efficiency.
+
+
+2010-03-31 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * plugins/classbuilder.c:
+ Beep if the user hasn't entered a class name on pressing OK.
+ * src/search.c:
+ Fix replacing '^' regex.
+ * src/plugindata.h, src/stash.c, src/stash.h, src/plugins.c,
+ plugins/geanyfunctions.h:
+ Add Stash widget functions to API.
+ * configure.ac:
+ Revert commit to use AC_PATH_PROG instead of 'which' (fixes
+ #2973764).
+
+
+2010-03-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * THANKS, src/vte.c:
+ Apply patch from Yoann Le Montagner to set VTE bold color (thanks,
+ fixes #2976905).
+ * wscript, src/plugindata.h, src/stash.c, src/stash.h, src/plugins.c,
+ src/Makefile.am, doc/plugins.dox, doc/stash-example.c,
+ plugins/geanyfunctions.h, plugins/geanyplugin.h:
+ Add Stash setting functions to API.
+ Remove unnecessary argument to stash_group_load_from_file().
+ * src/geanyobject.c, plugins/classbuilder.c:
+ Don't generate FOO_GET_PRIVATE() macro because caching the result
+ in Foo::priv can be much more efficient.
+
+
+2010-03-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/editor.c:
+ Fix cursor positioning when toggling comments
+ (patch by Thomas Martitz, thanks).
+
+
+2010-03-25 Peter Scholtens <peter(dot)scholtens(at)xs4all(dot)nl>
+
+ * src/keybindings.[hc]:
+ Added Control+0 for zoom reset, see suggestion from #2969886.
+
+
+2010-03-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/search.c, src/document.c:
+ Fix wrong selection range after Replace in Selection.
+
+
+2010-03-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/win32.c:
+ Make CreateChildProcess() working with Unicode strings, e.g.
+ directory names (closes #2972606).
+ * geany.nsi:
+ Remove reference to already removed latex.tags file.
+ Future releases probably still depend on GTK 2.16.
+ * scintilla/ScintillaGTK.cxx:
+ Backport fix from Scintilla CVS to not paste text beyond the end
+ of lines (closes #2969096).
+ * plugins/htmlchars.c, src/geany.h, src/keybindings.c, src/main.c,
+ src/plugindata.h:
+ Deprecate GEANY_WINDOW_MINIMAL_WIDTH/GEANY_WINDOW_MINIMAL_HEIGHT
+ to not set Geany's minimum window size anymore (closes #2972992).
+ As replacement, add GEANY_DEFAULT_DIALOG_HEIGHT.
+
+
+2010-03-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/stash.c:
+ Make adding string and string vector settings initialise the setting
+ to NULL for safety.
+ * src/utils.c, src/stash.c, src/stash.h, doc/stash-example.c:
+ Add stash_group_load_from_file() and stash_group_save_to_file().
+
+
+2010-03-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * data/filetypes.common:
+ Set default for wrapped lines to show marker at end of line only
+ (more expected and doesn't change line alignment - closes #2972386).
+ * src/toolbar.c, src/toolbar.h, src/prefs.c, src/prefs.h,
+ src/pluginutils.c, doc/plugins.dox:
+ Improve API docs contents page by listing all commonly-used files.
+ Fix 'Date' appearing twice on the date line.
+ Don't generate API docs for prefs.h, toolbar.h (unused).
+ Move some '@file' doc-comments to the .c file.
+ * src/interface.c, geany.glade:
+ Add frame for 'Printing' prefs dialog page.
+ * src/sidebar.c, src/project.c, src/prefs.c, src/stash.c, src/stash.h,
+ src/keyfile.c, src/keyfile.h, src/search.c, src/plugins.c,
+ doc/stash-example.c:
+ Rename Stash data types to be independently named from Geany (so
+ Stash can be reused for other projects).
+ Rename GeanyPrefGroup to StashGroup.
+
+
+2010-03-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * tagmanager/python.c:
+ Apply patch from Colomban Wendling to parse Python lambda functions
+ (thanks) - modified to only parse toplevel or class member lambdas.
+ * src/stash.c, src/stash.h, doc/Doxyfile.in, doc/Makefile.am,
+ doc/stash-example.c:
+ Add doc-comments for Stash setting functions.
+ Add an example file showing usage of Stash.
+ (Not enabled yet until added to the plugin API).
+
+
+2010-03-17 Lex Trotman <elextr.at.gmail.dot.com>
+
+ * src/build.c:
+ Fix using return value without checking return status, caused
+ incorrect sensitivity settings on build dialog.
+
+
+2010-03-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * HACKING:
+ Add tip about gcc optimization & warnings/debugging.
+ Add Testing section.
+ Update Libraries section about synchronizing with other projects.
+
+
+2010-03-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/ui_utils.c:
+ For now revert the recent patch which set real_path of newly
+ open non-existent configuration files as this seems hackish and
+ causes 'file not found' warnings.
+ * wscript:
+ Fix/Improve GIT repository detection
+ (patch by Thomas Martitz, thanks).
+ * plugins/geanyfunctions.h, src/plugindata.h, src/plugins.c,
+ src/utils.c:
+ Add utils_copy_environment() to the plugin API.
+
+
+2010-03-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/utils.c, src/utils.h, src/sciwrappers.c, src/dialogs.c,
+ src/navqueue.c, src/msgwindow.c, src/filetypes.c, src/document.c,
+ src/main.c:
+ Use 3rd person for more API dox.
+ Change 'This is a wrapper function for...' to 'Wraps...' in brief
+ descriptions.
+ Change 'After all...' to 'Afterwards...'.
+ * src/interface.c, geany.glade:
+ Apply patch from Eugene Arshinov to make frame packing/alignment
+ more consistent (thanks).
+
+
+2010-03-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/ui_utils.c:
+ Fix ui_button_new_with_image() to call gtk_button_set_image() so
+ that gtk_button_[sg]et_label() work as expected.
+ * src/build.c, src/dialogs.c, src/dialogs.h, src/callbacks.c:
+ Make Build Commands dialog show menu item labels as a button (to
+ help show that menu labels don't normally need to be edited &
+ display the mnemonic correctly). Clicking shows an input dialog to
+ set a new menu item label.
+ Split dialogs_show_input() into 2 functions: one simple, one for
+ a persistent dialog.
+ Fix possible double-destroy of input dialog when closed by user.
+ * src/dialogs.c:
+ Fix not destroying 'Make Custom Target' input dialog after first
+ use (oops).
+ * src/project.c:
+ Make Long Line Marker settings for existing projects default to
+ general settings instead of 0 (thanks to Eugene Arshinov).
+ * src/utils.c, src/ui_utils.h, src/utils.h, src/highlighting.c,
+ src/keybindings.c, src/sciwrappers.c, src/plugindata.h,
+ src/filetypes.c, src/filetypes.h, src/document.c, src/pluginutils.c,
+ src/document.h, src/editor.c, src/editor.h, src/ui_utils.c:
+ Use 3rd person (gets not get) for API function brief descriptions.
+ Avoid using 'convenience function' in API brief descriptions.
+
+
+2010-03-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * doc/geany.txt, doc/geany.html:
+ Warn about some GNU extensions for regular expressions & clarify
+ some points.
+ * src/interface.c, src/keybindings.c, src/project.c, src/project.h,
+ src/prefs.c, src/plugindata.h, src/keyfile.c, src/editor.c,
+ src/editor.h, geany.glade:
+ Apply patch from Eugene Arshinov to add project long line marker
+ customisation (thanks).
+ * src/interface.c, geany.glade:
+ Edit/tidy 'Long line marker' labels.
+
+
+2010-03-10 Lex Trotman <elextr.at.gmail.dot.com>
+
+ * src/build.c, src/project.c:
+ Fix crash due to NULL in project build preferences (thanks to
+ Wolfgang Ocker).
+
+
+2010-03-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/utils.c, src/utils.h, src/search.c, src/search.h,
+ src/document.c, doc/geany.txt, doc/geany.html:
+ Merge gnu-regex branch:
+ Use POSIX system/GNU regex engine for find & replace 'Use regular
+ expressions' option. This alters regex syntax a bit - see the docs
+ for details; we now support '?' operator and replacement backslash
+ escaping is more standard.
+ Make regex search imply replacing escaped chars.
+ Allow \0 backreference replacement for the whole match.
+ Note: Replace All may be slower; if this is a problem please let me
+ know.
+ - code:
+ Add argument to utils_str_replace_escape() for keeping
+ uninterpreted backslash escapes e.g. '\\', '\e'.
+ * scintilla/LexMarkdown.cxx:
+ Backport minor formatting/style changes from Scintilla project.
+ * doc/geany.txt, doc/geany.html:
+ Remove warning about no visual indication for zero-column-mode
+ editing.
+
+
+2010-03-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * wscript:
+ Skip unavailable languages in LINGUAS (thanks to Christian Dywan).
+
+
+2010-03-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * wscript, scintilla/*, scintilla/include/*:
+ Update Scintilla to version 2.03.
+ * geany.glade, doc/geany.txt, doc/geany.html, src/editor.c,
+ src/editor.h, src/interface.c, src/keyfile.c, src/plugindata.h:
+ Add preference for virtual spaces.
+ * src/log.c:
+ Fix wrong default response for the Debug Messages dialog.
+ * src/dialogs.c:
+ Fix crashes when using Save As with no open files (closes #2964406).
+ * src/document.c:
+ Fix duplicate mnemonics on 'Resave missing file' dialog, also
+ move the question from the secondary to the main text to be
+ more compatible with the Gnome HIG.
+ Fix broken 'Save' action in 'Resave missing file' dialog.
+ * tagmanager/php.c:
+ Improve PHP parser to parse also the argument lists of PHP functions.
+ * src/prefs.c:
+ Correctly set the parent widget for the keybinding overwrite
+ confirmation dialog.
+ * src/dialog.c:
+ Fix setting the icon for some dialogs if the parent itself is also
+ a dialog.
+ * src/ui_utils.c:
+ When editing non-existent config files using the Tools->Configuration
+ Files menu, explicitly set the real_path to avoid presenting the Save
+ As dialog when saving the file (patch by Tony Rick, thanks).
+ * src/callbacks.c:
+ Focus the editor widget after hiding the sidebar when it had the
+ input focus (patch by Can Koy, thanks).
+ Properly show/hide the mesages window when using the View menu item
+ (closes #2961282).
+ * plugins/filebrowser.c:
+ After opening files, focus the editor widget
+ (based on a patch by Can Koy, thanks).
+ * plugins/filebrowser.c, plugins/geanyfunctions.h, src/msgwindow.c,
+ src/plugindata.h, src/plugins.c, src/sidebar.c, src/ui_utils.c,
+ src/ui_utils.h, src/vte.c:
+ Add and use convenience function ui_is_keyval_enter_or_return() and
+ add it to the plugin API.
+
+
+2010-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * src/about.c, THANKS, po/ast.po:
+ Added Asturian translation. Thanks to Marcos Costales for providing.
+
+
+2010-02-28 Dominic Hopf <dmaphy(at)googlemail(dot)com>
+
+ * src/log.c:
+ Fix keyboard accelerators in debug messages window
+ (Thanks Can Koy).
+
+
+2010-02-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * scintilla/LexR.cxx:
+ Backport R lexer from Scintilla CVS to fix case sensitive keywords
+ (Scintilla bug #2956543).
+ * src/sidebar.c, src/about.c, THANKS:
+ Make Space on the symbol and document list not focus the editor
+ widget while Enter does (closes #2919444, patch by Can Koy, thanks).
+ * src/document.c, src/document.h:
+ Fix document_try_focus() to make it work with the sidebar document
+ list as well.
+ * src/msgwindow.c, src/msgwindow.h, src/ui_utils.c, src/ui_utils.h:
+ Make Space on the compiler and messages widgets not focus the editor
+ widget while Enter does (patch by Can Koy, thanks).
+ * src/editor.c:
+ Fix wrongly auto-detected multiline comments
+ (patch by Eugene Arshinov, thanks).
+
+
+2010-02-28 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * src/ui_utils.c:
+ Show number of lines of current document inside statusbar. Thanks to
+ Can Koy for providing the patch.
+
+
+2010-02-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/keybindings.c, doc/geany.txt, doc/geany.html:
+ Make Switch to Editor keybinding reshow the document statistics
+ line, so user doesn't have to move the cursor.
+
+
+2010-02-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * data/filetypes.r:
+ Update keywords for the R language (patch by Jon Senior, thanks).
+
+
+2010-02-21 Dominic Hopf <dmaphy(at)googlemail(dot)com>
+
+ * doc/geany.txt:
+ Fix the instruction how to insert unicode characters
+ (thanks Tony Rick).
+
+
+2010-02-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * scripts/create_py_tags.py:
+ Minor fixes.
+ Replace tabs by spaces.
+ * plugins/genapi.py:
+ Minor fixes.
+ Replace tabs by spaces.
+ * tagmanager/r.c, plugins/geanyfunctions.h, src/about.c,
+ src/filetypes.c, src/symbols.c, tagmanager/Makefile.am,
+ tagmanager/makefile.win32, tagmanager/parsers.h, wscript, THANKS:
+ Add R tagmanager symbol parser (patch by Jon Senior, thanks).
+ * doc/geany.html, doc/geany.txt, src/keybindings.c, src/keybindings.h,
+ src/plugindata.h, src/sidebar.c, src/sidebar.h:
+ Add keybindings to switch to the sidebar's Document and Symbol list
+ as well as to the Message Window's current tab
+ (patch by Eugene Arshinov, thanks).
+ * data/filetypes.r:
+ Update primary keywords for the R language
+ (patch by Jon Senior, thanks).
+
+
+2010-02-20 Dominic Hopf <dmaphy(at)googlemail(dot)com>
+
+ * doc/geany.txt:
+ Add more detailed hints about reloading configuration
+ (thanks to Tony Rick).
+ * data/filetypes.javascript:
+ Correct the keyword list for JavaScript (thanks to Jonas).
+
+
+2010-02-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * New release: Geany 0.18.1 "Balfour".
+
+
+2010-02-13 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/keybindings.c:
+ Add special cases for handling the Select All keybinding (Ctrl-A) in
+ the toolbar search and goto line text entries (closes #2948040).
+ Strip trailing spaces after reflowing a paragraph, patch by
+ Dominik Wagenfuehr, thanks (closes #2945497).
+
+
+2010-02-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/geanymenubuttonaction.c, src/templates.c:
+ Partly revert last commit:
+ Unref the new files toolbar menu when freeing templates as it
+ was done before but unref it *after* the menu has been removed
+ from the GeanyMenuButtonAction.
+ * src/encodings.c:
+ Fix possible endless loop when trying to detect the encoding of
+ non-text files (patch by Alexey Antipov, thanks).
+
+
+2010-02-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/document.c:
+ Allow saving remote files using g_file_set_contents() as well
+ (patch by Алексей Антипов, thanks).
+ * data/filetypes.python:
+ Adjust style for secondary keywords to be less aggressive.
+ Add Python 2.5 builtins keywords.
+ * src/geanymenubuttonaction.c, src/templates.c:
+ Unref the new files toolbar menu when setting a new menu to fix
+ possible crashes when reloading configuration.
+ * src/filetypes.c:
+ When reloading configuration, process the current document at last
+ so the symbol list will be updated correctly.
+
+
+2010-02-01 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/symbols.c:
+ Explicitly read filetype configuration files before generating
+ global tags to get settings for custom filetypes.
+
+
+2010-02-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/plugins.c:
+ Fix GLib warning when toggling 'no plugins available' item.
+
+
+2010-01-31 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * icons/Makefile.am:
+ Include geany.ico in the distribution tarball.
+ * Makefile.am:
+ Fix 'make distcheck' by removing data/latex.tags from EXTRA_DIST.
+ * scripts/create_py_tags.py:
+ Make the script a bit more robust with newer Python versions.
+ * src/templates.c:
+ Use utils_spawn_sync() instead of g_spawn_sync().
+
+
+2010-01-31 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * plugins/export.c:
+ Close meta tag for export date properly.
+
+
+2010-01-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * geany.spec.in:
+ Update RPM Spec file (patch by Dominic Hopf, thanks).
+
+
+2010-01-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/plugindata.h:
+ Fix renaming sci_send_message(), sci_send_command() function pointers.
+
+
+2010-01-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/highlighting.c, src/highlighting.h, src/sciwrappers.c,
+ src/plugindata.h, doc/Doxyfile.in, doc/pluginsymbols.c,
+ plugins/geanyfunctions.h, plugins/Makefile.am,
+ plugins/pluginmacros.h, plugins/genapi.py, ChangeLog, wscript:
+ Use full function name for GeanyFunctions function pointers. This
+ avoids naming conflicts e.g. with C++'s 'new' keyword.
+ Remove deprecated header pluginmacros.h - use geanyfunctions.h instead.
+
+
+2010-01-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/utils.c, src/utils.h, src/vte.c:
+ Add utils_copy_environment() and make use of it.
+ * data/snippets.conf, doc/geany.html, doc/geany.txt, src/callbacks.c,
+ src/editor.c, src/templates.c, src/templates.h:
+ Add new special template wildcard "{command:...}" to use the
+ output of a command in templates.
+ Adjust template functions to mostly work with GeanyDocuments.
+ Minor cleanups in the template code.
+ * src/gb.c:
+ Replace the old icons with smiley icons from the Rodent icon theme.
+ Fix showing the same icon for two or more slots.
+ Minor cleanups.
+ * src/editor.c, src/editor.h, src/keybindings.c:
+ Rename fold_symbol_click() to editor_toggle_fold().
+ Use editor_toggle_fold() when the 'Toggle current fold' keybinding
+ was used to respect the 'Fold/unfold all children' preference
+ (closes #2935053).
+
+
+2010-01-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/build.c:
+ Prevent possible segfault in get_build_group().
+ * src/callbacks.c:
+ Fix GLib warning & beep if trying to insert multiline comment for a
+ filetype that doesn't support it.
+
+
+2010-01-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * doc/plugins.dox:
+ Add gcc commands to build a plugin to the HowTo.
+ * src/search.c, src/document.c, src/document.h:
+ Show 'Replaced X matches in Y documents' message when using Replace in
+ Session.
+
+
+2010-01-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * scripts/plugin_test.c:
+ Add a little test program which can load and test Geany plugins to
+ verify it is loadable at runtime and all necessary symbols are
+ defined.
+ * doc/plugins.dox, src/geanyobject.c, src/geanyobject.h, src/main.c,
+ src/plugindata.h:
+ Add new signal: "geany-startup-complete" which is sent once all
+ initialization and startup tasks has been done.
+ * README.I18N, configure.ac, wscript, po/LINGUAS:
+ Remove po/LINGUAS from the repository.
+ Generate it automatically if needed by reading available
+ message catalogs from the po directory.
+ Also respect the LINGUAS environment variable properly.
+
+
+2010-01-16 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * src/editor.c:
+ Remove editor_auto_latex() from Geany core and move it to geanyLaTeX
+ plugin.
+
+
+2010-01-12 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/editor.c, src/templates.c, src/templates.h:
+ Refactor templates_replace_all() into templates_replace_valist()
+ to save some code duplication.
+
+
+2010-01-11 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * plugins/geanyfunctions.h, src/editor.c, src/editor.h,
+ src/plugindata.h, src/plugins.c:
+ Add editor_insert_text_block() to plugin API.
+
+
+2010-01-01 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * *.*:
+ Update copyright information.
+ * src/keybindings.c, src/keybindings.h, src/plugindata.h,
+ doc/geany.txt, doc/geany.html:
+ Add keybinding to open the last closed tab (closes #2912692).
+
+
+2009-12-31 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * autogen.sh, configure.in, configure.ac:
+ Rename configure.in to configure.ac.
+ * plugins/geanyfunctions.h, src/plugins.c, src/plugindata.h,
+ src/sciwrappers.c:
+ Add sci_find_text() to the plugin API.
+ * doc/geany.html, doc/geany.txt, geany.glade, src/callbacks.c,
+ src/interface.c, src/prefs.c:
+ Add a checkbox in the preferences dialog to explicitly toggle
+ the visibility of the sidebar (closes #2923340).
+
+
+2009-12-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/editor.c, src/plugins.c, src/plugindata.h,
+ plugins/geanyfunctions.h:
+ Add editor_get_eol_char_name(), editor_get_eol_char_len() and
+ editor_get_eol_char() to the plugin API.
+ * src/callbacks.c, src/plugins.c, src/plugins.h:
+ Fix sensitivity of the Edit->Plugin Preferences menu item
+ if plugins are loaded which do not provide a configuration dialog.
+ * scripts/create_py_tags.py:
+ Rewrite and extend the Python tags parsing script to use
+ Python's inspect module to read symbols from Python modules
+ including scope information.
+ * data/filetypes.restructuredtext:
+ Add the default comment character sequence for reStructuredText.
+ * src/callbacks.c:
+ Show the Find/Goto dialogs if the corresponding toolbar buttons are
+ clicked but their text fields are not part of the toolbar (#2920807).
+ * data/filetypes.common, doc/geany.html, doc/geany.txt,
+ src/highlighting.c:
+ Add new style to change foreground and background colours for
+ calltips (patch by Dimitar Zhekov, thanks, closes #2919229).
+ * src/search.c:
+ Remember the window position of the Find, Replace and Find in Files
+ dialogs (closes #2877988).
+
+
+2009-12-26 Frank Lanitz <frank(a)frank.uvena.de>
+
+ * doc/plugins.dox:
+ Fix a minor typo inside plugin API reference.
+
+
+2009-12-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/dialog.c, src/dialogs.h, src/document.c, src/prefs.c:
+ Make dialogs_show_prompt() more flexible to take up to three
+ button/response code pairs to be shown.
+ Add a close button to the dialog when asking to Re-Save a
+ deleted file
+ (closes #2916954, based on a patch by Dominik Stadler, thanks).
+ * src/editor.c:
+ Fix LaTeX environment auto completion with CR/LF line endings.
+ Add some sanity checks.
+ * src/document.c:
+ When closing a document after it was deleted from the filesystem,
+ don't ask whether it should be saved first.
+ Mark the document only as changed if it is not closed afterwards.
+ Prevent possible segfaults if the document was closed when it is
+ missing from the filesystem.
+ * src/keybindings.c, src/keyfile.c, src/main.c, src/msgwindow.c,
+ src/msgwindow.h, src/prefs.c:
+ Add MessageWindow::scribble and use it instead of searching the
+ widget pointer everytime.
+ * src/keyfile.c, src/msgwindow.c, src/msgwindow.h, src/ui_utils.h:
+ Add preferences for hiding single tabs from the messages window
+ (no GUI preferences yet, still to be implemented).
+ * src/callbacks.c, src/prefs.c, src/toolbar.c, src/toolbar.h:
+ Set the correct parent window for the toolbar editor
+ dialog (closes #2913334).
+ * src/win32.c, src/win32.h, src/ui_utils.c:
+ Rename win32_show_project_folder_dialog() to
+ win32_show_folder_dialog() as it is not related and not used by any
+ project management related code.
+ * src/ui_utils.c, src/win32.c, src/win32.h, src/dialogs.c:
+ Rename win32_show_file_dialog() to win32_show_document_open_dialog()
+ as it is specialised for opening documents.
+ Implement win32_show_file_dialog() as a generic file open dialog and
+ use it with ui_path_box_new().
+
+
+2009-12-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * src/editor.c:
+ Extend auto_latex() function to check whether an environment has been
+ closed within the next lines to avoid auto adding double \end{}.
+ * data/latex.tags:
+ Remove LaTeX tags from SVN. Can be found at
+ http://download.geany.org/contrib/tags/ if needed.
+
+
+2009-12-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/callbacks.c, src/dialogs.c, src/document.c, src/document.h:
+ Add document_need_save_as().
+ Show the Save As also for documents created from filetype templates
+ instead of saving them directly with the untitled filename.
+
+
+2009-12-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * geany.glade, src/interface.c:
+ Move 'Send Selection to Terminal' menu item from Format to Commands
+ submenu.
+ * src/msgwindow.c:
+ When going to a build error, try the current document's path if
+ the parsed filename doesn't exist. (This can happen when we receive
+ build messages in the wrong order - after the 'Leaving directory'
+ messages).
+ * src/msgwindow.c:
+ Refactor msgwin_goto_compiler_file_line().
+ * src/interface.c, src/keybindings.c, geany.glade:
+ Capitalize, add mnemonics, sync with kb.c the Edit->Commands menu item
+ labels.
+ * src/search.c:
+ Refactor/reformat on_replace_dialog_response().
+
+
+2009-12-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * geany.spec.in:
+ Improve geany.spec (split the package into a binary and devel
+ package, update BuildRequires and other minor improvements).
+ Patch by Dominic Hopf, thanks.
+
+
2009-12-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/filetypes.c, src/filetypes.h:
Added: branches/sm/ChangeLog.sm
===================================================================
--- branches/sm/ChangeLog.sm (rev 0)
+++ branches/sm/ChangeLog.sm 2010-05-31 09:23:04 UTC (rev 4968)
@@ -0,0 +1,68 @@
+2010-02-23 Eugene Arshinov <earshinov(at)gmail(dot)com>
+
+ * src/main.c:
+ Change the behaviour of the setting controlled by "Preferences >
+ General > Misc > Use project-based session files" check button. Now
+ if you open a project via command-line, files from the default
+ session are not automatically appended to it.
+
+
+2010-02-22 Eugene Arshinov <earshinov(at)gmail(dot)com>
+
+ * src/main.c, src/main.h, src/socket.c:
+ Use a separate command-line option to specify a project to be opened.
+ * src/sm.c:
+ Remember opened project across restarts.
+ * src/socket.c:
+ Fix opening project in already running instance (via socket).
+
+
+2010-02-15 Eugene Arshinov <earshinov(at)gmail(dot)com>
+
+ * src/project.c, src/sm.c, src/utils.c, src/utils.h:
+ Use absolute paths to project files. Particularly, paths to recent
+ projects' files are now stored as absolute.
+ * src/main.c:
+ Load files from command line even if a project is being opened.
+ * geany.glade, src/interface.c, src/keyfile.c, src/main.c,
+ src/prefs.c, src/prefs.h:
+ Add a GUI preference to control whether the default session is
+ loaded if any files are opened via command-line (fix #2838686).
+ Location of the preference: General > Startup tab > Startup frame.
+
+
+2010-02-07 Eugene Arshinov <earshinov(at)gmail(dot)com>
+
+ * src/main.c:
+ Rewrite load_startup_files() function. Fix the bug with opening a
+ project while specifying -s command line option. E.g.,
+ `geany -s project.geany' now correctly loads the project instead of
+ showing a blank document and clearing the project silently.
+
+
+2010-01-24 Eugene Arshinov <earshinov(at)gmail(dot)com>
+
+ * doc/Doxyfile.in, src/Makefile.am, src/main.c, src/makefile.win32,
+ src/sm.c, src/sm.h, wscript:
+ Extract libSM-related code into separate sm.{c,h} files, make some
+ refactoring, and write code comments for Doxygen.
+ * src/keyfile.c, src/main.c:
+ Make --new-instance command line option imply --no-session.
+ * src/sm.c:
+ Handle --no-session command line option properly.
+ * src/main.c, src/main.h, src/sm.c, src/utils.c, src/utils.h:
+ Add "reverse parser" of GOptionEntry. Handle all command-line options.
+
+
+2009-12-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/Makefile.am, configure.in, wscript:
+ Detect libSM X session management library (patch by Eugene Arshinov,
+ thanks).
+ * src/project.c, src/project.h, src/callbacks.c, src/document.c,
+ src/document.h, src/main.c, src/main.h:
+ Refactor quitting code into main_save() and main_finalize() (patch by
+ Eugene Arshinov, thanks).
+ * src/main.c:
+ Restart Geany and restore some state when logging in (patch by
+ Eugene Arshinov, thanks).
Modified: branches/sm/HACKING
===================================================================
--- branches/sm/HACKING 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/HACKING 2010-05-31 09:23:04 UTC (rev 4968)
@@ -166,6 +166,11 @@
function_name(). This is for compatibility with various Unix-like
compilers. You should use -ansi to help check this.
+.. tip::
+ Remember for gcc you need to enable optimization to get certain
+ warnings like uninitialized variables, but for debugging it's
+ better to have no optimization on.
+
Style
^^^^^
* We use a tab width of 4 and indent completely with tabs not spaces.
@@ -207,10 +212,14 @@
gint function_long_name(gchar arg1, <too many args to fit on this line>,
gchar argN)
{
+ /* variable declarations go before code in each scope */
gint foo, bar; /* variables can go on the same line */
gchar *ptr; /* pointer symbol must go next to variable name, not type */
gchar *another; /* pointers should normally go on separate lines */
+ /* Some long comment block
+ * taking several different
+ * lines to explain */
if (foo)
{
gint dir = -1; /* -1 to search backwards */
@@ -230,16 +239,27 @@
...
+Testing
+-------
+* Run with ``-v`` to print any debug messages.
+* You can use a second instance (``geany -i``).
+* To check first-run behaviour, use an alternate config directory by
+ passing ``-c some_dir`` (but make sure the directory is clean first).
+* For debugging tips, see `GDB`_.
+
Libraries
---------
-We prefer to use an unmodified version of Scintilla - any changes should
-be passed on to the maintainers at http://scintilla.org.
+We try to use an unmodified version of Scintilla - any new lexers or
+other changes should be passed on to the maintainers at
+http://scintilla.org. We normally update to a new Scintilla release
+shortly after one is made.
Tagmanager was originally taken from Anjuta 1.2.2, and parts of it
(notably c.c) have been merged from later versions of Anjuta and
CTags. The independent Tagmanager library itself ceased development
before Geany was started. It's source code parsing is mostly taken from
-Exuberant CTags (see http://ctags.sf.net).
+Exuberant CTags (see http://ctags.sf.net). If appropriate it's good to
+pass language parser changes back to the CTags project.
Notes
Modified: branches/sm/Makefile.am
===================================================================
--- branches/sm/Makefile.am 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/Makefile.am 2010-05-31 09:23:04 UTC (rev 4968)
@@ -6,17 +6,16 @@
WIN32_BUILD_FILES = \
geany_private.rc \
- win32-config.h \
+ win32-config.h \
makefile.win32 \
- scintilla/makefile.win32 \
- tagmanager/makefile.win32 \
- src/makefile.win32
+ scintilla/makefile.win32 \
+ tagmanager/makefile.win32 \
+ src/makefile.win32
SYS_DATA_FILES = \
data/c99.tags \
data/php.tags \
data/python.tags \
- data/latex.tags \
data/pascal.tags \
data/html_entities.tags \
$(srcdir)/data/filetypes.* \
@@ -61,7 +60,6 @@
$(INSTALL_DATA) $(srcdir)/data/php.tags $(DESTDIR)$(pkgdatadir); \
$(INSTALL_DATA) $(srcdir)/data/python.tags $(DESTDIR)$(pkgdatadir); \
$(INSTALL_DATA) $(srcdir)/data/pascal.tags $(DESTDIR)$(pkgdatadir); \
- $(INSTALL_DATA) $(srcdir)/data/latex.tags $(DESTDIR)$(pkgdatadir); \
$(INSTALL_DATA) $(srcdir)/data/html_entities.tags $(DESTDIR)$(pkgdatadir); \
$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \
for file in $(srcdir)/data/*; do \
Modified: branches/sm/NEWS
===================================================================
--- branches/sm/NEWS 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/NEWS 2010-05-31 09:23:04 UTC (rev 4968)
@@ -1,3 +1,70 @@
+Geany 0.18.1 (February 14, 2010)
+
+ Build fixes:
+ * Define G_GNUC_WARN_UNUSED_RESULT to fix build on GLib 2.8.
+ * Use AC_PATH_PROG instead of 'which' for portability (patch by Erik
+ Southworth, thanks).
+
+ Incompatibilities:
+ * Remove filetypes.common invert_all option - use 'Invert syntax
+ highlighting colors' pref instead (fixes #2854525).
+
+ Bug fixes:
+ * Fix 'Open Selected File' for unsaved new documents.
+ * Fix updating main menu accelerators after changing keybindings
+ (thanks to Lex Trotman).
+ * Fix using 'Insert date' keybinding when a custom date string has
+ not been set.
+ * Set the cursor color for the split window plugin.
+ * Remove plugin from plugin manager dialog on unloading if it no
+ longer exists or is incompatible.
+ * Fix 'Reflow block' command when at the last paragraph and there's
+ no last newline (patch by Eugene Arshinov, thanks).
+ * Fix opening filenames beginning with two dots (closes #2858487).
+ * Show Find in Files stderr output in messages window instead of
+ debug window so that invalid regex messages can be seen easily.
+ * Speed up sorting in utils_get_file_list(). This reduces the file
+ browser delay on displaying a big directory, e.g. /usr/bin.
+ * Fix a bug with not w3c compatible HTML code on export plugin
+ * Fix non-working Home and End keys on numpads.
+ * Fix loading of files on network resources on Windows.
+ * Fix wrong alignment of printed pages when page headers are disabled
+ (closes #2856822).
+
+ Improvements:
+ * Extend auto_latex() function to check whether an environment has
+ been closed within the next lines to avoid auto adding double
+ \end{}.
+ * Replace some icons which could cause licensing problems by icons
+ from the Rodent icon theme.
+
+ Filetype fixes:
+ * Parse contents of D extern{} and version{} blocks.
+ * Fix creating D interface tags properly.
+ * Parse D functions with contracts (fixes #1885480).
+ * Parse D alias statement like typedef.
+ * Improve parsing of LaTeX, PHP and Python files.
+
+ Documentation:
+ * Add 'Scope autocompletion' section.
+ * Add 'Tools menu items' section to explain configuration files
+ submenu, reload configuration item.
+ * Minor updates/fixes.
+
+ API:
+ * Add gcc commands to build a plugin to the HowTo.
+
+ HACKING file:
+ * Add section 'Plugin API/ABI design'.
+ * Add 'Compiler options & warnings' section.
+ * Update Style section to be clearer about code alignment and show
+ some example code.
+ * Add 'Doc-comments' plugin API subsection.
+
+ Internationalisation:
+ * Added translations: gl
+
+
Geany 0.18 (August 16, 2009)
General:
Modified: branches/sm/README
===================================================================
--- branches/sm/README 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/README 2010-05-31 09:23:04 UTC (rev 4968)
@@ -102,7 +102,7 @@
--
-2005-2009 by Enrico Tröger, Nick Treleaven and Frank Lanitz
+2005-2010 by Enrico Tröger, Nick Treleaven and Frank Lanitz
enrico(dot)troeger(at)uvena(dot)de
nick(dot)treleaven(at)btinternet(dot)com
frank(at)frank(dot)uvena(dot)de
Modified: branches/sm/README.I18N
===================================================================
--- branches/sm/README.I18N 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/README.I18N 2010-05-31 09:23:04 UTC (rev 4968)
@@ -1,59 +1,59 @@
Quick Guide for new translations
--------------------------------
-If you want to translate Geany into another language, please go to the
-language statistics page (see below) to see whether your desired
-language already exists. If it already exists, please read the
-"Notes for updating translations" section. Otherwise, get the SVN
-version of Geany, change to the po directory and start the new
-translation with:
+If you would like to translate Geany into another language, have a look at the
+language statistics page at [1] first to see if your desired language already
+exists. If it already exists, please read the "Notes for updating translations"
+section. Otherwise, get the SVN version of Geany, change to the po directory and
+start the new translation with:
$ msginit -l ll_CC -o ll.po -i geany.pot
-Fill in ll with the language code and CC with the country code.
-For example, to translate Geany into Italian you would type:
+Fill in ll with the language code and CC with the country code. For example, to
+translate Geany into Italian you would type:
$ msginit -l it_IT -o it.po -i geany.pot
-This will create a file it.po. This file can be opened with a
-text editor (like Geany ;-)) or you can also use a graphical
-interface. I can suggest PoEdit (http://www.poedit.net/), but
-there are several other GUIs.
+This will create a file it.po. This file can be opened with a text editor
+(e.g. Geany ;-)) or a graphical program like PoEdit [2]. There are also several
+other GUI programs for working on translations.
-Make sure you add your language to the file po/LINGUAS.
-Just open the file with a text editor and add your code.
+You don't need to modify the file po/LINGUAS, it is regenerated automatically on
+the next build.
When you have finished editing the file, check the file with:
$ msgfmt -c --check-accelerators=_ it.po
-Please take care of menu accelerators(strings containing a "_").
-The "_" character should also be in your translation. Additionally,
-it would be nice if these accelerators are not twice for two strings
-inside a dialog or sub menu.
+Please take care of menu accelerators(strings containing a "_"). The "_"
+character should also be in your translation. Additionally, it would be nice if
+these accelerators are not twice for two strings inside a dialog or sub menu.
-You can also use intl_stats.sh, e.g. by running the following command
-in the top source directory of Geany:
+You can also use intl_stats.sh, e.g. by running the following command in the top
+source directory of Geany:
$ po/intl_stats.sh -a it
-This will print some information about the Italian translation
-and checks for menu accelerators.
+This will print some information about the Italian translation and checks for
+menu accelerators.
-Then send the file to Frank Lanitz and he will add the translation.
+When you have finished your work - which doesn't mean you finished the
+translation, you will not have to work alone - send the file to the translation
+mailing list [3] or directly to Frank Lanitz [4] and he will add the translation
+to Geany then.
-It is a good idea to write to Frank before you start or while translating,
-because he can give you some hints on translating and ensure that the
-translation is not already in progress.
+It is a good idea to let any translator and Frank know before you start or while
+translating, because they can give you hints on translating and Frank can ensure
+that a translation is not already in progress.
Notes for updating translations
-------------------------------
-If you want to update an existing translation, please contact Frank
-Lanitz. He is supervising all translation issues and will contact the
-maintainer of the translation you want to update to avoid any
-conflicts.
+If you want to update an existing translation, please contact the translation
+mailing list [3] and/or Frank Lanitz [4] directly. He is supervising all
+translation issues and will contact the maintainer of the translation you want
+to update to avoid any conflicts.
Some translation statistics can be found at:
http://i18n.geany.org/
@@ -62,8 +62,11 @@
I18n mailing list
-----------------
-There is also a mailing list dedicated to translation issues. Please
-visit http://www.geany.org/Support/MailingList for more information.
+There is also a mailing list dedicated to translation issues. Please visit
+http://www.geany.org/Support/MailingList#geany-i18 for more information.
-Contact: Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+[1] http://i18n.geany.org/
+[2] http://www.poedit.net/
+[3] http://www.geany.org/Support/MailingList#geany-i18
+[4] Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: branches/sm/README.Packagers
===================================================================
--- branches/sm/README.Packagers 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/README.Packagers 2010-05-31 09:23:04 UTC (rev 4968)
@@ -82,7 +82,7 @@
--
-2008-2009 by Enrico Tröger, Nick Treleaven and Frank Lanitz
+2008-2010 by Enrico Tröger, Nick Treleaven and Frank Lanitz
enrico(dot)troeger(at)uvena(dot)de
nick(dot)treleaven(at)btinternet(dot)com
frank(at)frank(dot)uvena(dot)de
Modified: branches/sm/THANKS
===================================================================
--- branches/sm/THANKS 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/THANKS 2010-05-31 09:23:04 UTC (rev 4968)
@@ -45,7 +45,7 @@
Matti Mårds <mamaar(at)gmail(dot)com> - create PHP tags script
Robert McGinley <mcginleyr1(at)gmail(dot)com> - Documentation improvements
Felipe Pena <felipensp(at)gmail(dot)com> - Missing PHP keywords
-Colomban Wendling <colombanw(at)users(dot)sourceforge(dot)net> - GLSL filetype patch
+Colomban Wendling <colombanw(at)users(dot)sourceforge(dot)net> - various patches
Timothy Boronczyk <tboronczyk(at)gmail(dot)com> - scroll_stop_at_last_line GUI pref patch
Jason Oster <parasytic(at)users(dot)sourceforge(dot)net> - various patches
Andrew Rowland <weibullguy(at)charter(dot)net> - R filetype patch
@@ -72,12 +72,19 @@
Ross McKay <rosko<at>zeta<dot>org<dot>au> - ASP preferred language option
Alexey Antipov <1a_antipov(at)mail(dot)ru> - Apply file open encoding only to non-Unicode files
Jörn Reder <joern(at)zyn(dot)de> - --socket-file command line option patch
-Kelvin Gardiner <kelvin.mbmn.net> - VHDL symbol list patch, Verilog filetype
+Kelvin Gardiner <kelvin(at)mbmn(dot)net> - VHDL symbol list patch, Verilog filetype
+Jon Senior <jon(at)restlesslemon(dot)co(dot)uk> - R tagmanager parser patch
+Can Koy <cankoy(at)ymail(dot)com> - Multiple changes/improvements
+Yoann Le Montagner <yoann(dot)le-montagner(at)m4x(dot)org> - set VTE bold color
+Dimitar Zhekov <hamster(at)mbox(dot)contact(dot)bg> - matching brace improvements patch
+Ondrej Donek <ondrejd(at)gmail(dot)com> - Support for creating PHP classes with the classbuilder plugin
+Daniel Marjamaki <danielm77(at)spray(dot)se> - Small improvements
Translators:
------------
These people have translated Geany to foreign languages.
-Yura Semashko <yurand2(at)gmail(dot)com> - be_BY
+Marcos Costales <marcoscostales(at)gmail(dot)com - ast
+Yura Siamashka <yurand2(at)gmail(dot)com> - be_BY
Dilyan Rusev <dilyanrusev(at)gmail(dot)com> - bg
Toni Garcia-Navarro <topi(at)elpiset(dot)net> - ca_ES
Petr Messner <messa(at)messa(dot)cz> - cs_CZ
@@ -90,6 +97,7 @@
Damián Viano <debian(at)damianv(dot)com(dot)ar> - es
Antonio Jiménez González <tonificante(at)hotmail(dot)com> - es
Nacho Cabanes <ncabanes(at)gmail(dot)com> - es
+Lucas Vieites <lucasvieites(at)gmail(dot)com>
Harri Koskinen <harri(at)fastmonkey(dot)org> - fi
Jari Rahkonen <jari(dot)rahkonen(at)pp1(dot)inet(dot)fi> - fi
Jean-Philippe Moal <skateinmars(at)skateinmars(dot)net> - fr
Modified: branches/sm/TODO
===================================================================
--- branches/sm/TODO 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/TODO 2010-05-31 09:23:04 UTC (rev 4968)
@@ -7,20 +7,16 @@
Next version or later:
+ o better file template {filename} wildcard replacement +{BASENAME}
o documentation: list and explain filetype modes
o common default highlighting styles configurable for all
programming languages (done for C-like filetypes using
filetypes.common named styles)
- o configurable filetype and project make commands (e.g. using
- bud for D) - see the build-system SVN branch
o (better custom filetype support)
- o (support for adding plugin filetypes - SCI_LOADLEXERLIBRARY?)
o (custom template insertion - so user can add licenses, etc)
o (selectable menu of arguments to use for Make, from Make Custom)
o (DBUS)
o (sci macro support - as a plugin?)
- o (better search & replace regex support e.g. multiline - use
- SCI_GETCHARACTERPOINTER and GNU regex?)
o (parsing tags from a memory buffer instead of a file on disk)
o (tango-like icons for the symbol list)
o (per-workspace instances with socket support?)
@@ -30,8 +26,6 @@
o stable plugin ABI for the 1.0 series? (Split up geany_data, prefs,
GeanyKeyCommand enum into groups)
o review documentation
- o review any hidden prefs/compile time constants that could be in the
- Prefs dialog, e.g. invert_all syntax highlighting pref
Wishlist
@@ -42,5 +36,6 @@
function_name(arguments) syntax - see python.c:parseArglist())
o (better tags support for popular languages? - this is a moving
target...)
+ o (support for adding plugin filetypes - SCI_LOADLEXERLIBRARY?)
o Some kind of support for CTags tags files
o Python plugin interface (different concept from Lua scripting)
Modified: branches/sm/autogen.sh
===================================================================
--- branches/sm/autogen.sh 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/autogen.sh 2010-05-31 09:23:04 UTC (rev 4968)
@@ -6,7 +6,7 @@
DIE=0
-(test -f $srcdir/configure.in) || {
+(test -f $srcdir/configure.ac) || {
echo "**Error**: Directory "\`$srcdir\'" does not look like the top-level package directory"
exit 1
}
Copied: branches/sm/configure.ac (from rev 4967, branches/sm/configure.in)
===================================================================
--- branches/sm/configure.ac (rev 0)
+++ branches/sm/configure.ac 2010-05-31 09:23:04 UTC (rev 4968)
@@ -0,0 +1,340 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl $Id$
+
+AC_INIT(configure.ac)
+AM_INIT_AUTOMAKE(geany, 0.19)
+
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+AM_CONFIG_HEADER(config.h)
+
+AC_GNU_SOURCE
+AC_AIX
+AC_MINIX
+
+AC_PROG_CC
+
+AC_PROG_CXX
+# check for C++ compiler explicitly and fail if none is found, do this check
+# after AC_PROG_CXX has set the CXX environment variable
+which $CXX >/dev/null 2>&1
+if test "x$?" != "x0"; then
+ AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.])
+fi
+
+#AC_PROG_RANLIB
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_INTLTOOL
+
+# for plugins
+AC_DISABLE_STATIC
+AM_PROG_LIBTOOL
+LIBTOOL="$LIBTOOL --silent"
+
+# autoscan start
+
+# Checks for header files.
+AC_CHECK_HEADERS([fcntl.h fnmatch.h glob.h regex.h stdlib.h sys/time.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_OFF_T
+AC_TYPE_SIZE_T
+AC_STRUCT_TM
+
+# Checks for library functions.
+AC_CHECK_FUNCS([gethostname ftruncate fgetpos mkstemp regcomp strerror strstr])
+
+# autoscan end
+
+
+# get svn revision (try GIT first, then check for SVN)
+REVISION="r0"
+GIT=`which git 2>/dev/null`
+if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}"
+then
+ REVISION=r`git svn find-rev origin/trunk 2>/dev/null ||
+ git svn find-rev trunk 2>/dev/null || git svn find-rev HEAD 2>/dev/null ||
+ git svn find-rev master 2>/dev/null || echo 0`
+fi
+if test "x${REVISION}" = "xr0"
+then
+ SVN=`which svn 2>/dev/null`
+ if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}"
+ then
+ REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4`
+ fi
+fi
+if test "x${REVISION}" != "xr0"
+then
+ # force debug mode for a SVN working copy
+ CFLAGS="-g -DGEANY_DEBUG $CFLAGS"
+else
+ REVISION="-1"
+fi
+AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [subversion revision number])
+
+
+dnl Check for binary relocation support
+dnl taken from Inkscape (Hongli Lai <h.lai(a)chello.nl>)
+
+AC_ARG_ENABLE(binreloc,
+ [ --enable-binreloc compile with binary relocation support],
+ enable_binreloc=$enableval,enable_binreloc=no)
+
+AC_MSG_CHECKING(whether binary relocation support should be enabled)
+if test "$enable_binreloc" = "yes"; then
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(for linker mappings at /proc/self/maps)
+ if test -e /proc/self/maps; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(/proc/self/maps is not available. Binary relocation cannot be enabled.)
+ enable_binreloc="no"
+ fi
+
+elif test "$enable_binreloc" = "auto"; then
+ AC_MSG_RESULT(yes when available)
+ AC_MSG_CHECKING(for linker mappings at /proc/self/maps)
+ if test -e /proc/self/maps; then
+ AC_MSG_RESULT(yes)
+ enable_binreloc=yes
+
+ AC_MSG_CHECKING(whether everything is installed to the same prefix)
+ if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
+ "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
+ "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
+ then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_NOTICE(Binary relocation support will be disabled.)
+ enable_binreloc=no
+ fi
+
+ else
+ AC_MSG_RESULT(no)
+ enable_binreloc=no
+ fi
+
+elif test "$enable_binreloc" = "no"; then
+ AC_MSG_RESULT(no)
+else
+ AC_MSG_RESULT(no (unknown value "$enable_binreloc"))
+ enable_binreloc=no
+fi
+if test "$enable_binreloc" = "yes"; then
+ AC_DEFINE(ENABLE_BINRELOC,,[Use AutoPackage?])
+fi
+
+
+# GTK checks
+gtk_modules="gtk+-2.0 >= 2.8.0"
+PKG_CHECK_MODULES(GTK, [$gtk_modules])
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+# GIO checks
+gio_modules="gio-2.0 >= 2.16"
+PKG_CHECK_MODULES(GIO, [$gio_modules], have_gio=1, have_gio=0)
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+if test $have_gio = 1 ; then
+ AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available])
+fi
+
+# --disable-deprecated switch for GTK2 purification
+AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ],
+ [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
+
+# Plugins support
+AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support [default=no]])], , enable_plugins=yes)
+
+if test "x$enable_plugins" = "xyes" ; then
+ AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled.])
+ AM_CONDITIONAL(PLUGINS, true)
+else
+ AM_CONDITIONAL(PLUGINS, false)
+fi
+
+# Use included GNU regex library
+AC_ARG_ENABLE(gnu-regex, [AC_HELP_STRING([--enable-gnu-regex], [compile with included GNU regex library [default=no]])], , enable_gnu_regex=no)
+
+if test "x$enable_gnu_regex" = "xyes" ; then
+ AC_DEFINE(USE_INCLUDED_REGEX, 1, [Define if included GNU regex code should be used.])
+ AC_DEFINE(HAVE_REGCOMP, 1, [Define if you have the 'regcomp' function.])
+ AM_CONDITIONAL(USE_INCLUDED_REGEX, true)
+else
+ AM_CONDITIONAL(USE_INCLUDED_REGEX, false)
+fi
+
+case "${host}" in
+ *mingw*)
+ AC_CHECK_LIB(iberty, fnmatch, [], [
+ AC_MSG_ERROR([fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details.])
+ ])
+ AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32])
+ want_vte="no"
+ want_socket="yes"
+ AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance])
+ AC_EXEEXT
+ AM_CONDITIONAL(MINGW, true)
+ ;;
+ *)
+ AM_CONDITIONAL(MINGW, false)
+ ;;
+esac
+
+dnl skip check if already decided
+if test "x$want_socket" = "x"; then
+ # socket support
+ AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]),
+ [want_socket="$enableval"], [want_socket="yes"])
+
+ if test "x$want_socket" = "xyes"; then
+ AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance])
+ # this should bring in libsocket on Solaris:
+ AC_SEARCH_LIBS([connect],[socket],[],[],[])
+ fi
+fi
+
+dnl skip check if already decided
+if test "x$want_vte" = "x"; then
+ # VTE support
+ AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte],
+ [enable if you want virtual terminal support [[default=yes]]]),
+ [want_vte="$enableval"], [want_vte="yes"])
+ if test "x$want_vte" = "xyes"; then
+ AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support])
+ fi
+ AC_ARG_WITH(vte-module-path, AC_HELP_STRING([--with-vte-module-path=PATH],
+ [Path to a loadable libvte [[default=None]]]), [AC_DEFINE_UNQUOTED([VTE_MODULE_PATH],
+ ["$withval"], [Path to a loadable libvte])])
+fi
+
+GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
+
+
+# GTK 2.10 printing support
+$PKG_CONFIG --exists 'gtk+-2.0 >= 2.10.0'
+if test "x$?" = "x0" ; then
+ enable_printing="yes"
+else
+ enable_printing="no (GTK >= 2.10 necessary)"
+fi
+
+
+# just for a laugh (it has absolutely no effect)
+AC_ARG_ENABLE(the-force, AC_HELP_STRING([--enable-the-force],
+ [enable if you are Luke Skywalker and the force is with you [[default=no]]]), [be_luke="$enableval"], [be_luke="no"])
+AC_MSG_CHECKING([whether the force is with you])
+if test "x$be_luke" = "xyes"; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+fi
+
+# i18n
+GETTEXT_PACKAGE=geany
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
+
+if test -n "${LINGUAS}"
+then
+ ALL_LINGUAS="${LINGUAS}"
+else
+ if test -z "$conf_dir" ; then
+ conf_dir="."
+ fi
+ ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $1 }'`
+fi
+
+AM_GLIB_GNU_GETTEXT
+# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845)
+if test "x$MSGFMT" = "xno"; then
+ AC_MSG_ERROR([msgfmt not found. Please install the gettext package.])
+fi
+
+
+# libSM for X session management
+SM_LIBS=""
+AC_ARG_ENABLE(libsm,
+ [ --enable-libsm enable X session management support [[]]],
+ [enable_libsm=$enableval], [enable_libsm=yes])
+AC_MSG_CHECKING([whether to use LibSM])
+if test x"$enable_libsm" = xyes; then
+ AC_MSG_RESULT(yes)
+ AC_CHECK_HEADERS(X11/SM/SMlib.h, [SM_LIBS="-lSM -lICE"], enable_libsm=no)
+ if test x"$enable_libsm" = xyes; then
+ AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed])
+ else
+ AC_MSG_WARN([X session management will not be supported])
+ fi
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST(SM_LIBS)
+
+
+# Set ${datadir}
+if test "x${datadir}" = 'x${prefix}/share' -o "x${datarootdir}" = 'x${prefix}/share'; then
+ if test "x${prefix}" = "xNONE"; then
+ prefix=${ac_default_prefix}
+ fi
+fi
+
+# Set ${docdir} if it is empty
+if test -z "${docdir}"; then
+ docdir='${datadir}/doc/${PACKAGE}'
+ AC_SUBST(docdir)
+fi
+
+GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`
+AC_SUBST(GEANY_DATA_DIR)
+
+# intltool hack to define install_sh on Debian/Ubuntu systems
+if test "x$install_sh" = "x"; then
+ install_sh="`pwd`/install-sh"
+ AC_SUBST(install_sh)
+fi
+
+AC_OUTPUT([
+Makefile
+icons/Makefile
+icons/16x16/Makefile
+icons/48x48/Makefile
+icons/scalable/Makefile
+tagmanager/Makefile
+tagmanager/include/Makefile
+scintilla/Makefile
+scintilla/include/Makefile
+src/Makefile
+plugins/Makefile
+po/Makefile.in
+doc/Makefile
+doc/geany.1
+geany.spec
+geany.pc
+doc/Doxyfile
+])
+
+echo "----------------------------------------"
+echo "Install Geany in : ${prefix}"
+if test "x${build}" != "x" -a "x${target}" != "x"
+then
+ echo "Building Geany on : ${build}"
+ echo "Building Geany for : ${target}"
+fi
+echo "Using GTK version : ${GTK_VERSION}"
+echo "Build with GTK printing support : ${enable_printing}"
+echo "Build with plugin support : ${enable_plugins}"
+echo "Build with X session management support : ${enable_libsm}"
+echo "Use virtual terminal support : ${want_vte}"
+echo "Use (UNIX domain) socket support : ${want_socket}"
+if test "${REVISION}" != "-1"
+then
+ echo "Compiling Subversion revision : ${REVISION}"
+fi
+echo ""
+echo "Configuration is done OK."
+echo ""
Deleted: branches/sm/configure.in
===================================================================
--- branches/sm/configure.in 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/configure.in 2010-05-31 09:23:04 UTC (rev 4968)
@@ -1,333 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl $Id$
-
-AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(geany, 0.19)
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-AM_CONFIG_HEADER(config.h)
-
-AC_GNU_SOURCE
-AC_AIX
-AC_MINIX
-
-AC_PROG_CC
-
-AC_PROG_CXX
-# check for C++ compiler explicitly and fail if none is found, do this check
-# after AC_PROG_CXX has set the CXX environment variable
-AC_PATH_PROG([CXXCOMPILER], [$CXX])
-if ! test -x "${CXXCOMPILER}"
-then
- AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.])
-fi
-
-#AC_PROG_RANLIB
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_INTLTOOL
-
-# for plugins
-AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
-LIBTOOL="$LIBTOOL --silent"
-
-# autoscan start
-
-# Checks for header files.
-AC_CHECK_HEADERS([fcntl.h fnmatch.h glob.h regex.h stdlib.h sys/time.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-
-# Checks for library functions.
-AC_CHECK_FUNCS([gethostname ftruncate fgetpos mkstemp regcomp strerror strstr])
-
-# autoscan end
-
-
-# get svn revision (try GIT first, then check for SVN)
-REVISION="r0"
-AC_PATH_PROG([GIT], [git])
-if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}"
-then
- REVISION=r`git svn find-rev origin/trunk 2>/dev/null ||
- git svn find-rev trunk 2>/dev/null || git svn find-rev HEAD 2>/dev/null ||
- git svn find-rev master 2>/dev/null || echo 0`
-fi
-if test "x${REVISION}" = "xr0"
-then
- AC_PATH_PROG([SVN], [svn])
- if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}"
- then
- REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4`
- fi
-fi
-if test "x${REVISION}" != "xr0"
-then
- # force debug mode for a SVN working copy
- CFLAGS="-g -DGEANY_DEBUG $CFLAGS"
-else
- REVISION="-1"
-fi
-AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [subversion revision number])
-
-
-dnl Check for binary relocation support
-dnl taken from Inkscape (Hongli Lai <h.lai(a)chello.nl>)
-
-AC_ARG_ENABLE(binreloc,
- [ --enable-binreloc compile with binary relocation support],
- enable_binreloc=$enableval,enable_binreloc=no)
-
-AC_MSG_CHECKING(whether binary relocation support should be enabled)
-if test "$enable_binreloc" = "yes"; then
- AC_MSG_RESULT(yes)
- AC_MSG_CHECKING(for linker mappings at /proc/self/maps)
- if test -e /proc/self/maps; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR(/proc/self/maps is not available. Binary relocation cannot be enabled.)
- enable_binreloc="no"
- fi
-
-elif test "$enable_binreloc" = "auto"; then
- AC_MSG_RESULT(yes when available)
- AC_MSG_CHECKING(for linker mappings at /proc/self/maps)
- if test -e /proc/self/maps; then
- AC_MSG_RESULT(yes)
- enable_binreloc=yes
-
- AC_MSG_CHECKING(whether everything is installed to the same prefix)
- if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
- "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
- "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
- then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- AC_MSG_NOTICE(Binary relocation support will be disabled.)
- enable_binreloc=no
- fi
-
- else
- AC_MSG_RESULT(no)
- enable_binreloc=no
- fi
-
-elif test "$enable_binreloc" = "no"; then
- AC_MSG_RESULT(no)
-else
- AC_MSG_RESULT(no (unknown value "$enable_binreloc"))
- enable_binreloc=no
-fi
-if test "$enable_binreloc" = "yes"; then
- AC_DEFINE(ENABLE_BINRELOC,,[Use AutoPackage?])
-fi
-
-
-# GTK checks
-gtk_modules="gtk+-2.0 >= 2.8.0"
-PKG_CHECK_MODULES(GTK, [$gtk_modules])
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-# GIO checks
-gio_modules="gio-2.0 >= 2.16"
-PKG_CHECK_MODULES(GIO, [$gio_modules], have_gio=1, have_gio=0)
-AC_SUBST(GIO_CFLAGS)
-AC_SUBST(GIO_LIBS)
-if test $have_gio = 1 ; then
- AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available])
-fi
-
-# --disable-deprecated switch for GTK2 purification
-AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ],
- [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
-
-# Plugins support
-AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support [default=no]])], , enable_plugins=yes)
-
-if test "x$enable_plugins" = "xyes" ; then
- AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled.])
- AM_CONDITIONAL(PLUGINS, true)
-else
- AM_CONDITIONAL(PLUGINS, false)
-fi
-
-# Use included GNU regex library
-AC_ARG_ENABLE(gnu-regex, [AC_HELP_STRING([--enable-gnu-regex], [compile with included GNU regex library [default=no]])], , enable_gnu_regex=no)
-
-if test "x$enable_gnu_regex" = "xyes" ; then
- AC_DEFINE(USE_INCLUDED_REGEX, 1, [Define if included GNU regex code should be used.])
- AC_DEFINE(HAVE_REGCOMP, 1, [Define if you have the 'regcomp' function.])
- AM_CONDITIONAL(USE_INCLUDED_REGEX, true)
-else
- AM_CONDITIONAL(USE_INCLUDED_REGEX, false)
-fi
-
-case "${host}" in
- *mingw*)
- AC_CHECK_LIB(iberty, fnmatch, [], [
- AC_MSG_ERROR([fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details.])
- ])
- AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32])
- want_vte="no"
- want_socket="yes"
- AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance])
- AC_EXEEXT
- AM_CONDITIONAL(MINGW, true)
- ;;
- *)
- AM_CONDITIONAL(MINGW, false)
- ;;
-esac
-
-dnl skip check if already decided
-if test "x$want_socket" = "x"; then
- # socket support
- AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]),
- [want_socket="$enableval"], [want_socket="yes"])
-
- if test "x$want_socket" = "xyes"; then
- AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance])
- # this should bring in libsocket on Solaris:
- AC_SEARCH_LIBS([connect],[socket],[],[],[])
- fi
-fi
-
-dnl skip check if already decided
-if test "x$want_vte" = "x"; then
- # VTE support
- AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte],
- [enable if you want virtual terminal support [[default=yes]]]),
- [want_vte="$enableval"], [want_vte="yes"])
- if test "x$want_vte" = "xyes"; then
- AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support])
- fi
- AC_ARG_WITH(vte-module-path, AC_HELP_STRING([--with-vte-module-path=PATH],
- [Path to a loadable libvte [[default=None]]]), [AC_DEFINE_UNQUOTED([VTE_MODULE_PATH],
- ["$withval"], [Path to a loadable libvte])])
-fi
-
-GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
-
-
-# GTK 2.10 printing support
-$PKG_CONFIG --exists 'gtk+-2.0 >= 2.10.0'
-if test "x$?" = "x0" ; then
- enable_printing="yes"
-else
- enable_printing="no (GTK >= 2.10 necessary)"
-fi
-
-
-# just for a laugh (it has absolutely no effect)
-AC_ARG_ENABLE(the-force, AC_HELP_STRING([--enable-the-force],
- [enable if you are Luke Skywalker and the force is with you [[default=no]]]), [be_luke="$enableval"], [be_luke="no"])
-AC_MSG_CHECKING([whether the force is with you])
-if test "x$be_luke" = "xyes"; then
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-
-# i18n
-GETTEXT_PACKAGE=geany
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-
-ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS
-
-AM_GLIB_GNU_GETTEXT
-# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845)
-if test "x$MSGFMT" = "xno"; then
- AC_MSG_ERROR([msgfmt not found. Please install the gettext package.])
-fi
-
-
-# libSM for X session management
-SM_LIBS=""
-AC_ARG_ENABLE(libsm,
- [ --enable-libsm enable X session management support [[]]],
- [enable_libsm=$enableval], [enable_libsm=yes])
-AC_MSG_CHECKING([whether to use LibSM])
-if test x"$enable_libsm" = xyes; then
- AC_MSG_RESULT(yes)
- AC_CHECK_HEADERS(X11/SM/SMlib.h, [SM_LIBS="-lSM -lICE"], enable_libsm=no)
- if test x"$enable_libsm" = xyes; then
- AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed])
- else
- AC_MSG_WARN([X session management will not be supported])
- fi
-else
- AC_MSG_RESULT(no)
-fi
-AC_SUBST(SM_LIBS)
-
-
-# Set ${datadir}
-if test "x${datadir}" = 'x${prefix}/share' -o "x${datarootdir}" = 'x${prefix}/share'; then
- if test "x${prefix}" = "xNONE"; then
- prefix=${ac_default_prefix}
- fi
-fi
-
-# Set ${docdir} if it is empty
-if test -z "${docdir}"; then
- docdir='${datadir}/doc/${PACKAGE}'
- AC_SUBST(docdir)
-fi
-
-GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`
-AC_SUBST(GEANY_DATA_DIR)
-
-# intltool hack to define install_sh on Debian/Ubuntu systems
-if test "x$install_sh" = "x"; then
- install_sh="`pwd`/install-sh"
- AC_SUBST(install_sh)
-fi
-
-AC_OUTPUT([
-Makefile
-icons/Makefile
-icons/16x16/Makefile
-icons/48x48/Makefile
-icons/scalable/Makefile
-tagmanager/Makefile
-tagmanager/include/Makefile
-scintilla/Makefile
-scintilla/include/Makefile
-src/Makefile
-plugins/Makefile
-po/Makefile.in
-doc/Makefile
-doc/geany.1
-geany.spec
-geany.pc
-doc/Doxyfile
-])
-
-echo "----------------------------------------"
-echo "Install Geany in : ${prefix}"
-if test "x${build}" != "x" -a "x${target}" != "x"
-then
- echo "Building Geany on : ${build}"
- echo "Building Geany for : ${target}"
-fi
-echo "Using GTK version : ${GTK_VERSION}"
-echo "Build with GTK printing support : ${enable_printing}"
-echo "Build with plugin support : ${enable_plugins}"
-echo "Build with X session management support : ${enable_libsm}"
-echo "Use virtual terminal support : ${want_vte}"
-echo "Use (UNIX domain) socket support : ${want_socket}"
-if test "${REVISION}" != "-1"
-then
- echo "Compiling Subversion revision : ${REVISION}"
-fi
-echo ""
-echo "Configuration is done OK."
-echo ""
Modified: branches/sm/data/filetypes.common
===================================================================
--- branches/sm/data/filetypes.common 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/data/filetypes.common 2010-05-31 09:23:04 UTC (rev 4968)
@@ -57,8 +57,8 @@
white_space=0xc0c0c0;0xffffff;true;false
# style of folding icons, valid values are:
-# first argument: 1 for boxes, 2 for circles
-# second argument: 1 for straight lines, 2 for curved lines
+# first argument: 1 for boxes, 2 for circles, 3 for arrows, 4 for +/-
+# second argument: 1 for straight lines, 2 for curved lines or 0 for none
folding_style=1;1;
# should an horizontal line be drawn at the line where text is folded
@@ -73,7 +73,7 @@
# second argument: whether the visual flags to indicate a line is wrapped are drawn near the border
# or near the text. This is a bitmask of the values: 0 - Visual flags drawn near border,
# 1 - Visual flag at end of subline drawn near text, 2 - Visual flag at begin of subline drawn near text
-line_wrap_visuals=3;0;
+line_wrap_visuals=1;0;
# first argument: sets the size of indentation of sublines for wrapped lines in terms of
# the width of a space, only used when the second argument is 0
@@ -88,6 +88,10 @@
# second argument: amount of space to be drawn below the line's baseline
line_height=0;0;
+# 3rd argument is true to override default foreground of calltips
+# 4th argument is true to override default background of calltips
+calltips=0xc0c0c0;0xffffff;false;false
+
[settings]
# which characters should be skipped when moving (or included when deleting) to word boundaries
# should always include space and tab (\s\t)
Modified: branches/sm/data/filetypes.java
===================================================================
--- branches/sm/data/filetypes.java 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/data/filetypes.java 2010-05-31 09:23:04 UTC (rev 4968)
@@ -26,7 +26,7 @@
[keywords]
primary=abstract assert break case catch class const continue default do else extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static super switch synchronized this throw throws transient try var volatile while true false null
-secondary=boolean byte char double float int long null short void
+secondary=boolean byte char double float int long short void
# documentation keywords for javadoc
doccomment=author deprecated exception param return see serial serialData serialField since throws todo version
typedefs=
Modified: branches/sm/data/filetypes.javascript
===================================================================
--- branches/sm/data/filetypes.javascript 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/data/filetypes.javascript 2010-05-31 09:23:04 UTC (rev 4968)
@@ -26,7 +26,8 @@
[keywords]
# all items must be in one line
-primary=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with
+primary=break case catch const continue delete else eval false finally for function if in try instanceof isFinite isNaN NaN new null return switch this throw true typeof undefined var while with default let
+secondary=Object Function Array prototype
[settings]
# default extension used when saving files
Modified: branches/sm/data/filetypes.perl
===================================================================
--- branches/sm/data/filetypes.perl 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/data/filetypes.perl 2010-05-31 09:23:04 UTC (rev 4968)
@@ -72,13 +72,14 @@
# %e will be replaced by the filename without extension
# (use only one of it at one time)
-# B - The Perl Bytecode Compiler (requires Perl 5.8 or higher)
-compiler=perl -MO=Bytecode,-H,-o"%f"c "%f"
+compiler=perl -cw "%f"
# alternatively use perlcc
#compiler=perlcc -o "%e" "%f"
-# instead of actual compiling, just run a nice syntax check
-#compiler=perl -c "%f"
+run_cmd=perl "%f"
-run_cmd=perl "%f"
+# Parse syntax check error messages and warnings, examples:
+# syntax error at test.pl line 7, near "{
+# Unknown warnings category '1' at test.pl line 13
+error_regex=.+ at (.+) line ([0-9]+).*
Modified: branches/sm/data/filetypes.python
===================================================================
--- branches/sm/data/filetypes.python 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/data/filetypes.python 2010-05-31 09:23:04 UTC (rev 4968)
@@ -15,14 +15,15 @@
identifier=0x000000;0xffffff;false;false
commentblock=0x808080;0xffffff;false;false
stringeol=0x000000;0xe0c0e0;false;false
-word2=0xdd00a6;0xffffff;true;false
+word2=0x9f0200;0xffffff;false;false
decorator=0x808000;0xffffff;false;false
[keywords]
# all items must be in one line
primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True
# additional keywords, will be highlighted with style "word2"
-identifiers=
+# these are the builtins for Python 2.5 created with ' '.join(dir(__builtins__))
+identifiers=ArithmeticError AssertionError AttributeError BaseException DeprecationWarning EOFError Ellipsis EnvironmentError Exception False FloatingPointError FutureWarning GeneratorExit IOError ImportError ImportWarning IndentationError IndexError KeyError KeyboardInterrupt LookupError MemoryError NameError None NotImplemented NotImplementedError OSError OverflowError PendingDeprecationWarning ReferenceError RuntimeError RuntimeWarning StandardError StopIteration SyntaxError SyntaxWarning SystemError SystemExit TabError True TypeError UnboundLocalError UnicodeDecodeError UnicodeEncodeError UnicodeError UnicodeTranslateError UnicodeWarning UserWarning ValueError Warning ZeroDivisionError _ __debug__ __doc__ __import__ __name__ abs all any apply basestring bool buffer callable chr classmethod cmp coerce compile complex copyright credits delattr dict dir divmod enumerate eval execfile exit file filter float frozenset getattr globals hasattr hash help hex id input int intern isinstance issubclass iter len license list locals long map max min object oct open ord pow property quit range raw_input reduce reload repr reversed round set setattr slice sorted staticmethod str sum super tuple type unichr unicode vars xrange zip
[lexer_properties]
fold.comment.python=1
Modified: branches/sm/data/filetypes.r
===================================================================
--- branches/sm/data/filetypes.r 2010-05-31 09:15:54 UTC (rev 4967)
+++ branches/sm/data/filetypes.r 2010-05-31 09:23:04 UTC (rev 4968)
@@ -14,15 +14,15 @@
# "blah" string
string=0xff901e;0xffffff;false;false
# 'blah' string
-string2=0x008000;0xffffff;false;false
+string2=0xff901e;0xffffff;false;false
identifier=0x000000;0xffffff;false;false
infix=0x008000;0xffffff;false;false
infixeol=0x000000;0xe0c0e0;false;false
[keywords]
# all items must be in one line
-primary=abs array break data.frame diag else FALSE for function if in Inf matrix NA NaN NCOL next NROW NULL print read.table repeat require return solve source sqrt sum TRUE while
-package=abbreviate abline abs acf acos acosh addmargins aggregate agrep alarm alias alist all anova any aov aperm append apply approx approxfun apropos ar args arima array arrows asin asinh assign assocplot atan atanh attach attr attributes autoload autoloader ave axis backsolve barplot basename beta bindtextdomain binomial biplot bitmap bmp body box boxplot bquote break browser builtins bxp by bzfile c call cancor capabilities casefold cat category cbind ccf ceiling character charmatch chartr chol choose chull citation class close cm cmdscale codes coef coefficients col colnames colors colorspaces colours comment complex confint conflicts contour contrasts contributors convolve cophenetic coplot cor cos cosh cov covratio cpgram crossprod cummax cummin cumprod cumsum curve cut cutree cycle data dataentry date dbeta dbinom dcauchy dchisq de debug debugger decompose delay deltat demo dendrapply density deparse deriv det detach determinant deviance dexp df dfbeta dfbetas dffits dgamma dgeom dget dhyper diag diff diffinv difftime digamma dim dimnames dir dirname dist dlnorm dlogis dmultinom dnbinom dnorm dotchart double dpois dput drop dsignrank dt dump dunif duplicated dweibull dwilcox eapply ecdf edit effects eigen emacs embed end environment eval evalq example exists exp expression factanal factor factorial family fft fifo file filter find fitted fivenum fix floor flush for force formals format formula forwardsolve fourfoldplot frame frequency ftable function gamma gaussian gc gcinfo gctorture get getenv geterrmessage gettext gettextf getwd gl glm globalenv gray grep grey grid gsub gzcon gzfile hat hatvalues hcl hclust head heatmap help hist history hsv httpclient iconv iconvlist identical identify if ifelse image influence inherits integer integrate interaction interactive intersect invisible isoreg jitter jpeg julian kappa kernapply kernel kmeans knots kronecker ksmooth labels lag lapply layout lbeta lchoose lcm legend length letters levels lfactorial lgamma library licence license line lines list lm load loadhistory loadings local locator loess log logb logical loglin lowess ls lsfit machine mad mahalanobis makepredictcall manova mapply match matlines matplot matpoints matrix max mean median medpolish menu merge message methods mget min missing mode monthplot months mosaicplot mtext mvfft names napredict naprint naresid nargs nchar ncol next nextn ngettext nlevels nlm nls noquote nrow numeric objects offset open optim optimise optimize options order ordered outer pacf page pairlist pairs palette par parse paste pbeta pbinom pbirthday pcauchy pchisq pdf pentagamma person persp pexp pf pgamma pgeom phyper pi pico pictex pie piechart pipe plclust plnorm plogis plot pmatch pmax pmin pnbinom png pnorm points poisson poly polygon polym polyroot postscript power ppoints ppois ppr prcomp predict preplot pretty princomp print prmatrix prod profile profiler proj promax prompt provide psigamma psignrank pt ptukey punif pweibull pwilcox q qbeta qbinom qbirthday qcauchy qchisq qexp qf qgamma qgeom qhyper qlnorm qlogis qnbinom qnorm qpois qqline qqnorm qqplot qr qsignrank qt qtukey quantile quarters quasi quasibinomial quasipoisson quit qunif quote qweibull qwilcox rainbow range rank raw rbeta rbind rbinom rcauchy rchisq readline real recover rect reformulate regexpr relevel remove reorder rep repeat replace replicate replications require reshape resid residuals restart return rev rexp rf rgamma rgb rgeom rhyper rle rlnorm rlogis rm rmultinom rnbinom rnorm round row rownames rowsum rpois rsignrank rstandard rstudent rt rug runif runmed rweibull rwilcox sample sapply save savehistory scale scan screen screeplot sd search searchpaths seek segments seq sequence serialize setdiff setequal setwd shell sign signif sin single sinh sink smooth solve sort source spectrum spline splinefun split sprintf sqrt stack stars start stderr stdin stdout stem step stepfun stl stop stopifnot str strftime strheight stripchart strptime strsplit strtrim structure strwidth strwrap sub subset substitute substr substring sum summary sunflowerplot supsmu svd sweep switch symbols symnum system t table tabulate tail tan tanh tapply tempdir tempfile termplot terms tetragamma text time title toeplitz tolower topenv toupper trace traceback transform trigamma trunc truncate try ts tsdiag tsp typeof unclass undebug union unique uniroot unix unlink unlist unname unserialize unsplit unstack untrace unz update upgrade url var varimax vcov vector version vi vignette warning warnings weekdays weights which while window windows with write wsbrowser xedit xemacs xfig xinch xor xtabs xyinch yinch zapsmall
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.