Commits February 2011

commits@lists.geany.org

4 participants
16 discussions

SF.net SVN: geany:[5550] branches/sm
by statc＠users.sourceforge.net 27 Feb '11

27 Feb '11

Revision: 5550 http://geany.svn.sourceforge.net/geany/?rev=5550&view=rev Author: statc Date: 2011-02-27 08:57:20 +0000 (Sun, 27 Feb 2011) Log Message: ----------- Merge trunk (revisions 5066..5521) Modified Paths: -------------- branches/sm/AUTHORS branches/sm/ChangeLog branches/sm/HACKING branches/sm/Makefile.am branches/sm/NEWS branches/sm/THANKS branches/sm/TODO branches/sm/autogen.sh branches/sm/configure.ac branches/sm/data/filetype_extensions.conf branches/sm/data/filetypes.Genie.conf branches/sm/data/filetypes.actionscript branches/sm/data/filetypes.ada branches/sm/data/filetypes.asm branches/sm/data/filetypes.c branches/sm/data/filetypes.caml branches/sm/data/filetypes.cmake branches/sm/data/filetypes.common branches/sm/data/filetypes.conf branches/sm/data/filetypes.cpp branches/sm/data/filetypes.cs branches/sm/data/filetypes.css branches/sm/data/filetypes.d branches/sm/data/filetypes.diff branches/sm/data/filetypes.docbook branches/sm/data/filetypes.f77 branches/sm/data/filetypes.ferite branches/sm/data/filetypes.fortran branches/sm/data/filetypes.freebasic branches/sm/data/filetypes.glsl branches/sm/data/filetypes.haskell branches/sm/data/filetypes.haxe branches/sm/data/filetypes.html branches/sm/data/filetypes.java branches/sm/data/filetypes.javascript branches/sm/data/filetypes.latex branches/sm/data/filetypes.lua branches/sm/data/filetypes.makefile branches/sm/data/filetypes.markdown branches/sm/data/filetypes.matlab branches/sm/data/filetypes.nsis branches/sm/data/filetypes.pascal branches/sm/data/filetypes.perl branches/sm/data/filetypes.php branches/sm/data/filetypes.po branches/sm/data/filetypes.python branches/sm/data/filetypes.r branches/sm/data/filetypes.restructuredtext branches/sm/data/filetypes.ruby branches/sm/data/filetypes.sh branches/sm/data/filetypes.sql branches/sm/data/filetypes.tcl branches/sm/data/filetypes.txt2tags branches/sm/data/filetypes.vala branches/sm/data/filetypes.verilog branches/sm/data/filetypes.vhdl branches/sm/data/filetypes.xml branches/sm/data/snippets.conf branches/sm/doc/Makefile.am branches/sm/doc/geany.html branches/sm/doc/geany.txt branches/sm/doc/pluginsignals.c branches/sm/doc/pluginsymbols.c branches/sm/doc/stash-example.c branches/sm/geany.glade branches/sm/geany.nsi branches/sm/geany_private.rc branches/sm/plugins/geanyfunctions.h branches/sm/plugins/htmlchars.c branches/sm/plugins/saveactions.c branches/sm/plugins/splitwindow.c branches/sm/po/ChangeLog branches/sm/po/POTFILES.skip branches/sm/po/ast.po 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/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/Makefile.am branches/sm/scintilla/include/Makefile.am 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/makefile.win32 branches/sm/scintilla/scintilla_changes.patch branches/sm/scripts/changelist.pl branches/sm/scripts/svn-add.sh branches/sm/scripts/svn-changes.sh branches/sm/src/Makefile.am branches/sm/src/about.c 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/editor.c branches/sm/src/editor.h branches/sm/src/encodings.c branches/sm/src/filetypes.c branches/sm/src/filetypes.h branches/sm/src/geanyobject.c branches/sm/src/geanyobject.h branches/sm/src/geanywraplabel.c branches/sm/src/highlighting.c branches/sm/src/highlighting.h branches/sm/src/interface.c branches/sm/src/keybindings.c branches/sm/src/keybindings.h branches/sm/src/keyfile.c branches/sm/src/log.c branches/sm/src/main.c branches/sm/src/msgwindow.c branches/sm/src/msgwindow.h branches/sm/src/notebook.c branches/sm/src/plugindata.h branches/sm/src/plugins.c branches/sm/src/prefs.c branches/sm/src/printing.c branches/sm/src/project.c branches/sm/src/project.h branches/sm/src/search.c branches/sm/src/search.h branches/sm/src/sidebar.c branches/sm/src/stash.c branches/sm/src/symbols.c branches/sm/src/templates.c branches/sm/src/toolbar.c branches/sm/src/tools.c 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/tagmanager/args.c branches/sm/tagmanager/basic.c branches/sm/tagmanager/c.c branches/sm/tagmanager/get.c branches/sm/tagmanager/lregex.c branches/sm/tagmanager/make.c branches/sm/tagmanager/options.c branches/sm/tagmanager/php.c branches/sm/tagmanager/python.c branches/sm/tagmanager/tm_file_entry.c branches/sm/tagmanager/tm_symbol.c branches/sm/tagmanager/tm_workspace.c branches/sm/waf branches/sm/win32-config.h branches/sm/wscript Added Paths: ----------- branches/sm/COMMITTERS branches/sm/data/colorschemes/ branches/sm/data/colorschemes/alt.conf branches/sm/data/filetypes.erlang branches/sm/data/filetypes.forth branches/sm/data/filetypes.lisp branches/sm/doc/making-a-release branches/sm/doc/stash-gui-example.c branches/sm/po/kk.po branches/sm/scintilla/README branches/sm/scintilla/gtk/ branches/sm/scintilla/gtk/Converter.h branches/sm/scintilla/gtk/PlatGTK.cxx branches/sm/scintilla/gtk/ScintillaGTK.cxx branches/sm/scintilla/gtk/scintilla-marshal.c branches/sm/scintilla/gtk/scintilla-marshal.h branches/sm/scintilla/gtk/scintilla-marshal.list branches/sm/scintilla/include/ILexer.h branches/sm/scintilla/lexers/ branches/sm/scintilla/lexers/LexAda.cxx branches/sm/scintilla/lexers/LexAsm.cxx branches/sm/scintilla/lexers/LexBash.cxx branches/sm/scintilla/lexers/LexBasic.cxx branches/sm/scintilla/lexers/LexCPP.cxx branches/sm/scintilla/lexers/LexCSS.cxx branches/sm/scintilla/lexers/LexCaml.cxx branches/sm/scintilla/lexers/LexCmake.cxx branches/sm/scintilla/lexers/LexD.cxx branches/sm/scintilla/lexers/LexErlang.cxx branches/sm/scintilla/lexers/LexForth.cxx branches/sm/scintilla/lexers/LexFortran.cxx branches/sm/scintilla/lexers/LexHTML.cxx branches/sm/scintilla/lexers/LexHaskell.cxx branches/sm/scintilla/lexers/LexLisp.cxx branches/sm/scintilla/lexers/LexLua.cxx branches/sm/scintilla/lexers/LexMarkdown.cxx branches/sm/scintilla/lexers/LexMatlab.cxx branches/sm/scintilla/lexers/LexNsis.cxx branches/sm/scintilla/lexers/LexOthers.cxx branches/sm/scintilla/lexers/LexPascal.cxx branches/sm/scintilla/lexers/LexPerl.cxx branches/sm/scintilla/lexers/LexPython.cxx branches/sm/scintilla/lexers/LexR.cxx branches/sm/scintilla/lexers/LexRuby.cxx branches/sm/scintilla/lexers/LexSQL.cxx branches/sm/scintilla/lexers/LexTCL.cxx branches/sm/scintilla/lexers/LexTxt2tags.cxx branches/sm/scintilla/lexers/LexVHDL.cxx branches/sm/scintilla/lexers/LexVerilog.cxx branches/sm/scintilla/lexers/LexYAML.cxx branches/sm/scintilla/lexlib/ branches/sm/scintilla/lexlib/Accessor.cxx branches/sm/scintilla/lexlib/Accessor.h branches/sm/scintilla/lexlib/CharacterSet.cxx branches/sm/scintilla/lexlib/CharacterSet.h branches/sm/scintilla/lexlib/LexAccessor.h branches/sm/scintilla/lexlib/LexerBase.cxx branches/sm/scintilla/lexlib/LexerBase.h branches/sm/scintilla/lexlib/LexerModule.cxx branches/sm/scintilla/lexlib/LexerModule.h branches/sm/scintilla/lexlib/LexerNoExceptions.cxx branches/sm/scintilla/lexlib/LexerNoExceptions.h branches/sm/scintilla/lexlib/LexerSimple.cxx branches/sm/scintilla/lexlib/LexerSimple.h branches/sm/scintilla/lexlib/OptionSet.h branches/sm/scintilla/lexlib/PropSetSimple.cxx branches/sm/scintilla/lexlib/PropSetSimple.h branches/sm/scintilla/lexlib/StyleContext.cxx branches/sm/scintilla/lexlib/StyleContext.h branches/sm/scintilla/lexlib/WordList.cxx branches/sm/scintilla/lexlib/WordList.h branches/sm/scintilla/src/ branches/sm/scintilla/src/AutoComplete.cxx branches/sm/scintilla/src/AutoComplete.h branches/sm/scintilla/src/CallTip.cxx branches/sm/scintilla/src/CallTip.h branches/sm/scintilla/src/Catalogue.cxx branches/sm/scintilla/src/Catalogue.h branches/sm/scintilla/src/CellBuffer.cxx branches/sm/scintilla/src/CellBuffer.h branches/sm/scintilla/src/CharClassify.cxx branches/sm/scintilla/src/CharClassify.h branches/sm/scintilla/src/ContractionState.cxx branches/sm/scintilla/src/ContractionState.h branches/sm/scintilla/src/Decoration.cxx branches/sm/scintilla/src/Decoration.h branches/sm/scintilla/src/Document.cxx branches/sm/scintilla/src/Document.h branches/sm/scintilla/src/Editor.cxx branches/sm/scintilla/src/Editor.h branches/sm/scintilla/src/ExternalLexer.cxx branches/sm/scintilla/src/ExternalLexer.h branches/sm/scintilla/src/FontQuality.h branches/sm/scintilla/src/Indicator.cxx branches/sm/scintilla/src/Indicator.h branches/sm/scintilla/src/KeyMap.cxx branches/sm/scintilla/src/KeyMap.h branches/sm/scintilla/src/LineMarker.cxx branches/sm/scintilla/src/LineMarker.h branches/sm/scintilla/src/Partitioning.h branches/sm/scintilla/src/PerLine.cxx branches/sm/scintilla/src/PerLine.h branches/sm/scintilla/src/PositionCache.cxx branches/sm/scintilla/src/PositionCache.h branches/sm/scintilla/src/RESearch.cxx branches/sm/scintilla/src/RESearch.h branches/sm/scintilla/src/RunStyles.cxx branches/sm/scintilla/src/RunStyles.h branches/sm/scintilla/src/SVector.h branches/sm/scintilla/src/ScintillaBase.cxx branches/sm/scintilla/src/ScintillaBase.h branches/sm/scintilla/src/Selection.cxx branches/sm/scintilla/src/Selection.h branches/sm/scintilla/src/SplitVector.h branches/sm/scintilla/src/Style.cxx branches/sm/scintilla/src/Style.h branches/sm/scintilla/src/UniConversion.cxx branches/sm/scintilla/src/UniConversion.h branches/sm/scintilla/src/ViewStyle.cxx branches/sm/scintilla/src/ViewStyle.h branches/sm/scintilla/src/XPM.cxx branches/sm/scintilla/src/XPM.h branches/sm/src/filetypesprivate.h Removed Paths: ------------- branches/sm/po/geany.pot 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/CharacterSet.h branches/sm/scintilla/ContractionState.cxx branches/sm/scintilla/ContractionState.h branches/sm/scintilla/Converter.h branches/sm/scintilla/Decoration.cxx branches/sm/scintilla/Decoration.h branches/sm/scintilla/Document.cxx branches/sm/scintilla/Document.h branches/sm/scintilla/DocumentAccessor.cxx 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/Indicator.cxx branches/sm/scintilla/Indicator.h branches/sm/scintilla/KeyMap.cxx branches/sm/scintilla/KeyMap.h branches/sm/scintilla/KeyWords.cxx branches/sm/scintilla/LexAda.cxx branches/sm/scintilla/LexAsm.cxx branches/sm/scintilla/LexBash.cxx branches/sm/scintilla/LexBasic.cxx branches/sm/scintilla/LexCPP.cxx branches/sm/scintilla/LexCSS.cxx branches/sm/scintilla/LexCaml.cxx branches/sm/scintilla/LexCmake.cxx branches/sm/scintilla/LexD.cxx branches/sm/scintilla/LexFortran.cxx branches/sm/scintilla/LexHTML.cxx branches/sm/scintilla/LexHaskell.cxx branches/sm/scintilla/LexLua.cxx branches/sm/scintilla/LexMarkdown.cxx branches/sm/scintilla/LexMatlab.cxx branches/sm/scintilla/LexNsis.cxx branches/sm/scintilla/LexOthers.cxx branches/sm/scintilla/LexPascal.cxx branches/sm/scintilla/LexPerl.cxx branches/sm/scintilla/LexPython.cxx branches/sm/scintilla/LexR.cxx branches/sm/scintilla/LexRuby.cxx branches/sm/scintilla/LexSQL.cxx branches/sm/scintilla/LexTCL.cxx branches/sm/scintilla/LexVHDL.cxx branches/sm/scintilla/LexVerilog.cxx branches/sm/scintilla/LexYAML.cxx branches/sm/scintilla/LineMarker.cxx branches/sm/scintilla/LineMarker.h branches/sm/scintilla/Partitioning.h branches/sm/scintilla/PerLine.cxx branches/sm/scintilla/PerLine.h branches/sm/scintilla/PlatGTK.cxx branches/sm/scintilla/PositionCache.cxx branches/sm/scintilla/PositionCache.h branches/sm/scintilla/PropSet.cxx branches/sm/scintilla/PropSetSimple.h branches/sm/scintilla/RESearch.cxx branches/sm/scintilla/RESearch.h branches/sm/scintilla/RunStyles.cxx branches/sm/scintilla/RunStyles.h branches/sm/scintilla/SVector.h branches/sm/scintilla/ScintillaBase.cxx branches/sm/scintilla/ScintillaBase.h branches/sm/scintilla/ScintillaGTK.cxx branches/sm/scintilla/Selection.cxx branches/sm/scintilla/Selection.h branches/sm/scintilla/SplitVector.h branches/sm/scintilla/Style.cxx branches/sm/scintilla/Style.h branches/sm/scintilla/StyleContext.cxx 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/WindowAccessor.cxx branches/sm/scintilla/XPM.cxx branches/sm/scintilla/XPM.h branches/sm/scintilla/include/Accessor.h branches/sm/scintilla/include/KeyWords.h branches/sm/scintilla/include/PropSet.h branches/sm/scintilla/include/SString.h branches/sm/scintilla/include/WindowAccessor.h branches/sm/scintilla/scintilla-marshal.c branches/sm/scintilla/scintilla-marshal.h branches/sm/scintilla/scintilla-marshal.list Modified: branches/sm/AUTHORS =================================================================== --- branches/sm/AUTHORS 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/AUTHORS 2011-02-27 08:57:20 UTC (rev 5550) @@ -1,3 +1,12 @@ +Developers: +----------- + +Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Enrico Troeger <enrico(dot)troeger(at)uvena(dot)de> -Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + +Regular Contributors: +--------------------- + +Lex Trotman <elextr<at>gmail<dot>com> +Eugene Arshinov <earshinov(at)gmail(dot)com> Added: branches/sm/COMMITTERS =================================================================== --- branches/sm/COMMITTERS (rev 0) +++ branches/sm/COMMITTERS 2011-02-27 08:57:20 UTC (rev 5550) @@ -0,0 +1,10 @@ +Developer SF Username Role/Position +---------------------------------------------------------------------- +Enrico Tröger eht16 Maintainer +Nick Treleaven ntrel Maintainer +Frank Lanitz frlan Translation Maintainer (I18N/L10N) +Lex Trotman elextr Developer +Dominic Hopf dmaphy Developer +Eugene Arshinov statc Developer +Peter Scholtens peterscholtens Translator (I18N/L10N) +Clytie Siddall clytie Translator (I18N/L10N) Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/ChangeLog 2011-02-27 08:57:20 UTC (rev 5550) @@ -1,3 +1,1205 @@ +2011-01-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/toolbar.c, src/ui_utils.c, src/about.c, THANKS: + Add Save As toolbar button option (patch by Matthew Brush, thanks; + #3153490). + * scintilla/*, src/utils.c, src/notebook.c, + data/filetypes.cpp, data/filetypes.vala, data/filetypes.glsl, + data/filetypes.cs, data/filetypes.c, wscript: + Merge unstable branch: + - src/utils.c: + Fix detecting non-lowercase self-closing tags e.g. <BR> (#2226117). + - src/notebook.c: + Add 'Open in New Window' command in the notebook tab menu (based on + patch by Matthew Brush, thanks - #3118059). + - data/filetypes.cpp, data/filetypes.vala, data/filetypes.glsl, + data/filetypes.cs, data/filetypes.c: + Disable preprocessor #define tracking for the CPP lexer + (enabled by default in Scintilla). + - scintilla/*, wscript: + Update Scintilla to version 2.22. + Use Scintilla's directory structure mostly and only remove + unused lexers. + + +2011-01-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * New release: Geany 0.20 "Disra". + + +2011-01-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/plugins.c: + Add debug message with the number of compatible plugins in each + plugin search path when showing the Plugin Manager dialog. + + +2010-12-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * doc/geany.txt, doc/geany.html: + Move and update 'Custom filetypes' section. + Add 'Creating a custom filetype from an existing filetype' section. + + +2010-12-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, src/keybindings.c, geany.glade: + Add Edit->Insert Alternative White Space menu item (was previously + removed from Edit->Commands submenu). + + +2010-12-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, geany.glade: + Split Preferences dialog Interface tab into subnotebook to reduce + height of dialog (fixes #3141277). Reuses existing strings. + * src/editor.c: + Scroll to the current line when moving the cursor to the next + cursor position in a snippet (#3139490). + * doc/geany.txt, doc/geany.html: + Add short 'View menu' section and 'Color schemes menu' section. + * src/plugindata.h, src/plugins.c, plugins/geanyfunctions.h: + Add filetypes_get_display_name() to API. + + +2010-12-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c: + Reduce Set Build Commands dialog column 1 width by using '#' label. + Fix memory leak. + * src/build.c: + Use italic for note labels in the Build Commands dialog. + + +2010-12-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c, src/build.h: + Replace doc-comments with '/* *' comments to show there's no build + API for plugins. + + +2010-12-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keybindings.c, src/callbacks.c, src/vte.h, src/main.c: + Fix segfaults when using 'Send Selection to Terminal' and the VTE + is not loaded, and when using Ctrl-A after enabling the 'Load VTE' + pref (patch by Dimitar Zhekov, thanks). + * src/build.c, src/keyfile.c: + Fix some more wrong uses of vte_info.load_vte instead of + vte_info.have_vte. + * src/main.c: + Disable 'Send Selection to Terminal' item when not available + instead of removing it to avoid trailing separator. + * doc/geany.txt, doc/geany.html: + Add 'Configuration file paths' section and link to it instead of + repeating typical system data and user config directory paths. + List 2 Tools->Configuration Files menu items. + Add 'Plugin Manager' section break. + Edit some related sections. + * doc/geany.txt, doc/geany.html: + Update Ignore Tags section with example and menu item. + * doc/geany.txt, doc/geany.html: + List 'Tools->Configuration Files->filetypes.common' menu item. + + +2010-12-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/document.c: + Improve error message for document_save_file() if doc->file_name is + NULL (reusing existing strings). + Add warning about this in the API docs. + + +2010-12-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * scintilla/ScintillaGTK.cxx: + Backport Scintilla HG fix: Remove styling idle in destructor to + avoid crashing when idle called after ScintillaGTK instance + destroyed (fixes #3111058). + This prevents a crash when closing a modified document (usually + without a trailing newline) and choosing Save. + + +2010-12-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/document.c: + Warn about file truncation if unsafe file saving fails. + + +2010-11-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c: + Check result of fclose() for utils_write_file(). + + +2010-11-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * win32-config.h: + Enable GIO and built-in regex support on Windows + when compiling without Waf. + + +2010-11-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * geany_private.rc: + Reformat and improve the Windows resource file. + + +2010-11-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * data/filetype_extensions.conf: + Add *.latex pattern. + * src/interface.c, geany.glade: + Add note to indentation prefs page about using Project->Apply + Default Indentation for currently open documents. + + +2010-11-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, src/keybindings.c, src/callbacks.c, + src/callbacks.h, geany.glade: + Add 'Mark All' Search menu command. + * src/symbols.c, doc/geany.txt, doc/geany.html: + If the current word's tag is on the current line, make Go to Tag + Definition look for a tag declaration instead, as this is more + useful. Likewise make Go to Tag Declaration search for a tag + definition in this case also. + * src/interface.c, doc/geany.txt, doc/geany.html, geany.glade: + Don't use 'Enable' in pref labels when unnecessary. + Rename XML/HTML tag autocompletion -> auto-closing. + * src/keyfile.c, src/document.c, src/document.h, doc/geany.txt, + doc/geany.html: + Add gio_unsafe_save_backup hidden pref (patch by Lex Trotman, + thanks). + * src/keybindings.c, src/editor.c, src/editor.h: + Add editor_get_prefs() instead of editor_get_long_line_*() + functions. This general function can be extended to support + various project and document overrides. + * src/keybindings.c, src/project.c, src/prefs.c, src/keyfile.c, + src/editor.c, src/editor.h: + Remove unnecessary 'global' from long line editor pref field names. + + +2010-11-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * doc/geany.txt, doc/geany.html: + Explain how to grep the source for Scintilla lexer properties. + * src/sidebar.c, src/callbacks.c, src/main.c: + Fix auto-displaying of sidebar tab bar when sidebar is reshown. + Only auto-display symbols and documents tabs when showing the + sidebar if there are no plugin tabs. + Don't hide the sidebar on startup if only plugin tabs are visible + (fixes #3101867). + * src/plugindata.h: + Make GEANY_API_VERSION, GEANY_ABI_VERSION macros instead of enums + so you can protect code with '#if GEANY_API_VERSION >= 200'. + * src/plugindata.h: + Warn about preprocessor testing GEANY_API_VERSION below 200 because + those tests will always fail. + + +2010-11-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/filetypes.xml: + Add 'instanceof' keyword for PHP (closes #3109330). + + +2010-11-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c, src/dialogs.c, src/dialogs.h, src/callbacks.c: + Re-focus Set Build Commands/Project dialogs after editing a build + command label. + Add 'parent' argument to some dialogs_show_input*() functions because + the dialog parent may not always be the main window. + * src/build.c, src/dialogs.c, src/callbacks.c: + Don't change default build command entry color when cancelling + label editing. + Make dialogs_show_input() return NULL when cancelled. + * tagmanager/php.c: + Parse PHP final functions (fixes #3111171). + * src/dialogs.c, src/plugindata.h, src/plugins.c, + plugins/geanyfunctions.h: + Add dialogs_show_input() to API. + + +2010-11-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c, doc/geany.txt, doc/geany.html: + Change 'Non-Filetype Commands' to 'Independent Commands' in the Set + Build Commands dialog. + * doc/geany.txt, doc/geany.html: + Use 'Filetype build commands' and 'Independent build commands'. + Fix saying project *independent* execute can only be set by hand. + + +2010-11-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keybindings.c, src/editor.c, src/editor.h: + Make Reflow Lines/Block command use the current indented block, not + the whole paragraph, which could have mixed indentation. + Fix memory leak and off-by-one bug on first line when using Select + Paragraph command. + * src/utils.c, src/highlighting.c, src/highlighting.h, + src/plugindata.h, src/plugins.c, src/editor.c, src/editor.h, + plugins/geanyfunctions.h: + Add API functions (patch by Eugene Arshinov, thanks): + Move editor.c: is_{string,comment,code}_style() functions to + highlighting.c, add to API. + Add editor_find_snippet(), editor_insert_snippet(), + utils_find_open_xml_tag() to API. + + +2010-11-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c, doc/geany.txt, doc/geany.html: + Don't use XML tag auto-indentation when '</' is to the right of the + cursor; allow auto-indentation when XML tag auto-closing is also + enabled. + * doc/geany.txt, doc/geany.html: + Rename 'Format' section 'Filetype configuration'. + + +2010-11-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * waf: + Update Waf to current SVN version. + + +2010-11-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * waf, wscript: + Update Waf to version 1.6.1. + Update wscript for new Waf version, make it Python 3 compatible. + + +2010-11-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/document.c: + Display better error messages when saving a document fails (patch by + Dimitar Zhekov, thanks). + * src/editor.c: + Fix wrong snippet indentation when original cursor line has + non-indentation whitespace (patch by david, thanks). + * doc/geany.txt, doc/geany.html, data/filetypes.php, + data/filetypes.docbook, data/filetypes.xml, data/filetypes.html: + Enable XML tag autoindentation for PHP, Docbook and add docs for + this setting (patch by Eugene Arshinov, thanks). + + +2010-11-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/templates.c, src/document.c: + Use LF line endings for templates internally instead of default + pref because the default can change. This fixes missing line + endings sometimes when changing default setting. + * src/document.c: + Fix not reporting an error message when saving a document fails. + Check result of fclose(). + * src/filetypesprivate.h, src/filetypes.c, src/editor.c, + data/filetypes.xml, data/filetypes.html: + Add xml_indent_tags filetype setting for documents using the + HTML/XML lexers (patch by Eugene Arshinov, thanks). + * src/document.c: + Set errno to 0 before doing disk I/O to prevent confusing error + messages on save failure. + + +2010-11-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/templates.c, src/filetypes.c: + Save build commands for filetype None (patch by Lex, thanks). + Make filetypes_get_conf_extension() return "common" for filetype + None. + * src/templates.c: + Convert line endings for file templates. + Fix line endings when using file header template in a file template + (oops). + * src/utils.c, src/utils.h: + Make utils_ensure_same_eol_characters() convert all wrong line + endings to the desired one, not just the most common one. + + +2010-11-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Respect 'Smart' home key for Shift+Alt+Home (patch by Dimitar + Zhekov, thanks). + * src/interface.c, src/keybindings.c, src/ui_utils.c, geany.glade: + Restore top-level editor popup item 'Find Document Usage'. + * src/interface.c, src/ui_utils.c, geany.glade: + Remove duplicates in 'Insert Comments' editor popup menu; rename + submenu 'More'. + Separate main menu insertion comments depending on number of times + used in a document. + * data/filetypes.*, data/colorschemes/alt.conf: + Rename word/word2 named styles to keyword/keyword2. + * doc/geany.txt, doc/geany.html: + Mention that indentation settings can be overridden per-project. + * src/interface.c, src/callbacks.c, src/callbacks.h, src/document.c, + doc/geany.txt, doc/geany.html, geany.glade: + Add 'Project->Apply Default Indentation' menu command to override + every document's indentation settings. + Improve 'Indentation' section docs. + + +2010-11-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/document.c: + Fix build with GTK 2.12: explicitly include gio.h if GIO + is available and to be used regardless of the USE_GIO_FILEMON flag. + * wscript: + Fix installation of template files. + Show which regex implementation is used. + * src/ui_utils.c: + Use non-GIO mime-type icon lookup if GIO lookup fails. + * autogen.sh: + Allow skipping configure during autogen by setting NOCONFIGURE=1 + (thanks to Chow Loong Jin). + + +2010-11-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/document.c: + Make use_safe_file_saving hidden pref apply even when GIO is + available, because g_file_replace_contents() doesn't handle disk + space exhaustion. + * src/main.c: + Show GIO/built-in regex support in startup debug message as well as + for --version. + * doc/geany.txt, doc/geany.html: + Add docs for the HTMLChars plugin (patch by Frank). + + +2010-11-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/filetypes.c: + Do not translate 'name' field for filetype None because it is used + for hash table lookup. This fixes missing files in the Open dialog + for the 'All files' filter with non-English locales (thanks to Sardem + FF7, fixes #3094771). + * src/filetypes.c, src/filetypes.h, src/document.c, src/symbols.c, + src/ui_utils.c: + Add filetypes_get_display_name() to get translations for filetype + None. + * src/document.c: + Fix resource leak when saving files with GIO (patch by Colomban + Wendling, thanks). + + +2010-11-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/plugindata.h, src/plugins.c, plugins/geanyfunctions.h: + Add sci_get_lexer() to plugin API. + * plugins/htmlchars.c: + Only automatically replace characters when the current document is + a Markup document. + * plugins/htmlchars.c: + Rename submenu item labels to be more descriptive. + * src/keybindings.c: + Fix Alt+[0-9] switching tabs when other modifiers are also held. + * src/ui_utils.c: + Don't allow pasting of numbers followed by other characters in the + Go to Line dialog/field (patch by Dimitar Zhekov, thanks). + * src/main.c: + Print "GIO" and "built-in regex" if enabled with --version. + * src/document.c: + Use g_file_replace_contents() if available to save documents - this + should help workaround bugs in GVFS (based on patch by Alexey + Antipov, thanks). + Needs testing. + * src/templates.c: + Fix wrongly adding newlines for templates on disk that don't have + LF line endings when default line endings are not LF, e.g. Windows. + + +2010-11-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c, src/main.c: + Remove trailing directory separator for app->datadir and + app->docdir for consistency with the other directory fields. + * src/filetypes.c: + Detect user and system filetype configuration files as Conf + filetype. + * src/editor.c: + Respect 'Smart' home key for Shift+Home (fixes #3100290). + + +2010-11-01 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * data/filetypes.ada: + Fix comments for Ada. Thanks to Jonas Baggett for reporting. + + +2010-10-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * Makefile.am: + Add install-data-only target to only install data/* to speed up + testing. + * src/editor.c: + Fix not autocompleting when breaking lines. + * data/filetypes.java, data/filetypes.cpp, data/filetypes.vala, + data/colorschemes/alt.conf, data/filetypes.haxe, + data/filetypes.common, data/filetypes.glsl, + data/filetypes.actionscript, data/filetypes.cs, + data/filetypes.ferite, data/filetypes.c, data/filetypes.javascript, + data/filetypes.Genie.conf: + Add named style 'extra', use for C-like filetypes. + + +2010-10-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * data/filetypes.xml: + Match data-* and aria-* as HTML attributes. + * data/colorschemes/alt.conf, data/filetypes.common, + data/filetypes.python: + Make Python use named styles for color scheme support - use + alt.conf color scheme if you want the old colors. + Add named style 'function'. + * src/plugindata.h: + Move plugin_set_info prototype and parenthesize arguments for + PLUGIN_SET_TRANSLATABLE_INFO (based on patch by Colomban Wendling, + thanks). + Fix putting pointer symbol before name, not after type. + + +2010-10-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/filetypes.c, src/ui_utils.c: + Fix notebook tab menu icons using theme for "text/plain" filetypes. + Make filetype mime_type "text/plain" instead of NULL. + + +2010-10-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, doc/geany.txt, doc/geany.html, geany.glade: + Edit XML tag autocompletion pref and tooltip to include HTML. + * doc/geany.txt, doc/geany.html: + Add docs for 'Ensure consistent line endings' pref. + * src/keyfile.c: + Change default for 'Override Geany keybindings' to on. + * src/filetypes.c: + Sort filetypes_by_title last instead of on insertion to prevent + exponential time. + * src/ui_utils.h, src/filetypes.c, src/filetypes.h, src/ui_utils.c: + Add filetype mimetype field (patch by Colomban Wendling, thanks). + * src/sidebar.c, src/document.c: + Show mimetype icon in sidebar Documents list (patch by Colomban + Wendling, thanks). + * src/ui_utils.c: + Add notebook tab document icons (based on patch by Colomban + Wendling, thanks). + * src/filetypes.c: + Leave text/plain mime_type fields as NULL (like custom filetypes). + + +2010-10-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c, data/snippets.conf: + Move HTML automatic <table> tag completion into a 'table' snippet + so the user can decide when to use it (patch by Eugene Arshinov, + thanks). + * src/interface.c, src/prefs.c, src/about.c, src/keyfile.c, + src/document.c, src/document.h, THANKS, geany.glade: + Add 'Ensure consistent line endings' file saving pref (patch by + Manuel Bua, thanks). + * src/utils.c, src/utils.h, src/editor.c: + Auto-indent after an HTML/XML line with a missing closing tag (patch + by Eugene Arshinov, thanks). + Behaviour only applies if XML tag autoclosing is off. + * src/templates.c, src/build.c, src/document.c, src/editor.c, + src/symbols.c, plugins/saveactions.c: + Remove unnecessary uses of FILETYPE_ID() macro with + GeanyDocument::file_type. + * data/filetypes.xml: + Add HTML5 attributes (thanks to Ross McKay). + + +2010-10-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/prefs.c: + Fix not changing edited keybindings when cancelling the Preferences + dialog. + * data/filetypes.xml: + Add HTML5 element names (thanks to Ross McKay). + + +2010-10-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c, src/filetypes.c: + Remove filetype default extensions from code. + * src/filetypes.c: + Allow 'Foo=' in filetype_extensions.conf to remove all patterns. + * src/prefs.c: + Refactor shared code with kb_cell_edited_cb(). + + +2010-10-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c: + Use radio buttons for View->Editor->Color Schemes menu. + Don't hide the menu when only the default item is available. + * data/colorschemes, data/colorschemes/alt.conf, wscript, Makefile.am: + Add alternative color scheme based on Python colors. + * scintilla/LexErlang.cxx, scintilla/makefile.win32, + scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, + src/about.c, src/filetypes.c, src/filetypes.h, THANKS, + data/filetype_extensions.conf, data/filetypes.erlang, wscript: + Add Erlang filetype (patch by Taylor Venable, thanks). + * src/filetypes.c, data/filetypes.*: + Move filetype 'extension' default into data files. + * src/filetypes.c, data/filetypes.vala: + Move filetype comment_{open,close} defaults into data files. + + +2010-10-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * data/filetypes.c, data/filetypes.d: + Add missing C99 keyword 'restrict' (#3046716). + Add missing D1 keywords 'ref' and 'macro'. + Add D2 keywords. + * tagmanager/c.c: + Parse Vala functions with contracts (#3080232). + * src/project.c: + Fix saving project indent prefs straight after using project + properties. + * src/highlighting.c, src/filetypes.c: + Prevent debug message about a missing 'default' named style when + using just a user color scheme file. + + +2010-10-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/search.c: + Fix off-by-one bug in 'search_mark_all'. + + +2010-10-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * tagmanager/get.c: + Ignore D /+ +/ comments. + * tagmanager/c.c: + Ignore D unittest blocks. + Parse D template functions with constraints. + * src/keybindings.c, src/keybindings.h, doc/geany.txt, doc/geany.html: + Add 'Insert New Line Before/After Current' keybindings (based on + patch by Eugene Arshinov, thanks). + * src/document.c: + Use secondary text for 'file not found on disk' dialog. + + +2010-10-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/stash.c: + Fix build with GLib 2.8. + + +2010-10-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/ui_utils.h, src/socket.c, src/Makefile.am, src/ui_utils.c, + configure.ac, doc/geany.txt, doc/geany.html, wscript, TODO: + Revert X11 workspace socket support as it needs more work; moved + to workspace-sockets branch. + + +2010-10-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/geanywraplabel.c: + Fix build with GLib 2.8. + * src/dialogs.c, src/about.c, THANKS: + Group Open dialog encoding options by submenus (patch by Adam Ples, + thanks; #3047717). + * scintilla/LexLisp.cxx, scintilla/makefile.win32, + scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, + src/about.c, src/filetypes.c, src/filetypes.h, THANKS, + data/filetype_extensions.conf, data/filetypes.lisp, wscript: + Add Lisp filetype (patch by Mário Silva, thanks). + Note: Lisp lexer was taken from Scintilla instead. + + +2010-10-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * po/kk.po, THANKS, src/about.c: + Added Kazakh translation. Thanks to Baurzhan Muftakhidinov for + providing. + + +2010-10-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c, src/utils.h, src/highlighting.c, src/editor.c: + Don't cache overridden lexer properties. + Add foreach_strv() to plugin API. + Add utils_strv_join(). + * tagmanager/basic.c: + Parse property, constructor, destructor as functions (patch by + pottersson, thanks; #2992167). + + +2010-10-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/tools.c, doc/geany.txt, doc/geany.html: + Fix passing quoted arguments when using 'Send Selection to'. This + means sed 's/\./(dot)/g' now works. + * src/editor.c: + Add snippet keybinding support for keys in user snippets.conf (based + on patch by Eugene Arshinov, thanks). No docs yet. + * doc/geany.txt, doc/geany.html: + Add some subheadings for Snippets section. + * doc/geany.txt, doc/geany.html: + Add snippet keybindings docs. + * src/highlighting.c, src/utils.h: + Move foreach_strv to utils.h. + * src/editor.c, data/snippets.conf: + Read snippet keybindings from system keyfile also. + Add keybinding example to default snippet.conf. + + +2010-09-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.h, src/filetypesprivate.h, src/filetypes.c, + src/filetypes.h, src/document.c, doc/geany.txt, doc/geany.html, + data/filetypes.txt2tags, data/filetypes.markdown, + data/filetypes.restructuredtext: + Add symbol_list_sort_mode per-filetype setting, set to sort by line + number by default for Markdown, reStructuredText and Txt2Tags. + Add utils_get_setting() macro for reading a key from a home or + system keyfile. + Move GeanyFiletypePrivate to filetypesprivate.h. + * src/Makefile.am, src/ui_utils.c, configure.ac, wscript: + Link with X11 if found to fix linking with a recent GNU ld. + * src/document.c: + Avoid delay and redrawing when automatically opening a new document + after closing one. + * scintilla/LexForth.cxx, scintilla/makefile.win32, + scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, + src/about.c, src/filetypes.c, src/filetypes.h, THANKS, + data/filetypes.forth, data/filetype_extensions.conf, wscript: + Add Forth filetype (patch by Thomas Huth, thanks). + * src/tools.c: + Remove unnecessary 'fix' from r5224 as it breaks configuring custom + commands for 'Send Selection to' (oops). + + +2010-09-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/editor.c: + When commenting/uncommenting with single-line comment characters, + ignore any end of line characters before evaluating the current line. + * data/filetypes.python: + Simplify Python Compile/Syntax Check command. + + +2010-09-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keyfile.c, src/search.c, src/search.h, doc/geany.txt, + doc/geany.html: + Add hidden pref 'find_selection_type' with option to repeat last + search when there's no selection. + Change default Find Selection behaviour to not let the X selection + override the current word (can be confusing). + Add docs for Find Selection commands. + * src/document.c: + Fix segfault on idle callback when quitting. + * src/interface.c, src/keybindings.c, geany.glade: + Move 'Edit->Commands->Insert Alternative White Space' to editor popup + Insert menu. + * src/interface.c, geany.glade: + Move editor popup menu Insert Comments submenu to top of Insert menu. + * src/ui_utils.h, src/document.c, src/ui_utils.c, doc/geany.txt, + doc/geany.html: + Add hidden pref new_document_after_close for whether to open a new + document automatically, off by default. + * HACKING: + Add 'Bugs to watch out for' section. + + +2010-09-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/stash.c, doc/Makefile.am, doc/stash-example.c, + doc/stash-gui-example.c: + Improve Stash GUI example. + + +2010-09-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, geany.glade: + Move Go to Marker menu items to Search menu. + Rename popup editor menu item Commands -> Edit. + * src/callbacks.c, src/search.c, src/search.h: + Move find_again() to search.c. + * src/search.c: + Make Find Selected commands repeat the last search if the selection + was lost. + * doc/geany.txt, doc/geany.html: + Add docs for Find Selection keybindings. + * src/interface.c, src/keybindings.c, geany.glade: + Unify Find Selection strings. + * src/interface.c, src/ui_utils.c, geany.glade: + Group editor popup Insert commands in a submenu, with extra items + for the most commonly used Insert Comments commands. + Show Edit->Commands before Format in menubar Edit menu (to match + keybindings order). + Show Open Selected F_ile popup item below submenus. + + +2010-09-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/ui_utils.c: + Refactor shared submenu code with GeanySharedMenu array. + * src/interface.c, src/ui_utils.c, geany.glade: + Add Search submenu for Find Selected, Find Usage, Go to Tag items, + shared with the editor popup menu. + * src/document.c: + Open a new document automatically after closing all documents. + + +2010-09-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/callbacks.c: + Prompt for reloading if the document has an undo stack to avoid + losing undo ability on accidental reloading (patch by Colomban + Wendling, thanks). + * src/project.c, src/geanyobject.c, src/geanyobject.h, + doc/pluginsignals.c: + Add plugin signals project-dialog-create and + project-dialog-confirmed so plugins can append a Project Properties + notebook tab (patch by Jiří Techet, thanks). + * src/ui_utils.h, src/plugindata.h, src/main.c: + Add main_widgets.project_menu to API (patch by Jiří Techet, thanks). + * src/plugindata.h, src/msgwindow.c, src/msgwindow.h, src/search.c, + src/plugins.c, plugins/geanyfunctions.h: + Add msgwin_set_messages_dir() to API (patch by Jiří Techet, thanks). + + +2010-09-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keyfile.c: + Save document indent width with the session. + * src/ui_utils.h, src/socket.c, src/ui_utils.c, doc/geany.txt, + doc/geany.html, TODO: + Use a separate socket per workspace on X (patch by Erik de Castro + Lopo, thanks). + + +2010-09-14 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/main.c: + Ignore directories passed on the command-line (based on patch by + Erik de Castro Lopo, thanks). + * tagmanager/c.c: + Parse D function template names. + * src/interface.c, src/callbacks.c, src/callbacks.h, src/keyfile.c, + src/document.c, src/editor.c, src/editor.h, src/ui_utils.c, + geany.glade: + Allow per-document indent width setting (patch by Jiří Techet, + updated by Erik de Castro Lopo - thanks). + * src/interface.c, src/callbacks.c, src/callbacks.h, geany.glade: + Combine indent width menu item callbacks. + * src/interface.c, geany.glade: + Don't translate indent width menu items as they are now used for + atoi(). + + +2010-09-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, src/keybindings.c, src/ui_utils.c, geany.glade: + Remove 3 popup menu items to save space: + Find Document Usage because Find Usage can be used instead. + Go to Tag Declaration because Go to Tag Definition is more common. + Go to Line because the toolbar item can be used instead. + * src/tools.c, src/search.c, tagmanager/python.c: + Fix some 'possible' NULL pointer dereferences (based on patch by + Erik de Castro Lopo). + * src/keybindings.c, src/keybindings.h, src/prefs.c: + Simplify keybindings_check_event(). + + +2010-09-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c: + Use up/down icons for Previous/Next Error. + * src/interface.c, src/keybindings.c, src/callbacks.c, + src/callbacks.h, src/ui_utils.c, doc/geany.txt, doc/geany.html, + geany.glade: + Add Find Usage and Go to Tag items to Search menu for easier + discovery. + * tagmanager/tm_symbol.c: + Fix possible NULL dereference. + * HACKING: + Add link to glade-2.12.2.tar.gz on geany.org. + * doc/geany.txt, doc/geany.html: + Mention the filetype wordchars setting can be overridden by the + whitespace_chars filetypes.common setting. + * src/highlighting.c, src/encodings.c, tagmanager/tm_file_entry.c: + Remove NULL checks when calling g_free() (patch by Erik de Castro + Lopo, thanks). + * src/document.c: + Show Save As when saving if the document filename doesn't have an + absolute path, so command-line new files can be saved without a + prompt, but file templates still prompt the user. + + +2010-09-09 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * src/build.c: + Fix a memory leak. Based on input by Daniel Marjamäki. Thanks for the + catch. + + +2010-09-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/ui_utils.h, src/msgwindow.c, src/msgwindow.h, src/main.c: + Add GeanyMainWidgets::message_window_notebook for plugins to append + a new notebook page (#3061342). + * src/document.c: + Add Close button to the detected file changed dialog. + * src/interface.c, geany.glade: + Add separator between Find Previous and Find in Files. + Add up/down icons for Previous/Next Message. + + +2010-08-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/snippets.conf: + Add dummy entry for "do" snippet for Haskell to explicitly avoid the + default completion. + + +2010-08-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c: + Fix broken editing of build menu labels. + * src/encodings.c, src/filetypes.c, configure.ac: + Auto-enable building with included regex if no regcomp function is + found. + Remove checks for HAVE_REGCOMP in Geany source (not TagManager) - + regex support is required. + * tagmanager/make.c: + Backport fix for possible infinite loop from CTags. + * scintilla/PlatGTK.cxx: + Backport list box memory leak fixes from Scintilla 2.20. + + +2010-08-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/project.c: + Make the Properties dialog filename a label and put it first (patch + by Jiří Techet, thanks). + * src/build.c, src/build.h, src/project.c, doc/geany.txt, + doc/geany.html: + Remove the "Set build working directories" button from the project + properties dialog (patch by Jiří Techet, thanks). + * src/search.c: + Include all files if the Find in Files pattern field is enabled and + empty. + * src/filetypes.c: + Rename Matlab -> Matlab/Octave. Datafile name remains the same. + + +2010-08-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * scintilla/LexTxt2tags.cxx, scintilla/makefile.win32, + scintilla/include/SciLexer.h, scintilla/include/Scintilla.iface, + scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, + data/filetypes.txt2tags, wscript: + Add lexer for Txt2Tags (patch by Forgeot Eric, thanks - #3020632). + * m4, configure.ac, Makefile.am: + Use AC_CONFIG_MACRO_DIR (patch by Erik de Castro Lopo, thanks). + * src/callbacks.c: + Only prompt for reloading if the document has unsaved changes + (patch by Jiří Techet, thanks). + + +2010-08-21 Frank Lanitz <frank(a)frank.uvena.de> + + * src/plugindata.h: + Apply a patch by Jiří Techet which is preventing warnings when using + -Wmissing-prototypes on compiling. Thanks. + + +2010-08-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * scintilla/KeyWords.cxx: + Link Octave instead of Matlab. + Add comment about not being autogenerated. + Minor changes to fit Scintilla order. + * src/build.c, src/build.h: + Replace GeanyBuildCommand::entries array with separate fields. + Similar to r5077 in the bs2 branch, but with less loop unrolling. + * src/build.c: + Remove buildcmd_* accessor functions. + + +2010-08-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c, src/editor.c: + Use Octave lexer instead of Matlab to support Octave # comment char. + + +2010-08-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/filetypes.c: + Fix segfault on Tools->Reload Configuration when no documents are + open (#3037079). + * scintilla/LexMarkdown.cxx: + Fix infinite loop in Markdown lexer (patch by Colomban Wendling, + thanks). + * src/build.c: + Fix saving non-project filetype error regex. + * src/build.c: + Fix memory leak in read_regex(). + + +2010-08-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * wscript: + Check for libsocket on OpenSolaris to fix build. + * src/encodings.c: + Rewrite the logic to auto detect encodings a bit to make it more + readable and fix a slightly wrong detection on Windows + (closes #3019573). + * plugins/geanyfunctions.h, src/editor.c, src/plugindata.h, + src/plugins.c: + Add editor_goto_pos() to the plugin API. + + +2010-08-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * configure.ac: + Check for git-svn repo, not just git because find-rev doesn't + always fail with a git-only repo. + + +2010-08-12 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * src/search.c: + Fix a memory leak based on input by Daniel Marjamäki. Thanks. + + +2010-08-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * doc/geany.txt, doc/geany.html: + Reorder Focus keybindings. + + +2010-08-10 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * autogen.sh: + Applying a patch by Erik de Castro Lopo for checking against + pkg-config when running autogen.sh. Thanks for the patch. + * src/log.c: + Applying a patch by Colomban Wendling to print out log domains. + Thanks. + + +2010-08-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keybindings.c, src/keybindings.h, src/prefs.c, src/plugindata.h: + Use single binding_ids keybinding array instead of individual + arrays for core keybindings. This allows the keybinding IDs to be + merged into one enum; the order of keybindings is now just the + order they are added to each group. Keybindings can be reordered + without breaking the plugin ABI but groups must stay the same. + * src/stash.c: + Fix writing the default value when a key is missing for hidden + prefs, even if it was overridden when it was originally read. + * src/keyfile.c, src/ui_utils.c, doc/geany.txt, doc/geany.html: + Move some interface hidden prefs to ui_utils.c. + * src/editor.c: + Revert r4840 scope completion mode as it sometimes breaks + autocompletion. + * src/keybindings.h, src/plugindata.h: + Randomly sort keybinding IDs to show there should be no order. + * src/keybindings.c: + Reorder Focus keybindings. + + +2010-08-05 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/ui_utils.c, src/ui_utils.h: + Make ui_label_new_bold() a function. + Escape the name of the current document for markup when using + document name for menu items (closes #3038844). + * src/vte.c: + Inherit 'beep on errors' preference for the audible bell preference + for the VTE (closes #3038215). + + +2010-08-01 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/utils.c, src/utils.h: + Add utils_get_eol_char(). + * plugins/geanyfunctions.h, src/document.c, src/editor.c, src/editor.h, + src/plugindata.h, src/plugins.c, src/templates.c, src/utils.c, + src/utils.h: + Ensure inserted templates always have proper line ending characters + according to the current document's preference. + This is also fixes problems with templates on Windows which had + always Unix line ending characters but now since they are read + from files, these have Windows line ending characters and had been + converted twice. + + +2010-07-31 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/vte.c: + Fix build with GTK 2.8, use the stock icon name directly instead + of the macro. Though, the icon is still missing for GTK 2.8. + * src/templates.c: + Make make_comment_block() work with a GString. This is not yet + perfect but a bit better than before. + + +2010-07-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/keybindings.c, src/vte.c, src/vte.h: + Implement 'Select All' for the VTE widget. + + +2010-07-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * geany.nsi: + Fix missing template files in the Windows installer. + + +2010-07-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/filetypes.python: + Update list of Python builtins, based on Python 2.6. + + +2010-07-13 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/filetypes.c: + On Windows, convert filetype extensions read from config files + to lower case (closes #3028856). + + +2010-07-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keybindings.c: + Focus toolbar item when pressing Go to Line keybinding only when + it's not in the toolbar's drop down overflow menu (fixes #3027454). + + +2010-07-11 Lex Trotman <elextr(at)gmail(dot)com> + + * src/build.c: + Fix build menu translation problems. + + +2010-07-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * wscript: + Fix './waf install'. + + +2010-07-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Fix scrolling the editor line in view after loading a session and + switching document tabs. Note this causes repainting so needs + improvement. + * doc/geany.txt, doc/geany.html: + Add note to restart Geany after installing/updating before editing + hidden prefs. + * src/ui_utils.h, src/main.c, src/ui_utils.c: + Use Stash to save statusbar_template setting, instead of the + load/save-settings signal. + Add ui_init_prefs(). + + +2010-07-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/ui_utils.c, doc/geany.txt, doc/geany.html: + Fix writing empty hidden pref "statusbar_template" key so users can + find it (patch by Dimitar Zhekov, thanks). + * src/ui_utils.c, src/ui_utils.h, src/main.c: + Add ui_finalize(), free string (patch by Dimitar Zhekov, thanks). + + +2010-07-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c, src/project.c, src/project.h: + Show the Project Properties build tab when choosing 'Set Build + Commands' for now to prevent confusion with non-project commands. + + +2010-07-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/search.c, doc/geany.txt, doc/geany.html: + Fix Grep --exclude-dir example. + + +2010-07-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/sidebar.c: + Add sidebar Documents popup menu item 'Find in Files'. + * src/keyfile.c, src/main.c, src/editor.c: + Don't unnecessarily test G_FILE_TEST_IS_SYMLINK when testing + G_FILE_TEST_IS_REGULAR (patch by Dimitar Zhekov, thanks). + + +2010-07-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * doc/geany.txt, doc/geany.html: + Fix wording - restarting is required for hidden prefs. + File templates don't need manual reloading anymore. + * src/ui_utils.c: + Fix only adding project base path to Find in Files history if it + isn't already there (oops). + * src/msgwindow.c: + Parse lines in the Messages window even if Find in Files hasn't + been used yet (patch by Jiří Techet, thanks). + + +2010-07-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * scintilla/LexCPP.cxx, src/highlighting.c: + Add C++ lexer property fold.cpp.comment.explicit (patch sent); set + it disabled. + * src/utils.h, src/highlighting.c, doc/geany.txt, doc/geany.html, + data/filetypes.common: + Add filetypes.common fold_symbol_highlight color setting. + Add API macro foreach_range(). + * src/printing.c, doc/geany.txt, doc/geany.html: + Always use white background color when printing (except for text + with a white foreground) to save ink (should fix #2968998). + * src/build.c, src/build.h, doc/geany.txt, doc/geany.html: + Limit build error editor indicators to 50, but parse all errors in + the Compiler tab (fixes #3019823). + + +2010-06-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c: + Re-enable fold.comment for lexers - it was disabled to prevent C + //{ explicit folding, but that also disables stream comment folding + /* */. + * tagmanager/tm_workspace.c, tagmanager/get.c: + Use g_free instead of free (patch by Daniel Marjamäki, thanks). + * src/editor.c: + Use SCI_SETFIRSTVISIBLELINE for editor_scroll_to_line(). Note this + doesn't affect the bug with document switching not scrolling cursor + in view after loading a session. + + +2010-06-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/ui_utils.c, THANKS, doc/geany.txt, doc/geany.html: + Add statusbar_template hidden pref (based on patch by Dimitar + Zhekov, thanks). + * src/ui_utils.c, doc/geany.txt, doc/geany.html: + Add spaces after RO when using %r in statusbar_template setting. + Add space between encoding and BOM. + Note \t means tab for default text. + + +2010-06-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/search.c: + Restore tabbing past Find in Files combo box drop down menus. + + 2010-06-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/sciwrappers.c, src/plugindata.h, src/pluginutils.c, src/main.c, @@ -1168,7 +2370,7 @@ * 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: + plugins/pluginmacros.h, plugins/genapi.py, 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 Modified: branches/sm/HACKING =================================================================== --- branches/sm/HACKING 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/HACKING 2011-02-27 08:57:20 UTC (rev 5550) @@ -123,6 +123,9 @@ it - this should work fine even if you have another version of Glade installed on the system. +You can download Glade 2.12.2 here: +http://download.geany.org/glade-2.12.2.tar.gz + GTK API documentation --------------------- The official GTK 2.8 API documentation is not available online anymore, @@ -247,12 +250,22 @@ passing ``-c some_dir`` (but make sure the directory is clean first). * For debugging tips, see `GDB`_. +Bugs to watch out for +--------------------- +* Forgetting to check *doc->is_valid* when looping through + *documents_array* - instead use *foreach_document()*. +* Inserting fields into structs in the plugin API instead of appending. +* Not breaking the plugin ABI when necessary. +* Using an idle callback that doesn't check main_status.quitting. +* Forgetting CRLF line endings on Windows. +* Not handling Tabs & Spaces indent mode. + Libraries --------- 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. +shortly after one is made. See also scintilla/README. 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 @@ -365,14 +378,15 @@ Other features ^^^^^^^^^^^^^^ +If the lexer has comment styles, you should add them in +highlighting_is_comment_style(). You should also update +highlighting_is_string_style() for string/character styles. For now, +this prevents calltips and autocompletion when typing in a comment +(but it can still be forced by the user). + For brace indentation, update lexer_has_braces() in editor.c; indentation after ':' is done from on_new_line_added(). -If the lexer has comment styles, you should add them in is_comment_style() -in editor.c. You should also update is_string_style() for string/character -styles. For now, this prevents calltips and autocompletion when typing -in a comment (but it can still be forced by the user). - If the Scintilla lexer supports user type keyword highlighting (e.g. SCLEX_CPP), update editor_lexer_get_type_keyword_idx() in editor.c. Modified: branches/sm/Makefile.am =================================================================== --- branches/sm/Makefile.am 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/Makefile.am 2011-02-27 08:57:20 UTC (rev 5550) @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = 1.7 +ACLOCAL_AMFLAGS = -I m4 + WIN32_BUILD_FILES = \ geany_private.rc \ win32-config.h \ @@ -23,7 +25,8 @@ data/snippets.conf \ data/ui_toolbar.xml \ $(srcdir)/data/templates/* \ - $(srcdir)/data/templates/files/* + $(srcdir)/data/templates/files/* \ + $(srcdir)/data/colorschemes/* EXTRA_DIST = \ autogen.sh \ @@ -54,8 +57,11 @@ uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir); -install-data-local: +install-data-local: install-data-only @$(NORMAL_INSTALL) + +install-data-only: + @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \ for file in $(srcdir)/data/*; do \ @@ -75,6 +81,12 @@ $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/templates/files/; \ fi \ done + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/colorschemes; + for file in $(srcdir)/data/colorschemes/*; do \ + if test -f $$file; then \ + $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/colorschemes/; \ + fi \ + done BZIP2_ENV =--best Modified: branches/sm/NEWS =================================================================== --- branches/sm/NEWS 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/NEWS 2011-02-27 08:57:20 UTC (rev 5550) @@ -1,3 +1,212 @@ +Geany 0.20 (January 5, 2011) + + Fixes: + * Improve compatibility with GVFS using GIO to save documents (Alexey + Antipov). + * Fix crash when closing a modified document (usually without a + trailing newline) and choosing Save (fixes #3111058). + * Fix crash when using 'Send Selection to Terminal' and the VTE + is not loaded, and when using Ctrl-A after enabling the 'Load VTE' + pref (Dimitar Zhekov). + * Fix a slightly wrong encoding detection on Windows (#3019573). + * Fix issue with single-line commenting/uncommenting blocks when using + Windows line endings. + * Fix saving project indent prefs straight after using project + properties. + * Fix wrongly changing edited keybindings when cancelling the + Preferences dialog. + * Fix auto-displaying of sidebar, tab bar, symbols and documents tabs + when only plugin tabs are visible (fixes #3101867). + * Save build commands for filetype None (Lex Trotman). + * Waf: Check for libsocket on OpenSolaris to fix build. + + Interface: + * Color build command fields light grey unless overridden (Lex + Trotman). + * Replace /home/user with ~ in the documents list (Jon + Strait). + * Display 'new instance' on title bar for 2nd instances (Eugene + Arshinov). + * Don't add duplicates to combo box histories. + * Reorganise Find in Files dialog and add Files pattern to filter + search results. + * Implement 'Select All' for the VTE widget. + * Reorganise editor popup menu for shorter size - some items were moved + to submenus. + * Move Go to Marker menu items to Search menu. + * Group Open dialog encoding options by submenus (Adam Ples; #3047717). + * Show mimetype icon in sidebar Documents list and notebook popup menu + (Colomban Wendling). + + Documents: + * Ensure inserted templates always have proper line ending characters + according to the current document's preference. + * Add per-document indent width setting (Jiří Techet). + * Add 'Project->Apply Default Indentation' menu command to override + every document's indentation settings. + * Display better error messages when saving a document fails (Dimitar + Zhekov). + * Don't prompt for reloading if the document has not been edited + (Jiří Techet). + * Add Close button to the detected file changed dialog. + + Editor: + * Fix wrong snippet indentation when original cursor line has + non-indentation whitespace (david). + * Fix passing quoted arguments when using 'Send Selection to'. This + means e.g. sed 's/\./(dot)/g' now works. + * Add alternative color scheme based on Python colors + (View->Editor->Color Schemes). + * Replace HTML automatic <table> tag completion with a 'table' snippet + (Eugene Arshinov). + * Auto-indent after an HTML/XML line without a closing tag (Eugene + Arshinov). + * Respect 'Smart' home key pref for Shift[+Alt]+Home (fixes #3100290, + Dimitar Zhekov). + * Scroll to the current line when moving the cursor to the next + cursor position in a snippet (#3139490). + * If the current word's tag is on the current line, make Go to Tag + Definition look for a tag declaration instead and vice versa. + * Make Reflow Lines/Block command use the current indented block, not + the whole paragraph (which could have mixed indentation). + + Configuration: + * Load insertion templates from system path, don't create them in + the user's config dir. + * File templates are now reloaded on saving. + + Prefs: + * Add 'Ensure consistent line endings' file saving pref (Manuel Bua). + * Add 'statusbar_template' hidden pref (Dimitar Zhekov). + * Add 'new_document_after_close' hidden pref to open a new document + automatically after closing all documents. + * Add hidden pref 'find_selection_type' with option to use the X + selection or to repeat the last search when there's no selection, + both off by default. + * Add 'gio_unsafe_save_backup' hidden pref (Lex Trotman). + * Add filetypes.common 'fold_symbol_highlight' color setting. + * Add 'symbol_list_sort_mode' per-filetype setting. + + Keybindings: + * Fix Alt+[0-9] switching tabs even when other modifiers are also held. + * Add snippet keybinding support (Eugene Arshinov). + * Add 'Insert New Line Before/After Current' keybindings (Eugene + Arshinov). + + Filetypes: + * Add Forth filetype (Thomas Huth). + * Add Lisp filetype (Mário Silva). + * Add Erlang filetype (Taylor Venable). + * Ada: Fix wrong comments. + * C++: Disable user fold points with new lexer property + fold.cpp.comment.explicit. + * Python: Update list of builtins for Python 2.6, simplify + Compile/Syntax Check command. Use named styles for color scheme + support (use alt.conf color scheme if you want the old colors). + * Matlab: Support Octave # comment char. + * Txt2Tags: add highlighting (Forgeot Eric - #3020632). + * Make: fix possible infinite loop in tag parser. + * D: Parse template functions, ignore /+ +/ comments, ignore + unittest blocks, add keywords 'ref', 'macro' and D2 keywords. + * Vala: Parse functions with contracts (#3080232). + * Markdown, reStructuredText and Txt2Tags: Sort tags by line number by + default. + * Basic: Parse property, constructor, destructor as functions + (pottersson; #2992167). + * HTML: Add HTML5 element names and attributes (Ross McKay). + * PHP: Parse final functions (fixes #3111171). + * Markup: Add xml_indent_tags filetype setting for documents using the + HTML/XML lexers (Eugene Arshinov). + + Plugins: + * File Browser: Add history to path entry. + * HTML Characters: Only automatically replace characters when the + current document is a Markup document. + + Internationalisation: + * Add translations: kk. + * Update translations: cs, de, en_GB, es, fi, fr, hu, ja, nl, pt, + sl, sv, tr, zh_CN. + + Manual: + * Update 'Custom filetypes', 'Ignore Tags' sections. + * Add 'HTML Characters', 'Configuration file paths', 'Color schemes + menu' sections. + * Explain how to grep the Scintilla source for lexer properties. + + HACKING: + * Add 'Bugs to watch out for' section. + + API: + * Improve Stash GUI example. + * Fix not loading plugins built against a newer API when Geany doesn't + provide the required version given in PLUGIN_VERSION_CHECK(). + * Make GEANY_API_VERSION, GEANY_ABI_VERSION macros instead of enums + so you can protect code with '#if GEANY_API_VERSION >= 200'. + * Add signals "build-start", "project-dialog-create" and + "project-dialog-confirmed" - to append a Project Properties + notebook tab (Jiří Techet). + * Add macro foreach_range(). + * Add GeanyMainWidgets::message_window_notebook (#3061342). + * Add main_widgets.project_menu (Jiří Techet). + * Add msgwin_set_messages_dir() (Jiří Techet). + * Add highlighting_is_{string,comment,code}_style(), + editor_find_snippet(), editor_insert_snippet(), + utils_find_open_xml_tag() (Eugene Arshinov). + * Add ui_combo_box_add_to_history(), editor_goto_pos(), + dialogs_show_input(), Add sci_get_lexer(). + * Add filetypes_get_display_name() as "None" is no longer translated. + + +Geany 0.19.2 (December 01, 2010) + Fixes: + * Fix bug where Geany did not always report an error message when + saving a document fails. + + +Geany 0.19.1 (August 18, 2010) + + Fixes: + * Fix broken autocompletion after using scope completion. + * Fix scrolling the editor line in view (e.g. after loading a session + and switching document tabs). + * Fix using filetype extension patterns with upper case letters on + Windows (#3028856). + * Fix a slightly wrong encoding detection on Windows (#3019573). + * Re-enable comment folding. + * Fix not loading plugins built against a newer API when Geany doesn't + provide the required version given in PLUGIN_VERSION_CHECK(). + * Fix infinite loop in Markdown lexer (patch by Colomban Wendling, + thanks). + * Fix saving non-project filetype error regex. + * Focus toolbar item when pressing Go to Line keybinding only when + it's not in the toolbar's drop down overflow menu (#3027454). + * Escape the name of the current document for markup when using + document name for menu items (#3038844). + * File Browser: Allow Find in Files when no items are selected. + * Fix build menu translation problems. + * Fix segfault on Tools->Reload Configuration when no documents are + open (#3037079). + * Fix building with Waf on Solaris. + * Fix a memory leak (thanks to Daniel Marjamäki). + * Use g_free instead of free (patch by Daniel Marjamäki, thanks). + + Tweaks: + * Always use white background color when printing (except for text + with a white foreground) to save ink (#2968998). + * Limit build error editor indicators to 50, but parse all errors in + the Compiler tab (#3019823). + * Align notebook tab close buttons centred vertically (thanks to + Robux.Biz (galyuk)). + * Show the Project Properties build tab when choosing 'Set Build + Commands' when a project is open to prevent confusion with + non-project commands. + + Manual: + * Fix wording - restarting is required for hidden prefs. + * Fix Grep --exclude-dir example. + + Geany 0.19 (June 12, 2010) General: @@ -1253,4 +1462,3 @@ Geany 0.1 (October 19, 2005) * first official release - Modified: branches/sm/THANKS =================================================================== --- branches/sm/THANKS 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/THANKS 2011-02-27 08:57:20 UTC (rev 5550) @@ -77,10 +77,17 @@ 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 +Dimitar Zhekov <hamster(at)mbox(dot)contact(dot)bg> - various patches 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 -Jiří Techet <techet(at)gmail(dot)com> - Fix switch to last used tab ordering bug +Jiří Techet <techet(at)gmail(dot)com> - Various patches +Erik de Castro Lopo <mle+tools(at)mega-nerd(dot)com> - Various patches +Thomas Huth <th(dot)huth(at)googlemail(dot)com> - Forth filetype +Adam Ples <adamples(at)users(dot)sourceforge(dot)net> - Group encodings in open dialog +Mário Silva <sharelider(at)gmail(dot)com> - Lisp filetype +Taylor Venable <taylor(at)metasyntax(dot)net> - Erlang filetype +Manuel Bua <manuel(dot)bua(at)gmail(dot)com> - Ensure consistent line endings pref. +Matthew Brush <codebrainz(at)users(dot)sourceforge(dot)net> - Save As toolbar button. Translators: ------------ @@ -113,6 +120,7 @@ Tarot Osuji <tarot(at)sdf(dot)lonestar(dot)org> - ja Chikahiro Masami <cmasa(dot)z321(at)gmail(dot)com> - ja Park Jang-heon <dotkabi(at)gmail(dot)com> - ko +Baurzhan Muftakhidinov <baurthefirst(at)gmail(dot)com> - kk Laurent Hoeltgen <hoeltgman(at)gmail(dot)com> - lb Kurt De Bree <kdebree(at)telenet(dot)be> - nl Peter Scholtens <<peter(dot)scholtens(at)xs4all(dot)nl> - nl Modified: branches/sm/TODO =================================================================== --- branches/sm/TODO 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/TODO 2011-02-27 08:57:20 UTC (rev 5550) @@ -8,10 +8,13 @@ Next version or later: o better file template {filename} wildcard replacement +{BASENAME} + o improve line breaking mode + o print text size/zoom option 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 update included regex library (and other CTags improvements) o (better custom filetype support) o (custom template insertion - so user can add licenses, etc) o (selectable menu of arguments to use for Make, from Make Custom) @@ -19,7 +22,8 @@ o (sci macro support - as a plugin?) 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?) + o (per-workspace instances with socket support - see + workspace-sockets branch) 1.0: Modified: branches/sm/autogen.sh =================================================================== --- branches/sm/autogen.sh 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/autogen.sh 2011-02-27 08:57:20 UTC (rev 5550) @@ -44,6 +44,14 @@ } } +(pkg-config --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have pkg-config installed to compile $package." + echo "Download the appropriate package for your distribution." + result="no" + DIE=1 +} + (automake --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`automake' (1.7 or later) installed." @@ -83,6 +91,10 @@ automake --add-missing --copy --gnu autoconf +if [ "$NOCONFIGURE" = 1 ]; then + echo "Done. configure skipped." + exit 0; +fi echo "Running $srcdir/configure $@ ..." $srcdir/configure "$@" && echo "Now type 'make' to compile." || exit 1 Modified: branches/sm/configure.ac =================================================================== --- branches/sm/configure.ac 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/configure.ac 2011-02-27 08:57:20 UTC (rev 5550) @@ -3,6 +3,7 @@ AC_INIT(configure.ac) AM_INIT_AUTOMAKE(geany, 0.20) +AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -22,7 +23,6 @@ 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 @@ -43,7 +43,7 @@ AC_STRUCT_TM # Checks for library functions. -AC_CHECK_FUNCS([gethostname ftruncate fgetpos mkstemp regcomp strerror strstr]) +AC_CHECK_FUNCS([gethostname ftruncate fgetpos mkstemp strerror strstr]) # autoscan end @@ -53,9 +53,13 @@ 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 || + # check for git-svn repo first - find-rev (v1.5.4.1) doesn't always fail with git-only repo + git svn info &>/dev/null + if test "x$?" == "x0"; 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 fi if test "x${REVISION}" = "xr0" then @@ -160,6 +164,9 @@ # 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) +# auto-enable included regex if necessary +AC_CHECK_FUNCS([regcomp], [], [enable_gnu_regex="yes"]) + 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.]) @@ -331,6 +338,12 @@ 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 "x$enable_gnu_regex" = "xyes" ; then + echo "GNU regex library : built-in" +else + echo "GNU regex library : system" +fi + if test "${REVISION}" != "-1" then echo "Compiling Subversion revision : ${REVISION}" Added: branches/sm/data/colorschemes/alt.conf =================================================================== --- branches/sm/data/colorschemes/alt.conf (rev 0) +++ branches/sm/data/colorschemes/alt.conf 2011-02-27 08:57:20 UTC (rev 5550) @@ -0,0 +1,22 @@ +# Set of styles like the Geany <= 0.19 Python/script defaults with gray comments. + +[named_styles] +# see filetypes.common for details + +default=0x000000;0xffffff +comment=0x808080 +commentdoc=0x404000 +number=0x400080 +keyword=0x600080;;true +keyword2=0x9f0200;;true +string=0x008000 +preprocessor=0x808000 +operator=0x300080 +stringeol=0x000000;0xe0c0e0 +# this is a bit dim, may want to change +type=0x003030;;true +function=0x000080 +extra=0x404080 + + + Modified: branches/sm/data/filetype_extensions.conf =================================================================== --- branches/sm/data/filetype_extensions.conf 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetype_extensions.conf 2011-02-27 08:57:20 UTC (rev 5550) @@ -2,51 +2,54 @@ # Insert as many items as you want, seperate them with a ";". # See Geany's main documentation for details. [Extensions] -ASM=*.asm; Abc=*.abc;*.abp; +ActionScript=*.as; Ada=*.adb;*.ads; +ASM=*.asm; +CAML=*.ml;*.mli; C=*.c;*.h; C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; C#=*.cs; -CAML=*.ml;*.mli; +CMake=CMakeLists.txt;*.cmake;*.ctest; +Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop; +CSS=*.css; D=*.d;*.di; +Diff=*.diff;*.patch;*.rej; +Docbook=*.docbook; +Erlang=*.erl; F77=*.f;*.for;*.ftn;*.f77; +Ferite=*.fe; +Forth=*.fs;*.fth; Fortran=*.f90;*.f95;*.f03; FreeBasic=*.bas;*.bi; Genie=*.gs; GLSL=*.glsl;*.frag;*.vert; Haskell=*.hs;*.lhs; Haxe=*.hx; -ActionScript=*.as; +HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm; Java=*.java;*.jsp; -Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; -Vala=*.vala;*.vapi; -VHDL=*.vhd;*.vhdl; -Verilog=*.v; -Ferite=*.fe; Javascript=*.js; +LaTeX=*.tex;*.sty;*.idx;*.ltx;*.latex; +Lisp=*.lisp; Lua=*.lua; Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*; Matlab=*.m; +NSIS=*.nsi;*.nsh; +Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; Perl=*.pl;*.perl;*.pm;*.agi;*.pod; PHP=*.php;*.php3;*.php4;*.php5;*.phtml; +Po=*.po;*.pot; Python=*.py;*.pyw; +reStructuredText=*.rest;*.reST;*.rst; R=*.R;*.r; Ruby=*.rb;*.rhtml;*.ruby; Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4; +SQL=*.sql; Tcl=*.tcl;*.tk;*.wish; -CSS=*.css; -Docbook=*.docbook; -HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm; +txt2tags=*.t2t; +Vala=*.vala;*.vapi; +Verilog=*.v; +VHDL=*.vhd;*.vhdl; XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml; -CMake=CMakeLists.txt;*.cmake;*.ctest; -Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop; -Diff=*.diff;*.patch;*.rej; -NSIS=*.nsi;*.nsh; -Po=*.po;*.pot; -LaTeX=*.tex;*.sty;*.idx;*.ltx; -reStructuredText=*.rest;*.reST;*.rst; -txt2tags=*.t2t; -SQL=*.sql; YAML=*.yaml;*.yml; None=*; Modified: branches/sm/data/filetypes.Genie.conf =================================================================== --- branches/sm/data/filetypes.Genie.conf 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.Genie.conf 2011-02-27 08:57:20 UTC (rev 5550) @@ -6,19 +6,19 @@ commentline=comment commentdoc=commentdoc number=number -word=word -word2=word2 +word=keyword +word2=keyword2 string=string character=string -uuid=0x404080 +uuid=extra preprocessor=preprocessor operator=operator identifier=default stringeol=stringeol # @"verbatim" -verbatim=0x101030 +verbatim=extra # (/regex/) -regex=0x105090 +regex=extra commentlinedoc=commentdoc,bold commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc Modified: branches/sm/data/filetypes.actionscript =================================================================== --- branches/sm/data/filetypes.actionscript 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.actionscript 2011-02-27 08:57:20 UTC (rev 5550) @@ -6,19 +6,19 @@ commentline=comment commentdoc=commentdoc number=number -word=word -word2=word2 +word=keyword +word2=keyword2 string=string character=string -uuid=0x404080 +uuid=extra preprocessor=preprocessor operator=operator identifier=default stringeol=stringeol # @"verbatim" -verbatim=0x101030 +verbatim=extra # (/regex/) -regex=0x105090 +regex=extra commentlinedoc=commentdoc,bold commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc @@ -32,7 +32,7 @@ [settings] # default extension used when saving files -#extension=as +extension=as # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.ada =================================================================== --- branches/sm/data/filetypes.ada 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.ada 2011-02-27 08:57:20 UTC (rev 5550) @@ -21,13 +21,13 @@ [settings] # default extension used when saving files -#extension=adb +extension=adb # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# +comment_open=-- comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any Modified: branches/sm/data/filetypes.asm =================================================================== --- branches/sm/data/filetypes.asm 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.asm 2011-02-27 08:57:20 UTC (rev 5550) @@ -27,7 +27,7 @@ [settings] # default extension used when saving files -#extension=asm +extension=asm # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.c =================================================================== --- branches/sm/data/filetypes.c 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.c 2011-02-27 08:57:20 UTC (rev 5550) @@ -6,19 +6,19 @@ commentline=comment commentdoc=commentdoc number=number -word=word -word2=word2 +word=keyword +word2=keyword2 string=string character=string -uuid=0x404080 +uuid=extra preprocessor=preprocessor operator=operator identifier=default stringeol=stringeol # @"verbatim" -verbatim=0x101030 +verbatim=extra # (/regex/) -regex=0x105090 +regex=extra commentlinedoc=commentdoc,bold commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc @@ -26,13 +26,14 @@ [keywords] # all items must be in one line -primary=asm auto break case char const continue default do double else enum extern float for goto if inline int long register return short signed sizeof static struct switch typedef union unsigned void volatile while FALSE NULL TRUE +primary=asm auto break case char const continue default do double else enum extern float for goto if inline int long register restrict return short signed sizeof static struct switch typedef union unsigned void volatile while FALSE NULL TRUE secondary= # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union [lexer_properties] styling.within.preprocessor=1 +lexer.cpp.track.preprocessor=0 preprocessor.symbol.$(file.patterns.cpp)=# preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef preprocessor.middle.$(file.patterns.cpp)=else elif @@ -40,7 +41,7 @@ [settings] # default extension used when saving files -#extension=c +extension=c # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.caml =================================================================== --- branches/sm/data/filetypes.caml 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.caml 2011-02-27 08:57:20 UTC (rev 5550) @@ -24,7 +24,7 @@ [settings] # default extension used when saving files -#extension=ml +extension=ml # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.cmake =================================================================== --- branches/sm/data/filetypes.cmake 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.cmake 2011-02-27 08:57:20 UTC (rev 5550) @@ -26,7 +26,7 @@ [settings] # default extension used when saving files -#extension=cmake +extension=cmake # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.common =================================================================== --- branches/sm/data/filetypes.common 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.common 2011-02-27 08:57:20 UTC (rev 5550) @@ -17,6 +17,7 @@ # the following settings define the colours of the margins on the left side margin_linenumber=0x000000;0xd0d0d0; margin_folding=0x000000;0xdfdfdf; +fold_symbol_highlight=0xffffff # background colour of the current line, only the second and third argument is interpreted # use the third argument to enable or disable the highlighting of the current line (has to be true/false) @@ -107,12 +108,17 @@ commentdoc=0x3f5fbf number=0x007f00 # keyword -word=0x00007f;;true;false -# e.g. global types from a *.c.tags file -word2=0x991111;;true;false +keyword=0x00007f;;true;false +# usually type keywords and library type names +keyword2=0x991111;;true;false string=0xff901e preprocessor=0x007f7f operator=0x301010 # unterminated string stringeol=0x000000;0xe0c0e0;false;false +# user type names type=0x0000d0;;true;false +# user function names +function=0x000080 +extra=0x404080 + Modified: branches/sm/data/filetypes.conf =================================================================== --- branches/sm/data/filetypes.conf 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.conf 2011-02-27 08:57:20 UTC (rev 5550) @@ -15,7 +15,7 @@ [settings] # default extension used when saving files -#extension=conf +extension=conf # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.cpp =================================================================== --- branches/sm/data/filetypes.cpp 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.cpp 2011-02-27 08:57:20 UTC (rev 5550) @@ -6,19 +6,19 @@ commentline=comment commentdoc=commentdoc number=number -word=word -word2=word2 +word=keyword +word2=keyword2 string=string character=string -uuid=0x404080 +uuid=extra preprocessor=preprocessor operator=operator identifier=default stringeol=stringeol # @"verbatim" -verbatim=0x101030 +verbatim=extra # (/regex/) -regex=0x105090 +regex=extra commentlinedoc=commentdoc,bold commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc @@ -33,6 +33,7 @@ [lexer_properties] styling.within.preprocessor=1 +lexer.cpp.track.preprocessor=0 preprocessor.symbol.$(file.patterns.cpp)=# preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef preprocessor.middle.$(file.patterns.cpp)=else elif @@ -42,7 +43,7 @@ lexer_filetype=C # default extension used when saving files -#extension=cpp +extension=cpp # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.cs =================================================================== --- branches/sm/data/filetypes.cs 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.cs 2011-02-27 08:57:20 UTC (rev 5550) @@ -6,19 +6,19 @@ commentline=comment commentdoc=commentdoc number=number -word=word -word2=word2 +word=keyword +word2=keyword2 string=string character=string -uuid=0x404080 +uuid=extra preprocessor=preprocessor operator=operator identifier=default stringeol=stringeol # @"verbatim" -verbatim=0x101030 +verbatim=extra # (/regex/) -regex=0x105090 +regex=extra commentlinedoc=commentdoc,bold commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc @@ -33,6 +33,7 @@ [lexer_properties] styling.within.preprocessor=1 +lexer.cpp.track.preprocessor=0 preprocessor.symbol.$(file.patterns.cpp)=# preprocessor.start.$(file.patterns.cpp)=if preprocessor.middle.$(file.patterns.cpp)=else elif @@ -42,7 +43,7 @@ lexer_filetype=C # default extension used when saving files -#extension=cs +extension=cs # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.css =================================================================== --- branches/sm/data/filetypes.css 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.css 2011-02-27 08:57:20 UTC (rev 5550) @@ -40,7 +40,7 @@ [settings] # default extension used when saving files -#extension=css +extension=css # the following characters are these which a "word" can contains, see documentation #wordchars=_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.d =================================================================== --- branches/sm/data/filetypes.d 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.d 2011-02-27 08:57:20 UTC (rev 5550) @@ -7,9 +7,9 @@ commentdoc=commentdoc commentdocnested=commentdoc number=number -word=word -word2=word2 -word3=word2 +word=keyword +word2=keyword2 +word3=keyword2 typedef=type string=string stringeol=stringeol @@ -22,7 +22,7 @@ [keywords] # all items must be in one line -primary=__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate delete deprecated do double else enum export extern false final finally float for foreach function goto idouble if ifloat import in inout int interface invariant ireal is long mixin module new null out override package pragma private protected public real return scope short static struct super switch synchronized template this throw true try typedef typeof ubyte ucent uint ulong union unittest ushort version void volatile wchar while with +primary=__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate delete deprecated do double else enum export extern false final finally float for foreach function goto idouble if ifloat immutable import in inout int interface invariant ireal is long macro mixin module new nothrow null out override package pragma private protected public pure real ref return scope shared short static struct super switch synchronized template this throw true try typedef typeof ubyte ucent uint ulong union unittest ushort version void volatile wchar while with secondary= # documentation keywords for D, currently not working docComment=Authors Bugs Copyright Date Deprecated Examples History License Macros Params Returns See_Also Standards Throws Version @@ -30,7 +30,7 @@ [settings] # default extension used when saving files -#extension=d +extension=d # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.diff =================================================================== --- branches/sm/data/filetypes.diff 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.diff 2011-02-27 08:57:20 UTC (rev 5550) @@ -13,7 +13,7 @@ [settings] # default extension used when saving files -#extension=diff +extension=diff # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.docbook =================================================================== --- branches/sm/data/filetypes.docbook 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.docbook 2011-02-27 08:57:20 UTC (rev 5550) @@ -42,7 +42,7 @@ [settings] # default extension used when saving files -#extension=docbook +extension=docbook # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 @@ -61,3 +61,7 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + +# if this setting is set to true, a new line after a line ending with an +# unclosed tag will be automatically indented +xml_indent_tags=true Added: branches/sm/data/filetypes.erlang =================================================================== --- branches/sm/data/filetypes.erlang (rev 0) +++ branches/sm/data/filetypes.erlang 2011-02-27 08:57:20 UTC (rev 5550) @@ -0,0 +1,71 @@ +[styling] +# Each of these (...) refers to the lexer state SCE_ERLANG_(...) +default=default +comment=comment +variable=default +number=number +keyword=keyword +string=string +operator=operator +atom=default +function_name=default,bold +character=default +macro=preprocessor +record=type +preproc=preprocessor +node_name=default +comment_function=comment +comment_module=comment +comment_doc=comment +comment_doc_macro=comment +atom_quoted=default +macro_quoted=default +record_quoted=default +node_name_quoted=default +bifs=keyword2 +modules=default +modules_att=preprocessor +unknown=default + +[keywords] +# all items must be in one line +keywords=after and andalso band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse query receive rem try when xor +# Erlang built-in functions (BIFs) +bifs=erlang: abs adler32 adler32_combine erlang:append_element apply atom_to_binary atom_to_list binary_to_atom binary_to_existing_atom binary_to_list bitstring_to_list binary_to_term bit_size erlang:bump_reductions byte_size erlang:cancel_timer check_process_code concat_binary crc32 crc32_combine date decode_packet delete_module erlang:demonitor disconnect_node erlang:display element erase erlang:error exit float float_to_list erlang:fun_info erlang:fun_to_list erlang:function_exported garbage_collect get erlang:get_cookie get_keys erlang:get_stacktrace group_leader halt erlang:hash hd erlang:hibernate integer_to_list erlang:integer_to_list iolist_to_binary iolist_size is_alive is_atom is_binary is_bitstring is_boolean erlang:is_builtin is_float is_function is_integer is_list is_number is_pid is_port is_process_alive is_record is_reference is_tuple length link list_to_atom list_to_binary list_to_bitstring list_to_existing_atom list_to_float list_to_integer erlang:list_to_integer list_to_pid list_to_tuple load_module erlang:load_nif erlang:loaded erlang:localtime erlang:localtime_to_universaltime make_ref erlang:make_tuple erlang:max erlang:md5 erlang:md5_final erlang:md5_init erlang:md5_update erlang:memory erlang:min module_loaded erlang:monitor monitor_node node nodes now open_port erlang:phash erlang:phash2 pid_to_list port_close port_command erlang:port_command port_connect port_control erlang:port_call erlang:port_info erlang:port_to_list erlang:ports pre_loaded erlang:process_display process_flag process_info processes purge_module put erlang:raise erlang:read_timer erlang:ref_to_list register registered erlang:resume_process round self erlang:send erlang:send_after erlang:send_nosuspend erlang:set_cookie setelement size spawn spawn_link spawn_monitor spawn_opt split_binary erlang:start_timer statistics erlang:suspend_process erlang:system_flag erlang:system_info erlang:system_monitor erlang:system_profile term_to_binary throw time tl erlang:trace erlang:trace_delivered erlang:trace_info erlang:trace_pattern trunc tuple_size tuple_to_list erlang:universaltime erlang:universaltime_to_localtime unlink unregister whereis erlang:yield +# Erlang preprocessor instructions +preproc=-define -else -endif -ifdef -ifndef -include -include_lib -undef +# Erlang module attributes +module=-behavior -behaviour -compile -created -created_by -export -file -import -module -modified -modified_by -record -revision -spec -type -vsn +# Erlang documentation helpers +doc=@author @clear @copyright @deprecated @doc @docfile @end @equiv @headerfile @hidden @private @reference @see @since @spec @throws @title @todo @TODO @type @version +# Erlang documentation macros +doc_macro=@date @docRoot @link @module @package @section @time @type @version + +[settings] +# default extension used when saving files +extension=erl + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=% +comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=erlc "%f" +run_cmd=erl "%f" Modified: branches/sm/data/filetypes.f77 =================================================================== --- branches/sm/data/filetypes.f77 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.f77 2011-02-27 08:57:20 UTC (rev 5550) @@ -28,7 +28,7 @@ [settings] # default extension used when saving files -#extension=f +extension=f # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.ferite =================================================================== --- branches/sm/data/filetypes.ferite 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.ferite 2011-02-27 08:57:20 UTC (rev 5550) @@ -6,19 +6,19 @@ commentline=comment commentdoc=commentdoc number=number -word=word -word2=word2 +word=keyword +word2=keyword2 string=string character=string -uuid=0x404080 +uuid=extra preprocessor=preprocessor operator=operator identifier=default stringeol=stringeol # @"verbatim" -verbatim=0x101030 +verbatim=extra # (/regex/) -regex=0x105090 +regex=extra commentlinedoc=commentdoc,bold commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc @@ -32,7 +32,7 @@ [settings] # default extension used when saving files -#extension=fe +extension=fe # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Copied: branches/sm/data/filetypes.forth (from rev 5549, branches/sm/data/filetypes.conf) =================================================================== --- branches/sm/data/filetypes.forth (rev 0) +++ branches/sm/data/filetypes.forth 2011-02-27 08:57:20 UTC (rev 5550) @@ -0,0 +1,45 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=default +comment=commentdoc +commentml=comment +identifier=default +control=0x301010;0xffffff;true;false +keyword=0x301060;0xffffff;true;false +defword=0x000080;;false;true +preword1=0x000000;0xe0c0e0;false;false +preword2=0xaaaaaa;0xffffff;false;true +number=0x007f00;0xffffff;false;false +string=string +locale=0xff0000;0xffffff;false;true + +[keywords] +# all items must be in one line +primary=ABORT EXIT DO LOOP UNLOOP BEGIN UNTIL WHILE REPEAT EXIT IF ELSE THEN CASE ENDCASE OF ENDOF + + +[settings] +# default extension used when saving files +extension=fs + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=( +comment_close= ) + +# comment_open=\ +# comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= Modified: branches/sm/data/filetypes.fortran =================================================================== --- branches/sm/data/filetypes.fortran 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.fortran 2011-02-27 08:57:20 UTC (rev 5550) @@ -21,14 +21,14 @@ [keywords] # all items must be in one line -primary=access action advance allocatable allocate apostrophe assign assignment associate asynchronous backspace bind blank blockdata call case character class close common complex contains continue cycle data deallocate decimal delim default dimension direct do dowhile double doubleprecision elemental else elseif elsewhere encoding end endassociate endblockdata enddo endfile endforall endfunction endif endinterface endmodule endprogram endselect endsubroutine endtype endwhere entry eor equivalence err errmsg exist exit extends external file flush fmt forall form format formatted function go goto id if implicit in include inout integer inquire intent interface intrinsic iomsg iolength iostat kind len logical module name named namelist nextrec nml none nullify number only open opened operator optional out pad parameter pass pause pending pointer pos position precision print private procedure program protected public quote pure read readwrite real rec recl recursive result return rewind save select selectcase selecttype sequential sign size stat status stop stream subroutine target then to type unformatted unit use value volatile wait where while write +primary=abstract access action advance allocatable allocate apostrophe assign assignment associate asynchronous backspace bind blank blockdata call case character class close common complex contains continue cycle data deallocate decimal delim default dimension direct do dowhile double doubleprecision elemental else elseif elsewhere encoding end endassociate endblockdata enddo endfile endforall endfunction endif endinterface endmodule endprogram endselect endsubroutine endtype endwhere entry eor equivalence err errmsg exist exit extends external file flush fmt forall form format formatted function go goto id if implicit import in include inout integer inquire intent interface intrinsic iomsg iolength iostat kind len logical module name named namelist nextrec nml none nullify number only open opened operator optional out pad parameter pass pause pending pointer pos position precision print private procedure program protected public quote pure read readwrite real rec recl recursive result return rewind save select selectcase selecttype sequential sign size stat status stop stream subroutine target then to type unformatted unit use value volatile wait where while write intrinsic_functions=abs achar acos acosd adjustl adjustr aimag aimax0 aimin0 aint ajmax0 ajmin0 akmax0 akmin0 all allocated alog alog10 amax0 amax1 amin0 amin1 amod anint any asin asind associated atan atan2 atan2d atand bitest bitl bitlr bitrl bjtest bit_size bktest break btest cabs ccos cdabs cdcos cdexp cdlog cdsin cdsqrt ceiling cexp char clog cmplx conjg cos cosd cosh count cpu_time cshift csin csqrt dabs dacos dacosd dasin dasind datan datan2 datan2d datand date date_and_time dble dcmplx dconjg dcos dcosd dcosh dcotan ddim dexp dfloat dflotk dfloti dflotj digits dim dimag dint dlog dlog10 dmax1 dmin1 dmod dnint dot_product dprod dreal dsign dsin dsind dsinh dsqrt dtan dtand dtanh eoshift epsilon errsns exp exponent float floati floatj floatk floor fraction free huge iabs iachar iand ibclr ibits ibset ichar idate idim idint idnint ieor ifix iiabs iiand iibclr iibits iibset iidim iidint iidnnt iieor iifix iint iior iiqint iiqnnt iishft iishftc iisign ilen imax0 imax1 imin0 imin1 imod index inint inot int int1 int2 int4 int8 iqint iqnint ior ishft ishftc isign isnan izext jiand jibclr jibits jibset jidim jidint jidnnt jieor jifix jint jior jiqint jiqnnt jishft jishftc jisign jmax0 jmax1 jmin0 jmin1 jmod jnint jnot jzext kiabs kiand kibclr kibits kibset kidim kidint kidnnt kieor kifix kind kint kior kishft kishftc kisign kmax0 kmax1 kmin0 kmin1 kmod knint knot kzext lbound leadz len len_trim lenlge lge lgt lle llt log log10 logical lshift malloc matmul max max0 max1 maxexponent maxloc maxval merge min min0 min1 minexponent minloc minval mod modulo mvbits nearest nint not nworkers number_of_processors pack popcnt poppar precision present product radix random random_number random_seed range real repeat reshape rrspacing rshift scale scan secnds selected_int_kind selected_real_kind set_exponent shape sign sin sind sinh size sizeof sngl snglq spacing spread sqrt sum system_clock tan tand tanh tiny transfer transpose trim ubound unpack verify user_functions=cdabs cdcos cdexp cdlog cdsin cdsqrt cotan cotand dcmplx dconjg dcotan dcotand decode dimag dll_export dll_import doublecomplex dreal dvchk encode find flen flush getarg getcharqq getcl getdat getenv gettim hfix ibchng identifier imag int1 int2 int4 intc intrup invalop iostat_msg isha ishc ishl jfix lacfar locking locnear map nargs nbreak ndperr ndpexc offset ovefl peekcharqq precfill prompt qabs qacos qacosd qasin qasind qatan qatand qatan2 qcmplx qconjg qcos qcosd qcosh qdim qexp qext qextd qfloat qimag qlog qlog10 qmax1 qmin1 qmod qreal qsign qsin qsind qsinh qsqrt qtan qtand qtanh ran rand randu rewrite segment setdat settim system timer undfl unlock union val virtual volatile zabs zcos zexp zlog zsin zsqrt [settings] # default extension used when saving files -#extension=f90 +extension=f90 # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.freebasic =================================================================== --- branches/sm/data/filetypes.freebasic 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.freebasic 2011-02-27 08:57:20 UTC (rev 5550) @@ -32,7 +32,7 @@ [settings] # default extension used when saving files -#extension=bas +extension=bas # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.glsl =================================================================== --- branches/sm/data/filetypes.glsl 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.glsl 2011-02-27 08:57:20 UTC (rev 5550) @@ -6,19 +6,19 @@ commentline=comment commentdoc=commentdoc number=number -word=word -word2=word2 +word=keyword +word2=keyword2 string=string character=string -uuid=0x404080 +uuid=extra preprocessor=preprocessor operator=operator identifier=default stringeol=stringeol # @"verbatim" -verbatim=0x101030 +verbatim=extra # (/regex/) -regex=0x105090 +regex=extra commentlinedoc=commentdoc,bold commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc @@ -36,6 +36,7 @@ [lexer_properties] styling.within.preprocessor=1 +lexer.cpp.track.preprocessor=0 preprocessor.symbol.$(file.patterns.cpp)=# preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef preprocessor.middle.$(file.patterns.cpp)=else elif @@ -45,7 +46,7 @@ lexer_filetype=C # default extension used when saving files -#extension=glsl +extension=glsl # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.haskell =================================================================== --- branches/sm/data/filetypes.haskell 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.haskell 2011-02-27 08:57:20 UTC (rev 5550) @@ -26,7 +26,7 @@ [settings] # default extension used when saving files -#extension=hs +extension=hs # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.haxe =================================================================== --- branches/sm/data/filetypes.haxe 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.haxe 2011-02-27 08:57:20 UTC (rev 5550) @@ -6,19 +6,19 @@ commentline=comment commentdoc=commentdoc number=number -word=word -word2=word2 +word=keyword +word2=keyword2 string=string character=string -uuid=0x404080 +uuid=extra preprocessor=preprocessor operator=operator identifier=default stringeol=stringeol # @"verbatim" -verbatim=0x101030 +verbatim=extra # (/regex/) -regex=0x105090 +regex=extra commentlinedoc=commentdoc,bold commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc @@ -33,7 +33,7 @@ [settings] # default extension used when saving files -#extension=hx +extension=hx # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: branches/sm/data/filetypes.html =================================================================== --- branches/sm/data/filetypes.html 2011-02-27 08:46:16 UTC (rev 5549) +++ branches/sm/data/filetypes.html 2011-02-27 08:57:20 UTC (rev 5550) @@ -11,7 +11,7 @@ [settings] # default extension used when saving files -#extension=html +extension=html # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 @@ -32,6 +32,10 @@ @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5549] branches/sm/src
by statc＠users.sourceforge.net 27 Feb '11

