diff options
| author | Glenn Morris | 2008-03-25 07:57:06 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-25 07:57:06 +0000 |
| commit | 97bef88eb52fb1ff9ddd581eb0ec596c69c2d837 (patch) | |
| tree | 8e4e5934638f20014cd9f20a9339f0712f09ef43 | |
| parent | 1d3c128ce7862c940c68daa7f5a863699335ad24 (diff) | |
| download | emacs-97bef88eb52fb1ff9ddd581eb0ec596c69c2d837.tar.gz emacs-97bef88eb52fb1ff9ddd581eb0ec596c69c2d837.zip | |
Comment.
| -rw-r--r-- | lisp/calendar/cal-x.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el index 9d50a25e78c..653ce0e3caa 100644 --- a/lisp/calendar/cal-x.el +++ b/lisp/calendar/cal-x.el | |||
| @@ -122,7 +122,7 @@ If PROMPT is non-nil, prompt for the month and year to use." | |||
| 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. |
| @@ -158,9 +158,9 @@ See `calendar-frame-setup' for more information." | |||
| 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 | |||
| 162 | (make-obsolete 'calendar-only-one-frame-setup 'calendar-frame-setup "23.1") | 161 | (make-obsolete 'calendar-only-one-frame-setup 'calendar-frame-setup "23.1") |
| 163 | 162 | ||
| 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. |