Macron makes surprise Saudi visit as France secures extra diesel supplies