Mercurial > emacs
comparison lisp/calendar/calendar.el @ 24891:85d8302a2e82
(calendar): Call calendar-only-one-frame-setup if requested.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Sun, 27 Jun 1999 21:23:39 +0000 |
| parents | aa82f46ecc36 |
| children | 4c873bb645d8 |
comparison
equal
deleted
inserted
replaced
| 24890:5f37b93c8538 | 24891:85d8302a2e82 |
|---|---|
| 1324 | 1324 |
| 1325 ;;;###autoload | 1325 ;;;###autoload |
| 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) |
| 1334 "Choose between the one frame, two frame, or basic calendar displays. | 1335 "Choose between the one frame, two frame, or basic calendar displays. |
| 1335 The original function `calendar' has been renamed `calendar-basic-setup'." | 1336 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) |
| 1342 "Display a three-month calendar in another window. | 1345 "Display a three-month calendar in another window. |
| 1343 The three months appear side by side, with the current month in the middle | 1346 The three months appear side by side, with the current month in the middle |