diff options
| author | Glenn Morris | 2008-03-13 03:57:31 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-13 03:57:31 +0000 |
| commit | 43d671a398a332b580ed42e8b9c45d27c38c3c5d (patch) | |
| tree | 49a458d22bca62f2ae4df9c0c15c2fd1863fb4a3 | |
| parent | d01890eee3b6ac6134c4319e26060dbff86bec13 (diff) | |
| download | emacs-43d671a398a332b580ed42e8b9c45d27c38c3c5d.tar.gz emacs-43d671a398a332b580ed42e8b9c45d27c38c3c5d.zip | |
(calendar-only-one-frame-setup, calendar-two-frame-setup): Doc fixes.
(special-display-buffer-names): Use cal-hebrew-yahrzeit-buffer.
| -rw-r--r-- | lisp/calendar/cal-x.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el index c5020ad24ba..3e227133e96 100644 --- a/lisp/calendar/cal-x.el +++ b/lisp/calendar/cal-x.el | |||
| @@ -113,7 +113,7 @@ passed to `calendar-basic-setup'." | |||
| 113 | "Start calendar and display it in a dedicated frame. | 113 | "Start calendar and display it in a dedicated frame. |
| 114 | This function requires a display capable of multiple frames, else | 114 | This function requires a display capable of multiple frames, else |
| 115 | `calendar-basic-setup' is used instead. The optional argument | 115 | `calendar-basic-setup' is used instead. The optional argument |
| 116 | ARG is passed to `calendar-basic-setup'" | 116 | ARG is passed to `calendar-basic-setup'." |
| 117 | (if (not (display-multi-frame-p)) | 117 | (if (not (display-multi-frame-p)) |
| 118 | (calendar-basic-setup arg) | 118 | (calendar-basic-setup arg) |
| 119 | (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) | 119 | (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) |
| @@ -136,7 +136,7 @@ ARG is passed to `calendar-basic-setup'" | |||
| 136 | "Start calendar and diary in separate, dedicated frames. | 136 | "Start calendar and diary in separate, dedicated frames. |
| 137 | This function requires a display capable of multiple frames, else | 137 | This function requires a display capable of multiple frames, else |
| 138 | `calendar-basic-setup' is used instead. The optional argument | 138 | `calendar-basic-setup' is used instead. The optional argument |
| 139 | ARG is passed to `calendar-basic-setup'" | 139 | ARG is passed to `calendar-basic-setup'." |
| 140 | (if (not (display-multi-frame-p)) | 140 | (if (not (display-multi-frame-p)) |
| 141 | (calendar-basic-setup arg) | 141 | (calendar-basic-setup arg) |
| 142 | (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) | 142 | (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) |
| @@ -172,10 +172,11 @@ ARG is passed to `calendar-basic-setup'" | |||
| 172 | 172 | ||
| 173 | ;; Formerly (get-file-buffer diary-file) was added to the list here, | 173 | ;; Formerly (get-file-buffer diary-file) was added to the list here, |
| 174 | ;; but that isn't clean, and the value could even be nil. | 174 | ;; but that isn't clean, and the value could even be nil. |
| 175 | ;; FIXME is this really our business? | ||
| 175 | (setq special-display-buffer-names | 176 | (setq special-display-buffer-names |
| 176 | (append special-display-buffer-names | 177 | (append special-display-buffer-names |
| 177 | (list "*Yahrzeits*" lunar-phases-buffer holiday-buffer | 178 | (list cal-hebrew-yahrzeit-buffer |
| 178 | fancy-diary-buffer | 179 | lunar-phases-buffer holiday-buffer fancy-diary-buffer |
| 179 | other-calendars-buffer calendar-buffer))) | 180 | other-calendars-buffer calendar-buffer))) |
| 180 | 181 | ||
| 181 | (run-hooks 'cal-x-load-hook) | 182 | (run-hooks 'cal-x-load-hook) |