(diary-frame-parameters, calendar-frame-parameters) (calendar-and-diary-frame-parameters): Fix custom type; add options. (calendar-frame, diary-frame): Doc fixes. (calendar-dedicate-diary, calendar-frame-1): Extract common code into new functions. (calendar-one-frame-setup, calendar-two-frame-setup): Doc fixes. Use calendar-frame-1 and calendar-dedicate-diary. (calendar-one-frame-setup): Also handle only-one-frame case. (calendar-only-one-frame-setup): Doc fix. Just call calendar-one-frame-setup.