Merge remote branch 'jakob/templates' into pu

goj · Sep 3, 2010 · d285018 · d285018
2 parents 8c2af1f + 50668cf
commit d285018
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/org.erlide.core/src/erlang/ErlideIndent.java b/org.erlide.core/src/erlang/ErlideIndent.java
@@ -54,9 +54,8 @@ public static IndentResult indentLine(final Backend b,
 
 	@SuppressWarnings("boxing")
 	public static OtpErlangObject indentLines(final Backend b,
-			final boolean template, final int offset, final int length,
-			final String text, final int tabw, final boolean useTabs,
-			final Map<String, String> prefs, final String prefix)
+			final int offset, final int length, final String text,
+			final int tabw, final boolean useTabs, final Map<String, String> prefs)
 			throws BackendException {
 		final OtpErlangObject o = b.call(20000, "erlide_indent",
 				"indent_lines", "siiiolx", text, offset, length, tabw, useTabs,

diff --git a/org.erlide.kernel.ide/src/parsing/erlide_indent.erl b/org.erlide.kernel.ide/src/parsing/erlide_indent.erl
@@ -162,7 +162,7 @@ template_indent_lines(Prefix, S, Tablength, UseTabs, Prefs) ->
     Length = length(S1) - From,
     {First, FirstLineNum, Lines} = erlide_text:get_text_and_lines(S1, From, Length),
     S2 = do_indent_lines(Lines, Tablength, UseTabs, First, get_prefs(Prefs), FirstLineNum, ""),
-    S3 = string:sub_string(S2, length(Prefix)+1, length(S2)-1),
+    S3 = string:substr(S2, length(Prefix)+1, length(S2)-1),
     unquote_template_variables(S3).
 
 %%

diff --git a/org.erlide.ui/src/org/erlide/ui/editors/erl/actions/IndentAction.java b/org.erlide.ui/src/org/erlide/ui/editors/erl/actions/IndentAction.java
@@ -63,8 +63,8 @@ private static OtpErlangObject doIndentLines(final int offset,
 					prefix, text, tabw, useTabs, prefs);
 			return r1;
 		} else {
-			final OtpErlangObject r1 = ErlideIndent.indentLines(b, template,
-					offset, length, text, tabw, useTabs, prefs, prefix);
+			final OtpErlangObject r1 = ErlideIndent.indentLines(b, offset,
+					length, text, tabw, useTabs, prefs);
 			return r1;
 		}
 	}