Revision: 2996 http://geany.svn.sourceforge.net/geany/?rev=2996&view=rev Author: ntrel Date: 2008-09-25 16:55:35 +0000 (Thu, 25 Sep 2008)
Log Message: ----------- Don't disable the per-document auto-indent pref when the global auto-indent mode is set to none (undoes part of r2981). In this case, the per-document pref just behaves like GEANY_AUTOINDENT_BASIC.
Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-25 11:38:58 UTC (rev 2995) +++ trunk/ChangeLog 2008-09-25 16:55:35 UTC (rev 2996) @@ -11,6 +11,11 @@ * doc/geany.txt, doc/geany.html: Minor formatting changes - make the using a Makefile paragraph a note. + * src/editor.c: + Don't disable the per-document auto-indent pref when the global + auto-indent mode is set to none (undoes part of r2981). In this + case, the per-document pref just behaves like + GEANY_AUTOINDENT_BASIC.
2008-09-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-09-25 11:38:58 UTC (rev 2995) +++ trunk/src/editor.c 2008-09-25 16:55:35 UTC (rev 2996) @@ -791,9 +791,6 @@
if (!editor->auto_indent) iprefs.auto_indent_mode = GEANY_AUTOINDENT_NONE; - else - if (iprefs.auto_indent_mode == GEANY_AUTOINDENT_NONE) - editor->auto_indent = FALSE; /* no global autoindent style to use */
return &iprefs; } @@ -3966,7 +3963,6 @@ void editor_apply_update_prefs(GeanyEditor *editor) { ScintillaObject *sci; - GtkWidget *item;
g_return_if_fail(editor != NULL);
@@ -3994,10 +3990,5 @@ sci_assign_cmdkey(sci, SCK_HOME, editor_prefs.smart_home_key ? SCI_VCHOMEWRAP : SCI_HOMEWRAP); sci_assign_cmdkey(sci, SCK_END, SCI_LINEENDWRAP); - - /* update some editor-related UI elements */ - item = lookup_widget(main_widgets.window, "menu_use_auto_indentation1"); - gtk_widget_set_sensitive(item, - editor_prefs.indentation->auto_indent_mode != GEANY_AUTOINDENT_NONE); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.