xdiff: reassign xpparm_t.flags bits

diff --git a/diff.c b/diff.c
index 74283d9001fbc48d11ba5c449ea7c16692791c88..790250fe868b04118fd78f3bdb893b66693a2d9c 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3434,9 +3434,7 @@ void diff_setup_done(struct diff_options *options)
         * inside contents.
         */
 
-       if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
-           DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
-           DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
+       if ((options->xdl_opts & XDF_WHITESPACE_FLAGS))
                DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
        else
                DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);