Mercurial > emacs
comparison lisp/calendar/cal-x.el @ 93193:280935cd7ea9
Comment.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 25 Mar 2008 07:57:06 +0000 |
| parents | 9785749a1557 |
| children | 41e41843fac2 |
comparison
equal
deleted
inserted
replaced
| 93192:cf1e8cd29b3c | 93193:280935cd7ea9 |
|---|---|
| 120 (calendar-basic-setup prompt) | 120 (calendar-basic-setup prompt) |
| 121 (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) | 121 (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) |
| 122 (unless (eq config 'calendar-only) | 122 (unless (eq config 'calendar-only) |
| 123 (if (frame-live-p diary-frame) (delete-frame diary-frame))) | 123 (if (frame-live-p diary-frame) (delete-frame diary-frame))) |
| 124 (let ((view-diary-entries-initially (eq config 'one-frame)) | 124 (let ((view-diary-entries-initially (eq config 'one-frame)) |
| 125 ;; For final calendar-dedicate-diary in two-frames case. | 125 ;; For calendar-dedicate-diary in two-frames case. |
| 126 (pop-up-windows nil)) | 126 (pop-up-windows nil)) |
| 127 (save-window-excursion | 127 (save-window-excursion |
| 128 ;; Do diary first so that calendar is always left current. | 128 ;; Do diary first so that calendar is always left current. |
| 129 (when (eq config 'two-frames) | 129 (when (eq config 'two-frames) |
| 130 (calendar-frame-1 | 130 (calendar-frame-1 |
| 156 (defun calendar-only-one-frame-setup (&optional prompt) | 156 (defun calendar-only-one-frame-setup (&optional prompt) |
| 157 "Display calendar in a dedicated frame. | 157 "Display calendar in a dedicated frame. |
| 158 See `calendar-frame-setup' for more information." | 158 See `calendar-frame-setup' for more information." |
| 159 (calendar-frame-setup 'calendar-only prompt)) | 159 (calendar-frame-setup 'calendar-only prompt)) |
| 160 | 160 |
| 161 (make-obsolete 'calendar-only-one-frame-setup 'calendar-frame-setup "23.1") | |
| 161 | 162 |
| 162 (make-obsolete 'calendar-only-one-frame-setup 'calendar-frame-setup "23.1") | |
| 163 | 163 |
| 164 ;;;###cal-autoload | 164 ;;;###cal-autoload |
| 165 (defun calendar-two-frame-setup (&optional prompt) | 165 (defun calendar-two-frame-setup (&optional prompt) |
| 166 "Display calendar and diary in separate, dedicated frames. | 166 "Display calendar and diary in separate, dedicated frames. |
| 167 See `calendar-frame-setup' for more information." | 167 See `calendar-frame-setup' for more information." |