* cpplex.c (parse_args): Don't set VOID_REST flag.
	(Fix diagnostic merge problem).
        (CONTEXT_VARARGS): New flag.
        (maybe_paste_with_next): Set context earlier in loop.  Use
        it.  Do varargs test with CONTEXT_VARARGS flag.
        (push_arg_context): Set CONTEXT_VARARGS flag if we're
        pushing an argument context for a varargs argument.
        * cpplib.h (VOID_REST): Delete.
        * gcc.dg/cpp/vararg1.c: Add test case.

From-SVN: r36638