Revision: 3002 http://geany.svn.sourceforge.net/geany/?rev=3002&view=rev Author: ntrel Date: 2008-09-26 11:22:44 +0000 (Fri, 26 Sep 2008)

Log Message: ----------- Return GEANY_AUTOINDENT_BASIC from editor_get_indent_prefs() if the per-document pref is set, even if the global mode is none.

Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-25 19:20:04 UTC (rev 3001) +++ trunk/ChangeLog 2008-09-26 11:22:44 UTC (rev 3002) @@ -1,3 +1,10 @@ +2008-09-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Return GEANY_AUTOINDENT_BASIC from editor_get_indent_prefs() if the + per-document pref is set, even if the global mode is none. + + 2008-09-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

* geany.glade, src/interface.c, src/vte.c:

Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-09-25 19:20:04 UTC (rev 3001) +++ trunk/src/editor.c 2008-09-26 11:22:44 UTC (rev 3002) @@ -793,6 +793,11 @@

iprefs.type = editor->indent_type;

+ /* if per-document auto-indent is enabled, but we don't have a global mode set, + * just use basic auto-indenting */ + if (editor->auto_indent && iprefs.auto_indent_mode == GEANY_AUTOINDENT_NONE) + iprefs.auto_indent_mode = GEANY_AUTOINDENT_BASIC; + if (!editor->auto_indent) iprefs.auto_indent_mode = GEANY_AUTOINDENT_NONE;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.