diff options
| -rw-r--r-- | lisp/calendar/calendar.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index bc4aca2dbec..0ed6d844a6d 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el | |||
| @@ -1326,8 +1326,9 @@ The Gregorian date Sunday, December 31, 1 BC is imaginary." | |||
| 1326 | (defvar calendar-setup nil | 1326 | (defvar calendar-setup nil |
| 1327 | "The frame set up of the calendar. | 1327 | "The frame set up of the calendar. |
| 1328 | The choices are `one-frame' (calendar and diary together in one separate, | 1328 | The choices are `one-frame' (calendar and diary together in one separate, |
| 1329 | dedicated frame) or `two-frames' (calendar and diary in separate, dedicated | 1329 | dedicated frame), `two-frames' (calendar and diary in separate, dedicated |
| 1330 | frames); with any other value the current frame is used.") | 1330 | frames), `calendar-only' (calendar in a separate, dedicated frame); with |
| 1331 | any other value the current frame is used.") | ||
| 1331 | 1332 | ||
| 1332 | ;;;###autoload | 1333 | ;;;###autoload |
| 1333 | (defun calendar (&optional arg) | 1334 | (defun calendar (&optional arg) |
| @@ -1336,6 +1337,8 @@ The original function `calendar' has been renamed `calendar-basic-setup'." | |||
| 1336 | (interactive "P") | 1337 | (interactive "P") |
| 1337 | (cond ((equal calendar-setup 'one-frame) (calendar-one-frame-setup arg)) | 1338 | (cond ((equal calendar-setup 'one-frame) (calendar-one-frame-setup arg)) |
| 1338 | ((equal calendar-setup 'two-frames) (calendar-two-frame-setup arg)) | 1339 | ((equal calendar-setup 'two-frames) (calendar-two-frame-setup arg)) |
| 1340 | ((equal calendar-setup 'calendar-only) | ||
| 1341 | (calendar-only-one-frame-setup arg)) | ||
| 1339 | (t (calendar-basic-setup arg)))) | 1342 | (t (calendar-basic-setup arg)))) |
| 1340 | 1343 | ||
| 1341 | (defun calendar-basic-setup (&optional arg) | 1344 | (defun calendar-basic-setup (&optional arg) |