about summary refs log tree commit diff
path: root/cgit.h
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2010-06-22 16:16:12 +0200
committerLars Hjemli <hjemli@gmail.com>2010-06-22 16:16:12 +0200
commit6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch)
tree49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /cgit.h
parentMerge branch 'jh/path-limit' (diff)
parentui-diff: Add links to increase/decrease number of context lines in diffs (diff)
downloadcgit-pink-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz
cgit-pink-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip
Merge branch 'jh/context-lines'
Conflicts:
	cgit.c
	cgit.h
Diffstat (limited to '')
-rw-r--r--cgit.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index 80c3902..2b28d63 100644
--- a/cgit.h
+++ b/cgit.h
@@ -147,6 +147,7 @@ struct cgit_query {
 	int showmsg;
 	int ssdiff;
 	int show_all;
+	int context;
 	char *vpath;
 };
 
@@ -278,7 +279,7 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern int cgit_diff_files(const unsigned char *old_sha1,
 			   const unsigned char *new_sha1,
 			   unsigned long *old_size, unsigned long *new_size,
-			   int *binary, linediff_fn fn);
+			   int *binary, int context, linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
 			   const unsigned char *new_sha1,