27 Feb '11

Revision: 5549 http://geany.svn.sourceforge.net/geany/?rev=5549&view=rev Author: statc Date: 2011-02-27 08:46:16 +0000 (Sun, 27 Feb 2011) Log Message: ----------- SM: Don't save configuration on interactive SmSaveGlobal; don't ask to cancel shutdown if not a shutdown. Modified Paths: -------------- branches/sm/src/callbacks.c branches/sm/src/main.c branches/sm/src/main.h branches/sm/src/sm.c Modified: branches/sm/src/callbacks.c =================================================================== --- branches/sm/src/callbacks.c 2011-02-27 08:45:50 UTC (rev 5548) +++ branches/sm/src/callbacks.c 2011-02-27 08:46:16 UTC (rev 5549) @@ -116,7 +116,7 @@ quit = FALSE; } - if (quit && main_save(TRUE)) + if (quit && main_save(GEANY_MAIN_SAVE_ALL, TRUE)) { main_finalize(); return FALSE; Modified: branches/sm/src/main.c =================================================================== --- branches/sm/src/main.c 2011-02-27 08:45:50 UTC (rev 5548) +++ branches/sm/src/main.c 2011-02-27 08:46:16 UTC (rev 5549) @@ -1190,17 +1190,20 @@ } -gboolean main_save(gboolean interactive) +gboolean main_save(GeanyMainSaveFlags flags, gboolean interactive) { - if (interactive && !document_account_for_unsaved()) - return FALSE; + if ((flags & GEANY_MAIN_SAVE_DOCUMENTS) && interactive) + if (!document_account_for_unsaved()) + return FALSE; - if (!cl_options.new_instance) - configuration_save(GEANY_SETTINGS_RUNTIME); + if (flags & GEANY_MAIN_SAVE_CONFIGURATION) + { + if (!cl_options.new_instance) + configuration_save(GEANY_SETTINGS_RUNTIME); + if (app->project) + project_save(FALSE, GEANY_PROJECT_SETTINGS_RUNTIME); + } - if (app->project) - project_save(FALSE, GEANY_PROJECT_SETTINGS_RUNTIME); - return TRUE; } Modified: branches/sm/src/main.h =================================================================== --- branches/sm/src/main.h 2011-02-27 08:45:50 UTC (rev 5548) +++ branches/sm/src/main.h 2011-02-27 08:46:16 UTC (rev 5549) @@ -69,11 +69,20 @@ extern GeanyStatus main_status; +typedef enum +{ + GEANY_MAIN_SAVE_CONFIGURATION = 1, + GEANY_MAIN_SAVE_DOCUMENTS = 2, + GEANY_MAIN_SAVE_ALL = 3 +} +GeanyMainSaveFlags; + + const gchar *main_get_version_string(void); gchar *main_get_argv_filename(const gchar *filename); -gboolean main_save(gboolean interactive); +gboolean main_save(GeanyMainSaveFlags flags, gboolean interactive); void main_finalize(void); Modified: branches/sm/src/sm.c =================================================================== --- branches/sm/src/sm.c 2011-02-27 08:45:50 UTC (rev 5548) +++ branches/sm/src/sm.c 2011-02-27 08:46:16 UTC (rev 5549) @@ -109,6 +109,11 @@ */ static SmPropValue sm_client_id_arg_val; +/* The last values received by sm_save_yourself_callback(). + * Used by the sm_interact_callback(). */ +static GeanyMainSaveFlags sm_last_save_flags; +static Bool sm_last_shutdown; + #endif /* @@ -576,16 +581,34 @@ static void sm_save_yourself_callback(SmcConn smcon, SmPointer client_data, int save_type, Bool shutdown, int interact_style, Bool fast) { + sm_last_shutdown = shutdown; + switch (save_type) + { + case SmSaveGlobal: + sm_last_save_flags = GEANY_MAIN_SAVE_DOCUMENTS; + break; + case SmSaveLocal: + sm_last_save_flags = GEANY_MAIN_SAVE_CONFIGURATION; + break; + case SmSaveBoth: + sm_last_save_flags = GEANY_MAIN_SAVE_ALL; + break; + default: + sm_last_save_flags = 0; + } + if (save_type == SmSaveGlobal || save_type == SmSaveBoth) { + /* if we may save documents... */ if (interact_style == SmInteractStyleAny && document_any_unsaved()) { + /* ...and do it interactively, then use InteractRequest */ + sm_last_save_flags = save_type; + sm_last_shutdown = shutdown; if (!SmcInteractRequest(smcon, SmDialogNormal, sm_interact_callback, NULL)) SmcSaveYourselfDone(smcon, FALSE); return; } - else - main_save(FALSE); } /* @@ -594,6 +617,7 @@ * until we get "Die" or "Shutdown" message. */ + main_save(sm_last_save_flags, FALSE); sm_set_runtime_props(smcon); SmcSaveYourselfDone(smcon, TRUE); } @@ -619,9 +643,9 @@ */ static void sm_interact_callback(SmcConn smcon, SmPointer client_data) { - gboolean cancelled = !main_save(TRUE); + gboolean cancelled = !main_save(sm_last_save_flags, TRUE); sm_set_runtime_props(smcon); - SmcInteractDone(smcon, cancelled); + SmcInteractDone(smcon, sm_last_shutdown && cancelled); SmcSaveYourselfDone(smcon, TRUE); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5548] branches/sm/src/sm.c
by statc＠users.sourceforge.net 27 Feb '11

