How Macron won Trump round at the G7. Until the next bust-up.