Explicitly set the foreground color of `ediff' faces to avoid overwriting by `ediff' itself.
Updated submodule `bashcomp'.