X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdelta%2Fdelta.c;h=de963f70099a104fa8b972e47ad7f72f48079d46;hb=bceccd5ecc393c344ab008737ba6aab211a5ea9f;hp=438091c72746748eb5e22ad307e4441cf6566040;hpb=4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f;p=elogind.git diff --git a/src/delta/delta.c b/src/delta/delta.c index 438091c72..de963f700 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -123,7 +123,7 @@ static int notify_override_redirected(const char *top, const char *bottom) { if (!(arg_flags & SHOW_REDIRECTED)) return 0; - printf("%s%s%s %s %s %s\n", + printf("%s%s%s %s %s %s\n", ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(), top, draw_special_char(DRAW_ARROW), bottom); return 1; @@ -193,7 +193,7 @@ static int found_override(const char *top, const char *bottom) { _exit(1); } - wait_for_terminate_and_warn("diff", pid); + wait_for_terminate_and_warn("diff", pid, false); putchar('\n'); return k; @@ -484,7 +484,7 @@ static int parse_flags(const char *flag_str, int flags) { const char *word, *state; size_t l; - FOREACH_WORD(word, l, flag_str, state) { + FOREACH_WORD_SEPARATOR(word, l, flag_str, ",", state) { if (strneq("masked", word, l)) flags |= SHOW_MASKED; else if (strneq ("equivalent", word, l))