SF.net SVN: geany:[3169] trunk

[ntrel at users.sourceforge.net]

Revision: 3169
          http://geany.svn.sourceforge.net/geany/?rev=3169&view=rev
Author:   ntrel
Date:     2008-11-04 13:05:15 +0000 (Tue, 04 Nov 2008)

Log Message:
-----------
Fix snippets and smart indent using too much indentation when the
line contains whitespace after non-whitespace characters. This
might also have affected other features (auto table, etc).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-03 18:45:47 UTC (rev 3168)
+++ trunk/ChangeLog	2008-11-04 13:05:15 UTC (rev 3169)
@@ -1,3 +1,11 @@
+2008-11-04  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+   Fix snippets and smart indent using too much indentation when the
+   line contains whitespace after non-whitespace characters. This
+   might also have affected other features (auto table, etc).
+
+
 2008-11-03  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/callbacks.c:

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2008-11-03 18:45:47 UTC (rev 3168)
+++ trunk/src/editor.c	2008-11-04 13:05:15 UTC (rev 3169)
@@ -901,7 +901,6 @@
 	guint i, len, j = 0;
 	gint line;
 	gchar *linebuf;
-	const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor);
 
 	line = sci_get_line_from_position(sci, pos);
 
@@ -912,7 +911,7 @@
 	{
 		if (linebuf[i] == ' ' || linebuf[i] == '\t')	/* simple indentation */
 			indent[j++] = linebuf[i];
-		else if (iprefs->auto_indent_mode <= GEANY_AUTOINDENT_BASIC)
+		else
 			break;
 	}
 	indent[j] = '\0';


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