27 Feb '11

Revision: 5548 http://geany.svn.sourceforge.net/geany/?rev=5548&view=rev Author: statc Date: 2011-02-27 08:45:50 +0000 (Sun, 27 Feb 2011) Log Message: ----------- SM: Don't set the userid property if the user name can't be determined. Borrowed from alternative SM patch by Dimitar Zhekov, thanks. Modified Paths: -------------- branches/sm/src/sm.c Modified: branches/sm/src/sm.c =================================================================== --- branches/sm/src/sm.c 2011-02-27 08:45:29 UTC (rev 5547) +++ branches/sm/src/sm.c 2011-02-27 08:45:50 UTC (rev 5548) @@ -356,24 +356,26 @@ const gchar * username = g_get_user_name(); gchar * curdir = g_get_current_dir(); - SmPropValue userid_val = { - username ? strlen(username) : 0, - username ? (char *)username : ""}; - SmPropValue curdir_val = { - strlen(curdir), - curdir}; + SmProp program_prop = {SmProgram, SmARRAY8, 1, &sm_program_val}; - SmProp program_prop = {SmProgram, SmARRAY8, 1, &sm_program_val}; - SmProp userid_prop = {SmUserID, SmARRAY8, 1, &userid_val}; + SmPropValue curdir_val = {strlen(curdir), curdir}; SmProp curdir_prop = {SmCurrentDirectory, SmARRAY8, 1, &curdir_val}; - SmProp * proplist[3] = { + SmProp * proplist[2] = { &program_prop, - &userid_prop, &curdir_prop }; - SmcSetProperties(smcon, 3, proplist); + SmcSetProperties(smcon, 2, proplist); + if (username) + { + SmPropValue userid_val = {strlen(username), (char *)username}; + SmProp userid_prop = {SmUserID, SmARRAY8, 1, &userid_val}; + + proplist[0] = &userid_prop; + SmcSetProperties(smcon, 1, proplist); + } + g_free(curdir); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5547] branches/sm/src/prefs.c
by statc＠users.sourceforge.net 27 Feb '11

