about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xssn.at>2009-08-09 13:43:18 +0000
committerLars Hjemli <hjemli@gmail.com>2009-08-21 14:14:21 +0200
commit03389d6e67bfda5cb3ff1504db815f09715ec6f4 (patch)
treec3424f2206c8b577becb35038e45e6f5cf2b40a5
parentscan-tree: split the pw_gecos field at the ',' to get the real name (diff)
downloadcgit-pink-03389d6e67bfda5cb3ff1504db815f09715ec6f4.tar.gz
cgit-pink-03389d6e67bfda5cb3ff1504db815f09715ec6f4.zip
ui-tree.c: show line numbers when highlighting
When source-filter is enabled, cgit currently will not display
linenumbers in the tree view. This patch restores the linenumber
function.

Signed-off-by: Florian Pritz <bluewind@xssn.at>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--ui-tree.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/ui-tree.c b/ui-tree.c
index c608754..7bf2ad2 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -22,15 +22,6 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
 		"<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n";
 
 	html("<table summary='blob content' class='blob'>\n");
-	if (ctx.repo->source_filter) {
-		html("<tr><td class='lines'><pre><code>");
-		ctx.repo->source_filter->argv[1] = xstrdup(name);
-		cgit_open_filter(ctx.repo->source_filter);
-		write(STDOUT_FILENO, buf, size);
-		cgit_close_filter(ctx.repo->source_filter);
-		html("</code></pre></td></tr></table>\n");
-		return;
-	}
 
 	html("<tr><td class='linenumbers'><pre>");
 	idx = 0;
@@ -45,6 +36,17 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
 		}
 	}
 	html("</pre></td>\n");
+
+	if (ctx.repo->source_filter) {
+		html("<td class='lines'><pre><code>");
+		ctx.repo->source_filter->argv[1] = xstrdup(name);
+		cgit_open_filter(ctx.repo->source_filter);
+		write(STDOUT_FILENO, buf, size);
+		cgit_close_filter(ctx.repo->source_filter);
+		html("</code></pre></td></tr></table>\n");
+		return;
+	}
+
 	html("<td class='lines'><pre><code>");
 	html_txt(buf);
 	html("</code></pre></td></tr></table>\n");