(decode_options): Fix last change so as not to override an explicit -display.