27 Feb '11

Revision: 5547 http://geany.svn.sourceforge.net/geany/?rev=5547&view=rev Author: statc Date: 2011-02-27 08:45:29 +0000 (Sun, 27 Feb 2011) Log Message: ----------- Update for r4673: necessarily make the checkbox insensitive when Preferences dialog is initialized. Modified Paths: -------------- branches/sm/src/prefs.c Modified: branches/sm/src/prefs.c =================================================================== --- branches/sm/src/prefs.c 2011-02-27 08:45:10 UTC (rev 5546) +++ branches/sm/src/prefs.c 2011-02-27 08:45:29 UTC (rev 5547) @@ -350,6 +350,7 @@ /* startup */ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_load_session"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), prefs.load_session); + on_load_session_toggled(GTK_TOGGLE_BUTTON(widget), NULL); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_load_session_even_if_any_files_opened"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), prefs.load_session_even_if_any_files_opened); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5546] branches/sm/src
by statc＠users.sourceforge.net 27 Feb '11

27 Feb '11

Revision: 5546 http://geany.svn.sourceforge.net/geany/?rev=5546&view=rev Author: statc Date: 2011-02-27 08:45:10 +0000 (Sun, 27 Feb 2011) Log Message: ----------- Fix opening a project when "Use project session files" preference is disabled. This bug was introduced in sm branch. Modified Paths: -------------- branches/sm/src/main.c branches/sm/src/main.h branches/sm/src/socket.c Modified: branches/sm/src/main.c =================================================================== --- branches/sm/src/main.c 2011-02-27 08:44:38 UTC (rev 5545) +++ branches/sm/src/main.c 2011-02-27 08:45:10 UTC (rev 5546) @@ -889,7 +889,8 @@ } -void main_load_project_from_command_line(const gchar *locale_filename, gboolean load_files) +void main_load_project_from_command_line(const gchar *locale_filename, + gboolean use_session, gboolean load_files) { gchar *pfile = NULL; @@ -900,10 +901,10 @@ if (pfile != NULL) { - if (load_files) + if (use_session) project_load_file_with_session(pfile); else - project_load_file(pfile, FALSE); + project_load_file(pfile, load_files); } g_free(pfile); @@ -923,7 +924,14 @@ { /* Do not load project session files if we are being restored by session manager: * corresponding file names are passed via command-line and will be handled by open_cl_files() */ - main_load_project_from_command_line(cl_options.project, !main_status.restoring); + main_load_project_from_command_line(cl_options.project, FALSE, !main_status.restoring); + + /* If project sessions are enabled, this call will load filenames stored in project file. + * Otherwise, it will load filenames from default session, thus we take + * `load_default_session' variable into account. */ + if (!main_status.restoring && (project_prefs.project_session || load_default_session)) + configuration_open_files(); + load_default_session = FALSE; } Modified: branches/sm/src/main.h =================================================================== --- branches/sm/src/main.h 2011-02-27 08:44:38 UTC (rev 5545) +++ branches/sm/src/main.h 2011-02-27 08:45:10 UTC (rev 5546) @@ -85,6 +85,9 @@ gboolean main_is_realized(void); -void main_load_project_from_command_line(const gchar *locale_filename, gboolean load_files); +/* Here load_files argument is valid if and only if use_session is FALSE. + * In other words, use_session implies load_files. */ +void main_load_project_from_command_line(const gchar *locale_filename, + gboolean use_session, gboolean load_files); #endif Modified: branches/sm/src/socket.c =================================================================== --- branches/sm/src/socket.c 2011-02-27 08:44:38 UTC (rev 5545) +++ branches/sm/src/socket.c 2011-02-27 08:45:10 UTC (rev 5546) @@ -573,7 +573,7 @@ if (project) { if (project_ask_close()) - main_load_project_from_command_line(locale_filename, TRUE); + main_load_project_from_command_line(locale_filename, TRUE, TRUE); } else main_handle_filename(locale_filename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5545] branches/sm/src/main.c
by statc＠users.sourceforge.net 27 Feb '11

