X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/961893b5478e7676b1a422185fcac41f89434b0a..ecd6b7230c88deb23f880ee1df75ae4b230cf9ec:/ui-ssdiff.c?ds=sidebyside diff --git a/ui-ssdiff.c b/ui-ssdiff.c index 0cff4b8..08cf513 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c @@ -1,8 +1,8 @@ #include "cgit.h" +#include "ui-ssdiff.h" #include "html.h" #include "ui-shared.h" #include "ui-diff.h" -#include "ui-ssdiff.h" extern int use_ssdiff; @@ -138,9 +138,8 @@ static char *replace_tabs(char *line) strcat(result, prev_buf); break; } else { - strcat(result, " "); - strncat(result, spaces, 8 - (strlen(result) % 8)); strncat(result, prev_buf, cur_buf - prev_buf); + strncat(result, spaces, 8 - (strlen(result) % 8)); } prev_buf = cur_buf + 1; } @@ -230,10 +229,10 @@ static void print_ssdiff_line(char *class, if (old_line_no > 0) { struct diff_filespec *old_file = cgit_get_current_old_file(); char *lineno_str = fmt("n%d", old_line_no); - char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str); - html("%s", lineno_str, lineno_str, lineno_str + 1); + htmlf("' id='%s'>%s", lineno_str, lineno_str + 1); html(""); htmlf("", class); } else if (old_line) @@ -251,10 +250,10 @@ static void print_ssdiff_line(char *class, if (new_line_no > 0) { struct diff_filespec *new_file = cgit_get_current_new_file(); char *lineno_str = fmt("n%d", new_line_no); - char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str); - html("%s", lineno_str, lineno_str, lineno_str + 1); + htmlf("' id='%s'>%s", lineno_str, lineno_str + 1); html(""); htmlf("", class); } else if (new_line)