The stock market rose slightly in a holiday-shortened week while crude oil jumped, with the Israel-Iran conflict and the Fed meeting in focus. President Donald Trump said he'll decide within "two weeks" whether to attack Iran, after publicly musing about it. The Fed still sees two rate…