27 Feb '11

Revision: 5545 http://geany.svn.sourceforge.net/geany/?rev=5545&view=rev Author: statc Date: 2011-02-27 08:44:38 +0000 (Sun, 27 Feb 2011) Log Message: ----------- Another SM-related change in main.c:load_startup_files(). Modified Paths: -------------- branches/sm/src/main.c Modified: branches/sm/src/main.c =================================================================== --- branches/sm/src/main.c 2011-02-22 17:15:29 UTC (rev 5544) +++ branches/sm/src/main.c 2011-02-27 08:44:38 UTC (rev 5545) @@ -857,7 +857,7 @@ } -static void load_session_project_file(gboolean load_filenames) +static void load_session_project_file() { gchar *locale_filename; @@ -866,7 +866,7 @@ locale_filename = utils_get_locale_from_utf8(project_prefs.session_file); if (NZV(locale_filename)) - project_load_file(locale_filename, load_filenames); + project_load_file(locale_filename, TRUE); g_free(locale_filename); g_free(project_prefs.session_file); /* no longer needed */ @@ -927,15 +927,14 @@ load_default_session = FALSE; } - if (load_default_session) + /* Do not load session files if we are being restored by session manager: + * corresponding file names are passed via command-line and will-be handles by open_cl_files(). + * If default session contains a project, the project's name is also passed via command-line, + * this case is handled in the condition above. */ + if (!main_status.restoring && load_default_session) { - /* Load project session file (if any) writing its filenames into global session_files variable. - * Don't load filenames when being restored by session manager: in that case file names are - * passed via command line and will be opened by open_cl_files() */ - load_session_project_file(!main_status.restoring); - /* load files into tabs, as they are found in the session_files variable */ - if (!main_status.restoring) - configuration_open_files(); + load_session_project_file(); + configuration_open_files(); } open_cl_files(argc, argv); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5544] trunk
by ntrel＠users.sourceforge.net 22 Feb '11

