Select Options/Save State Between Sessions, then Options/Save Options.

This does not save the value of desktop-save-mode.  M-x customize-group
shows that it has been changed.

Patch attaches