summaryrefslogtreecommitdiffabout
path: root/ui-shared.c
authorLars Hjemli <hjemli@gmail.com>2010-06-22 14:16:12 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-06-22 14:16:12 (UTC)
commit6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch) (unidiff)
tree49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /ui-shared.c
parent37a24e4e39737edaa5cdde501346a65eeb280e63 (diff)
parentd20313e3daf855ee5d4808e050f54614c200d7b1 (diff)
downloadcgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip
cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz
cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.bz2
Merge branch 'jh/context-lines'
Conflicts: cgit.c cgit.h
Diffstat (limited to 'ui-shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-shared.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c
index e991799..c99bcec 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -343,2 +343,9 @@ void cgit_commit_link(char *name, const char *title, const char *class,
343 html("ss=1"); 343 html("ss=1");
344 delim = "&amp;";
345 }
346 if (ctx.qry.context > 0 && ctx.qry.context != 3) {
347 html(delim);
348 html("context=");
349 htmlf("%d", ctx.qry.context);
350 delim = "&amp;";
344 } 351 }
@@ -384,2 +391,9 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
384 html("ss=1"); 391 html("ss=1");
392 delim = "&amp;";
393 }
394 if (ctx.qry.context > 0 && ctx.qry.context != 3) {
395 html(delim);
396 html("context=");
397 htmlf("%d", ctx.qry.context);
398 delim = "&amp;";
385 } 399 }