It seems to DTRT for all users of `calendar-in-read-only-buffer' (after byte-compiling), if I haven't overlooked anything. Steve Berman