well, there's bipolar with psychotic features, which is when psychosis happens within mood episodes, and then there's schizoaffective. It's been described as "The diagnosis of schizoaffective disorder is made when the patient has features of both schizophrenia and a mood disorder (bipolar disorder or depression) but does not strictly meet diagnostic criteria for either alone." The bipolar type has psychosis combined with manic or mixed episodes, and the depressive type has psychosis combined with depressive episodes alone.

The DSM-IV definition of schizoaffective was criticized for being applied inconsistently and critics said that most patients diagnosed with schizoaffective disorder go on to be rediagnosed with a different disorder.

I can't find much info about the DSM-V.