22 Feb '11

Revision: 5544 http://geany.svn.sourceforge.net/geany/?rev=5544&view=rev Author: ntrel Date: 2011-02-22 17:15:29 +0000 (Tue, 22 Feb 2011) Log Message: ----------- Fix segfault when inserting e.g. fileheader template when the template file is empty (#3070913, thanks to lphilpot). Modified Paths: -------------- trunk/ChangeLog trunk/src/templates.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-02-21 19:09:34 UTC (rev 5543) +++ trunk/ChangeLog 2011-02-22 17:15:29 UTC (rev 5544) @@ -1,3 +1,10 @@ +2011-02-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/templates.c: + Fix segfault when inserting e.g. fileheader template when the + template file is empty (#3070913, thanks to lphilpot). + + 2011-02-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * plugins/filebrowser.c: Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2011-02-21 19:09:34 UTC (rev 5543) +++ trunk/src/templates.c 2011-02-22 17:15:29 UTC (rev 5544) @@ -508,12 +508,15 @@ /* add line_prefix to every line of comment_text */ lines = g_strsplit(comment_text->str, template_eol_char, -1); - len = g_strv_length(lines) - 1; - for (i = 0; i < len; i++) + len = g_strv_length(lines); + if (len > 0) /* prevent unsigned wraparound if comment_text is empty */ { - tmp = lines[i]; - lines[i] = g_strconcat(prefix, tmp, NULL); - g_free(tmp); + for (i = 0; i < len - 1; i++) + { + tmp = lines[i]; + lines[i] = g_strconcat(prefix, tmp, NULL); + g_free(tmp); + } } tmp = g_strjoinv(template_eol_char, lines); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5543] trunk
by eht16＠users.sourceforge.net 22 Feb '11

