1 diff -u -r ../coreutils-8.22/src/ls.c ./src/ls.c
2 --- ../coreutils-8.22/src/ls.c 2013-12-04 15:48:30.000000000 +0100
3 +++ ./src/ls.c 2014-02-14 16:11:48.000000000 +0100
8 + print_with_color = isatty (STDOUT_FILENO);
9 + if (print_with_color)
11 + /* Don't use TAB characters in output. Some terminal
12 + emulators can't handle the combination of tabs and
13 + color codes on the same line. */
20 @@ -1889,25 +1898,7 @@
26 - i = XARGMATCH ("--color", optarg, color_args, color_types);
28 - /* Using --color with no argument is equivalent to using
32 - print_with_color = (i == color_always
33 - || (i == color_if_tty
34 - && isatty (STDOUT_FILENO)));
36 - if (print_with_color)
38 - /* Don't use TAB characters in output. Some terminal
39 - emulators can't handle the combination of tabs and
40 - color codes on the same line. */
43 + // Do nothing - color has been patched to color_if_tty.
47 @@ -2098,11 +2089,13 @@
52 /* Note we leave %5b etc. alone so user widths/flags are honored. */
53 if (strstr (long_time_format[0], "%b")
54 || strstr (long_time_format[1], "%b"))
56 error (0, 0, _("error initializing month strings"));