1 files changed, 8 insertions, 9 deletions

diff --git a/ui-diff.c b/ui-diff.c
index 868ceec..c6bad63 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -97,10 +97,12 @@ static void print_fileinfo(struct fileinfo *info)
         htmlf("</td><td class='%s'>", class);
         cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                        ctx.qry.sha2, info->new_path, 0);
-        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
-                htmlf(" (%s from %s)",
-                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
-                      info->old_path);
+        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
+                htmlf(" (%s from ",
+                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
+                html_txt(info->old_path);
+                html(")");
+        }
         html("</td><td class='right'>");
         if (info->binary) {
                 htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
@@ -339,9 +341,7 @@ void cgit_print_diff_ctrls()
         html("<td class='label'>mode:</td>");
         html("<td class='ctrl'>");
         html("<select name='ss' onchange='this.form.submit();'>");
-        curr = ctx.qry.ssdiff;
-        if (!curr && ctx.cfg.ssdiff)
-                curr = 1;
+        curr = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
         html_intoption(0, "unified", curr);
         html_intoption(1, "ssdiff", curr);
         html("</select></td></tr>");
@@ -393,8 +393,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                 }
         }
 
-        if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-                use_ssdiff = 1;
+        use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
 
         if (show_ctrls)
                 cgit_print_diff_ctrls();