aboutsummaryrefslogtreecommitdiff
path: root/ui-shared.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2010-06-22 14:16:12 +0000
committerLars Hjemli <hjemli@gmail.com>2010-06-22 14:16:12 +0000
commit6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch)
tree49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /ui-shared.c
parent37a24e4e39737edaa5cdde501346a65eeb280e63 (diff)
parentd20313e3daf855ee5d4808e050f54614c200d7b1 (diff)
downloadcgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar
cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz
cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip
Merge branch 'jh/context-lines'
Conflicts: cgit.c cgit.h
Diffstat (limited to 'ui-shared.c')
-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
@@ -341,6 +341,13 @@ void cgit_commit_link(char *name, const char *title, const char *class,
if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
html(delim);
html("ss=1");
+ delim = "&amp;";
+ }
+ if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+ html(delim);
+ html("context=");
+ htmlf("%d", ctx.qry.context);
+ delim = "&amp;";
}
html("'>");
html_txt(name);
@@ -382,6 +389,13 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
html(delim);
html("ss=1");
+ delim = "&amp;";
+ }
+ if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+ html(delim);
+ html("context=");
+ htmlf("%d", ctx.qry.context);
+ delim = "&amp;";
}
html("'>");
html_txt(name);