22 Feb '11

Revision: 5543 http://geany.svn.sourceforge.net/geany/?rev=5543&view=rev Author: eht16 Date: 2011-02-21 19:09:34 +0000 (Mon, 21 Feb 2011) Log Message: ----------- Add support for multiple file filters, separated by semicolon (based on a patch by Grigory Javadyan, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-02-07 17:23:41 UTC (rev 5542) +++ trunk/ChangeLog 2011-02-21 19:09:34 UTC (rev 5543) @@ -1,3 +1,10 @@ +2011-02-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * plugins/filebrowser.c: + Add support for multiple file filters, separated by semicolon + (based on a patch by Grigory Javadyan, thanks). + + 2011-02-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * data/filetype_extensions.conf: Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2011-02-07 17:23:41 UTC (rev 5542) +++ trunk/plugins/filebrowser.c 2011-02-21 19:09:34 UTC (rev 5543) @@ -80,7 +80,7 @@ static gchar *current_dir = NULL; /* in locale-encoding */ static gchar *open_cmd; /* in locale-encoding */ static gchar *config_file; -static gchar *filter = NULL; +static gchar **filter = NULL; static gint page_number = 0; @@ -158,14 +158,21 @@ /* Returns: whether filename should be removed. */ static gboolean check_filtered(const gchar *base_name) { + gchar **filter_item; + guint len; + if (filter == NULL) return FALSE; - - if (! utils_str_equal(base_name, "*") && ! g_pattern_match_simple(filter, base_name)) + + len = g_strv_length(filter); + foreach_c_array(filter_item, filter, len) { - return TRUE; + if (utils_str_equal(base_name, "*") || g_pattern_match_simple(*filter_item, base_name)) + { + return FALSE; + } } - return FALSE; + return TRUE; } @@ -728,9 +735,19 @@ } +static void clear_filter(void) +{ + if (filter != NULL) + { + g_strfreev(filter); + filter = NULL; + } +} + + static void on_clear_filter(GtkEntry *entry, gpointer user_data) { - setptr(filter, NULL); + clear_filter(); gtk_entry_set_text(GTK_ENTRY(filter_entry), ""); @@ -777,13 +794,11 @@ static void on_filter_activate(GtkEntry *entry, gpointer user_data) { - setptr(filter, g_strdup(gtk_entry_get_text(entry))); - - if (! NZV(filter)) + filter = g_strsplit(gtk_entry_get_text(entry), ";", -1); + if (filter == NULL || g_strv_length(filter) == 0) { - setptr(filter, g_strdup("*")); + clear_filter(); } - refresh(); } @@ -791,8 +806,7 @@ static void on_filter_clear(GtkEntry *entry, gint icon_pos, GdkEvent *event, gpointer data) { - setptr(filter, g_strdup("*")); - + clear_filter(); refresh(); } @@ -896,7 +910,7 @@ g_signal_connect(filter_entry, "icon-release", G_CALLBACK(on_filter_clear), NULL); } ui_widget_set_tooltip_text(filter_entry, - _("Filter your files with usual wildcards")); + _("Filter your files with usual wildcards, separate multiple filters with \";\"")); g_signal_connect(filter_entry, "activate", G_CALLBACK(on_filter_activate), NULL); gtk_box_pack_start(GTK_BOX(filterbar), label, FALSE, FALSE, 0); @@ -1080,7 +1094,7 @@ GtkWidget *scrollwin, *toolbar, *filterbar; filter = NULL; - + file_view_vbox = gtk_vbox_new(FALSE, 0); toolbar = make_toolbar(); gtk_box_pack_start(GTK_BOX(file_view_vbox), toolbar, FALSE, FALSE, 0); @@ -1252,7 +1266,7 @@ g_free(config_file); g_free(open_cmd); - g_free(filter); + clear_filter(); gtk_widget_destroy(file_view_vbox); g_object_unref(G_OBJECT(entry_completion)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5542] trunk/ChangeLog
by ntrel＠users.sourceforge.net 07 Feb '11

