diff options
| author | Edward M. Reingold | 1995-06-02 14:45:21 +0000 |
|---|---|---|
| committer | Edward M. Reingold | 1995-06-02 14:45:21 +0000 |
| commit | 0f12fdabce436da82c60d31ae63bc731bc54d6a8 (patch) | |
| tree | 720df90387fbf0c34a4f72cdcb7c0d21fe7c7bf2 | |
| parent | b7c49febb0464b7c633ef44797833adfb2e7a7a8 (diff) | |
| download | emacs-0f12fdabce436da82c60d31ae63bc731bc54d6a8.tar.gz emacs-0f12fdabce436da82c60d31ae63bc731bc54d6a8.zip | |
Fix cal-x.el to create an empty fancy-diary-buffer, if needed.
| -rw-r--r-- | lisp/calendar/cal-x.el | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el index 61ccc32faa1..d3e25e83063 100644 --- a/lisp/calendar/cal-x.el +++ b/lisp/calendar/cal-x.el | |||
| @@ -103,11 +103,13 @@ Can be used to change frame parameters, such as font, color, location, etc.") | |||
| 103 | (set-window-dedicated-p (selected-window) 'calendar) | 103 | (set-window-dedicated-p (selected-window) 'calendar) |
| 104 | (set-window-dedicated-p | 104 | (set-window-dedicated-p |
| 105 | (display-buffer | 105 | (display-buffer |
| 106 | (if (memq 'fancy-diary-display diary-display-hook) | 106 | (if (not (memq 'fancy-diary-display diary-display-hook)) |
| 107 | fancy-diary-buffer | 107 | (get-file-buffer diary-file) |
| 108 | (get-file-buffer diary-file))) | 108 | (if (not (bufferp (get-buffer fancy-diary-buffer))) |
| 109 | (make-fancy-diary-buffer)) | ||
| 110 | fancy-diary-buffer)) | ||
| 109 | 'diary)))))) | 111 | 'diary)))))) |
| 110 | 112 | ||
| 111 | (defun calendar-two-frame-setup (&optional arg) | 113 | (defun calendar-two-frame-setup (&optional arg) |
| 112 | "Start calendar and diary in separate, dedicated frames." | 114 | "Start calendar and diary in separate, dedicated frames." |
| 113 | (if (not window-system) | 115 | (if (not window-system) |
| @@ -136,9 +138,11 @@ Can be used to change frame parameters, such as font, color, location, etc.") | |||
| 136 | (save-excursion (diary)) | 138 | (save-excursion (diary)) |
| 137 | (set-window-dedicated-p | 139 | (set-window-dedicated-p |
| 138 | (display-buffer | 140 | (display-buffer |
| 139 | (if (memq 'fancy-diary-display diary-display-hook) | 141 | (if (not (memq 'fancy-diary-display diary-display-hook)) |
| 140 | fancy-diary-buffer | 142 | (get-file-buffer diary-file) |
| 141 | (get-file-buffer diary-file))) | 143 | (if (not (bufferp (get-buffer fancy-diary-buffer))) |
| 144 | (make-fancy-diary-buffer)) | ||
| 145 | fancy-diary-buffer)) | ||
| 142 | 'diary))))) | 146 | 'diary))))) |
| 143 | 147 | ||
| 144 | (setq special-display-buffer-names | 148 | (setq special-display-buffer-names |