07 Feb '11

Revision: 5542 http://geany.svn.sourceforge.net/geany/?rev=5542&view=rev Author: ntrel Date: 2011-02-07 17:23:41 +0000 (Mon, 07 Feb 2011) Log Message: ----------- Add bug nos. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-02-07 17:19:23 UTC (rev 5541) +++ trunk/ChangeLog 2011-02-07 17:23:41 UTC (rev 5542) @@ -1,7 +1,8 @@ 2011-02-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * data/filetype_extensions.conf: - Fix detecting Matlab and Txt2Tags extensions by default. + Fix detecting Matlab and Txt2Tags extensions by default (#3167315, + #3154637). 2011-02-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5541] trunk
by ntrel＠users.sourceforge.net 07 Feb '11

07 Feb '11

Revision: 5541 http://geany.svn.sourceforge.net/geany/?rev=5541&view=rev Author: ntrel Date: 2011-02-07 17:19:23 +0000 (Mon, 07 Feb 2011) Log Message: ----------- Fix detecting Matlab and Txt2Tags extensions by default. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetype_extensions.conf Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-02-06 18:25:10 UTC (rev 5540) +++ trunk/ChangeLog 2011-02-07 17:19:23 UTC (rev 5541) @@ -1,3 +1,9 @@ +2011-02-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * data/filetype_extensions.conf: + Fix detecting Matlab and Txt2Tags extensions by default. + + 2011-02-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * tagmanager/latex.c: Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2011-02-06 18:25:10 UTC (rev 5540) +++ trunk/data/filetype_extensions.conf 2011-02-07 17:19:23 UTC (rev 5541) @@ -34,7 +34,7 @@ Lisp=*.lisp; Lua=*.lua; Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*; -Matlab=*.m; +Matlab/Octave=*.m; NSIS=*.nsi;*.nsh; Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; Perl=*.pl;*.perl;*.pm;*.agi;*.pod; @@ -47,7 +47,7 @@ Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4; SQL=*.sql; Tcl=*.tcl;*.tk;*.wish; -txt2tags=*.t2t; +Txt2tags=*.t2t; Vala=*.vala;*.vapi; Verilog=*.v; VHDL=*.vhd;*.vhdl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2011